YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2022-08-09 12:10:54 +08:00
parent ee3777e511 461664be81
commit f88f6ec1eb
19 changed files with 122 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/base/BaseService.kt
+3 -5
View File
@@ -6,10 +6,7 @@ import android.os.IBinder
import androidx.annotation.CallSuper
import io.legado.app.help.LifecycleHelp
import io.legado.app.help.coroutine.Coroutine
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel
import kotlinx.coroutines.*
import kotlin.coroutines.CoroutineContext
abstract class BaseService : Service(), CoroutineScope by MainScope() {
@@ -17,8 +14,9 @@ abstract class BaseService : Service(), CoroutineScope by MainScope() {
fun <T> execute(
scope: CoroutineScope = this,
context: CoroutineContext = Dispatchers.IO,
start: CoroutineStart = CoroutineStart.DEFAULT,
block: suspend CoroutineScope.() -> T
) = Coroutine.async(scope, context) { block() }
) = Coroutine.async(scope, context, start) { block() }
@CallSuper
override fun onCreate() {
app/src/main/java/io/legado/app/help/config/LocalConfig.kt
+1 -1
View File
@@ -43,7 +43,7 @@ object LocalConfig :
get() = !isLastVersion(5, "httpTtsVersion")
val needUpTxtTocRule: Boolean
get() = !isLastVersion(1, "txtTocRuleVersion")
get() = !isLastVersion(2, "txtTocRuleVersion")
val needUpRssSources: Boolean
get() = !isLastVersion(4, "rssSourceVersion")
app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
+8 -2
View File
@@ -12,6 +12,7 @@ import kotlin.coroutines.CoroutineContext
class Coroutine<T>(
val scope: CoroutineScope,
context: CoroutineContext = Dispatchers.IO,
val startOption: CoroutineStart = CoroutineStart.DEFAULT,
block: suspend CoroutineScope.() -> T
) {
@@ -22,9 +23,10 @@ class Coroutine<T>(
fun <T> async(
scope: CoroutineScope = DEFAULT,
context: CoroutineContext = Dispatchers.IO,
start: CoroutineStart = CoroutineStart.DEFAULT,
block: suspend CoroutineScope.() -> T
): Coroutine<T> {
return Coroutine(scope, context, block)
return Coroutine(scope, context, start, block)
}
}
@@ -135,11 +137,15 @@ class Coroutine<T>(
return job.invokeOnCompletion(handler)
}
fun start() {
job.start()
}
private fun executeInternal(
context: CoroutineContext,
block: suspend CoroutineScope.() -> T
): Job {
return (scope + Dispatchers.Main).launch {
return (scope + Dispatchers.Main).launch(start = startOption) {
try {
start?.let { dispatchVoidCallback(this, it) }
ensureActive()
app/src/main/java/io/legado/app/model/CheckSource.kt
+6
View File
@@ -38,6 +38,12 @@ object CheckSource {
}
}
fun resume(context: Context) {
context.startService<CheckSourceService> {
action = IntentAction.resume
}
}
fun putConfig() {
CacheManager.put("checkSourceTimeout", timeout)
CacheManager.put("checkSearch", checkSearch)
app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt
+2
View File
@@ -1,5 +1,6 @@
package io.legado.app.receiver
import android.annotation.SuppressLint
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
@@ -34,6 +35,7 @@ class NetworkChangedListener(private val context: Context) {
return@lazy null
}
@SuppressLint("MissingPermission")
fun register() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
networkCallback?.let {
app/src/main/java/io/legado/app/service/CheckSourceService.kt
+5 -6
View File
@@ -24,10 +24,8 @@ import io.legado.app.utils.activityPendingIntent
import io.legado.app.utils.postEvent
import io.legado.app.utils.servicePendingIntent
import io.legado.app.utils.toastOnUi
import kotlinx.coroutines.*
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.launch
import org.mozilla.javascript.WrappedException
import java.util.concurrent.Executors
import kotlin.math.min
@@ -71,6 +69,7 @@ class CheckSourceService : BaseService() {
IntentAction.start -> intent.getStringArrayListExtra("selectIds")?.let {
check(it)
}
IntentAction.resume -> upNotification()
else -> stopSelf()
}
return super.onStartCommand(intent, flags, startId)
@@ -122,7 +121,7 @@ class CheckSourceService : BaseService() {
*校验书源
*/
private fun check(source: BookSource) {
execute(context = searchCoroutine) {
execute(context = searchCoroutine, start = CoroutineStart.LAZY) {
Debug.startChecking(source)
var searchWord = CheckSource.keyword
source.ruleSearch?.checkKeyWord?.let {
@@ -162,7 +161,7 @@ class CheckSourceService : BaseService() {
}
}
if (url.isNullOrBlank()) {
source.addGroup("发现规则为空")
source.addGroup("发现规则为空")
} else {
source.removeGroup("发现规则为空")
val exploreBooks = WebBook.exploreBookAwait(this, source, url)
@@ -194,7 +193,7 @@ class CheckSourceService : BaseService() {
source.respondTime = Debug.getRespondTime(source.bookSourceUrl)
appDb.bookSourceDao.update(source)
onNext(source.bookSourceUrl, source.bookSourceName)
}
}.start()
}
/**
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+56 -8
View File
@@ -1,10 +1,10 @@
package io.legado.app.ui.book.source.manage
import android.annotation.SuppressLint
import android.content.Context
import android.hardware.display.DisplayManager
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.SubMenu
import android.view.*
import androidx.activity.viewModels
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.PopupMenu
@@ -28,6 +28,7 @@ import io.legado.app.lib.theme.primaryColor
import io.legado.app.lib.theme.primaryTextColor
import io.legado.app.model.CheckSource
import io.legado.app.model.Debug
import io.legado.app.service.CheckSourceService
import io.legado.app.ui.association.ImportBookSourceDialog
import io.legado.app.ui.book.local.rule.TxtTocRuleActivity
import io.legado.app.ui.book.source.debug.BookSourceDebugActivity
@@ -69,6 +70,9 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
private var sort = Sort.Default
private var sortAscending = true
private var snackBar: Snackbar? = null
private val displayManager by lazy {
getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
}
private val qrResult = registerForActivityResult(QrCodeResult()) {
it ?: return@registerForActivityResult
showDialogFragment(ImportBookSourceDialog(it))
@@ -108,6 +112,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
upBookSource()
initLiveDataGroup()
initSelectActionBar()
resumeCheckSource()
if (!LocalConfig.bookSourcesHelpVersionIsLast) {
showHelp()
}
@@ -363,6 +368,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
R.id.menu_share_source -> viewModel.saveToFile(adapter.selection) {
share(it)
}
R.id.menu_check_selected_interval -> adapter.checkSelectedInterval()
}
return true
}
@@ -376,6 +382,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
}
customView { alertBinding.root }
okButton {
keepScreenOn(true)
alertBinding.editView.text?.toString()?.let {
if (it.isNotEmpty()) {
CheckSource.keyword = it
@@ -396,6 +403,15 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
}
}
private fun resumeCheckSource() {
if (!Debug.isChecking) {
return
}
keepScreenOn(true)
CheckSource.resume(this)
checkMessageRefreshJob(0, 0).start()
}
@SuppressLint("InflateParams")
private fun selectionAddToGroups() {
alert(titleResource = R.string.add_group) {
@@ -493,6 +509,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
}
}
observeEvent<Int>(EventBus.CHECK_SOURCE_DONE) {
keepScreenOn(false)
snackBar?.dismiss()
snackBar = null
groups.map { group ->
@@ -512,11 +529,21 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
delay(300L)
}
}.collect {
adapter.notifyItemRangeChanged(
firstItem,
lastItem + 1,
bundleOf(Pair("checkSourceMessage", null))
)
if (isScreenOn()) {
if (lastItem == 0) {
adapter.notifyItemRangeChanged(
0,
adapter.itemCount,
bundleOf(Pair("checkSourceMessage", null))
)
} else {
adapter.notifyItemRangeChanged(
firstItem,
lastItem + 1,
bundleOf(Pair("checkSourceMessage", null))
)
}
}
if (!it) {
this.cancel()
}
@@ -524,6 +551,27 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
}
}
/**
* 保持亮屏
*/
private fun keepScreenOn(on: Boolean) {
val isScreenOn =
(window.attributes.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) != 0
if (on == isScreenOn) return
if (on) {
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
} else {
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
}
private fun isScreenOn(): Boolean {
return displayManager.displays.any {
it ?: return@any false
it.state != Display.STATE_OFF
}
}
override fun upCountView() {
binding.selectActionBar
.upCountView(adapter.selection.size, adapter.itemCount)
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
+20
View File
@@ -24,6 +24,7 @@ import io.legado.app.utils.ColorUtils
import io.legado.app.utils.invisible
import io.legado.app.utils.startActivity
import io.legado.app.utils.visible
import java.util.*
class BookSourceAdapter(context: Context, val callBack: CallBack) :
@@ -234,6 +235,25 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
callBack.upCountView()
}
fun checkSelectedInterval() {
val selectedPosition = linkedSetOf<Int>()
getItems().forEachIndexed { index, it ->
if (selected.contains(it)) {
selectedPosition.add(index)
}
}
val minPosition = Collections.min(selectedPosition)
val maxPosition = Collections.max(selectedPosition)
val itemCount = maxPosition - minPosition + 1
for (i in minPosition..maxPosition) {
getItem(i)?.let {
selected.add(it)
}
}
notifyItemRangeChanged(minPosition, itemCount, bundleOf(Pair("selected", null)))
callBack.upCountView()
}
override fun swap(srcPosition: Int, targetPosition: Int): Boolean {
val srcItem = getItem(srcPosition)
val targetItem = getItem(targetPosition)
app/src/main/res/layout/item_txt_toc_rule.xml
+2 -2
View File
@@ -10,13 +10,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:gravity="center_vertical">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/cb_source"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/primaryText"
app/src/main/res/menu/book_source_sel.xml
+5
View File
@@ -58,4 +58,9 @@
android:title="@string/check_select_source"
app:showAsAction="never" />
<item
android:id="@+id/menu_check_selected_interval"
android:title="@string/check_selected_interval"
app:showAsAction="never" />
</menu>
app/src/main/res/values-es-rES/strings.xml
+1
View File
@@ -1007,4 +1007,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">Ejemplo</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values-ja-rJP/strings.xml
+1
View File
@@ -1010,4 +1010,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">例</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values-pt-rBR/strings.xml
+1
View File
@@ -1010,4 +1010,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">Exemplo</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values-zh-rHK/strings.xml
+1
View File
@@ -1007,4 +1007,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">示例</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values-zh-rTW/strings.xml
+1
View File
@@ -1009,4 +1009,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">示例</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values-zh/strings.xml
+1
View File
@@ -1009,4 +1009,5 @@
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="example">示例</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
app/src/main/res/values/strings.xml
+1
View File
@@ -1010,4 +1010,5 @@
<string name="page_touch_slop_title">滑动翻页阈值</string>
<string name="page_touch_slop_dialog_title">滑动翻页阈值（0 = 系统默认值）</string>
<string name="page_touch_slop_summary">滑动多长距离才会触发滑动翻页（系统默认值 %s px）</string>
<string name="check_selected_interval">选中所选区间</string>
</resources>
epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java
+2 -4
View File
@@ -69,8 +69,7 @@ public class EpubReader {
*/
public EpubBook readEpubLazy(@NonNull ZipFile zipFile, @NonNull String encoding)
throws IOException {
return readEpubLazy(zipFile, encoding,
Arrays.asList(MediaTypes.mediaTypes));
return readEpubLazy(zipFile, encoding, Arrays.asList(MediaTypes.mediaTypes));
}
public EpubBook readEpub(@NonNull ZipInputStream in, @NonNull String encoding) throws IOException {
@@ -107,8 +106,7 @@ public class EpubReader {
}
handleMimeType(result, resources);
String packageResourceHref = getPackageResourceHref(resources);
Resource packageResource = processPackageResource(packageResourceHref,
result, resources);
Resource packageResource = processPackageResource(packageResourceHref, result, resources);
result.setOpfResource(packageResource);
Resource ncxResource = processNcxResource(packageResource, result);
result.setNcxResource(ncxResource);
epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java
+5 -3
View File
@@ -46,9 +46,11 @@ public class ResourcesLoader {
* @return Resources
* @throws IOException IOException
*/
public static Resources loadResources(ZipFile zipFile,
String defaultHtmlEncoding,
List<MediaType> lazyLoadedTypes) throws IOException {
public static Resources loadResources(
ZipFile zipFile,
String defaultHtmlEncoding,
List<MediaType> lazyLoadedTypes
) throws IOException {
LazyResourceProvider resourceProvider =
new EpubResourceProvider(zipFile.getName());