Merge 9130452f06 into 0337e465de

#3969 #3970

app/src/main/java/io/legado/app/base/BaseViewModel.kt

@@ -27,6 +27,15 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
         return Coroutine.async(scope, context, start, executeContext, block)
     }
 
+    fun <T> executeLazy(
+        scope: CoroutineScope = viewModelScope,
+        context: CoroutineContext = Dispatchers.IO,
+        executeContext: CoroutineContext = Dispatchers.Main,
+        block: suspend CoroutineScope.() -> T
+    ): Coroutine<T> {
+        return Coroutine.async(scope, context, CoroutineStart.LAZY, executeContext, block)
+    }
+
     fun <R> submit(
         scope: CoroutineScope = viewModelScope,
         context: CoroutineContext = Dispatchers.IO,

app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt

@@ -81,6 +81,10 @@ class PermissionActivity : AppCompatActivity() {
                 kotlin.runCatching {
                     val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
                     intent.setData(Uri.parse("package:$packageName"))
+                    intent.setClassName(
+                        "com.android.settings",
+                        "com.android.settings.fuelgauge.RequestIgnoreBatteryOptimizations"
+                    )
                     settingActivityResult.launch(intent)
                 }
             }

app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@@ -218,7 +218,7 @@ abstract class BaseReadAloudService : BaseService(),
             }
             nowSpeak = textChapter.getParagraphNum(readAloudNumber + 1, readAloudByPage) - 1
             if (!readAloudByPage && startPos == 0 && !toLast) {
-                pos = page.lines.first().chapterPosition -
+                pos = page.chapterPosition -
                         textChapter.paragraphs[nowSpeak].chapterPosition
             }
             if (toLast) {
@@ -226,7 +226,7 @@ abstract class BaseReadAloudService : BaseService(),
                 readAloudNumber = textChapter.getLastParagraphPosition()
                 nowSpeak = contentList.lastIndex
                 if (page.paragraphs.size == 1) {
-                    pos = page.lines.first().chapterPosition -
+                    pos = page.chapterPosition -
                             textChapter.paragraphs[nowSpeak].chapterPosition
                 }
             }

app/src/main/java/io/legado/app/service/WebService.kt

@@ -7,7 +7,6 @@ import android.net.wifi.WifiManager
 import android.os.Build
 import android.os.PowerManager
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
 import io.legado.app.R
 import io.legado.app.base.BaseService
 import io.legado.app.constant.AppConst
@@ -23,6 +22,7 @@ import io.legado.app.utils.postEvent
 import io.legado.app.utils.printOnDebug
 import io.legado.app.utils.sendToClip
 import io.legado.app.utils.servicePendingIntent
+import io.legado.app.utils.startForegroundServiceCompat
 import io.legado.app.utils.startService
 import io.legado.app.utils.stopService
 import io.legado.app.utils.toastOnUi
@@ -45,7 +45,7 @@ class WebService : BaseService() {
 
         fun startForeground(context: Context) {
             val intent = Intent(context, WebService::class.java)
-            ContextCompat.startForegroundService(context, intent)
+            context.startForegroundServiceCompat(intent)
         }
 
         fun stop(context: Context) {
@@ -94,7 +94,13 @@ class WebService : BaseService() {
             val addressList = NetworkUtils.getLocalIPAddress()
             notificationList.clear()
             if (addressList.any()) {
-                notificationList.addAll(addressList.map { address -> getString(R.string.http_ip, address.hostAddress, getPort()) })
+                notificationList.addAll(addressList.map { address ->
+                    getString(
+                        R.string.http_ip,
+                        address.hostAddress,
+                        getPort()
+                    )
+                })
                 hostAddress = notificationList.first()
             } else {
                 hostAddress = getString(R.string.network_connection_unavailable)
@@ -154,7 +160,13 @@ class WebService : BaseService() {
                 httpServer?.start()
                 webSocketServer?.start(1000 * 30) // 通信超时设置
                 notificationList.clear()
-                notificationList.addAll(addressList.map { address -> getString(R.string.http_ip, address.hostAddress, getPort()) })
+                notificationList.addAll(addressList.map { address ->
+                    getString(
+                        R.string.http_ip,
+                        address.hostAddress,
+                        getPort()
+                    )
+                })
                 hostAddress = notificationList.first()
                 isRun = true
                 postEvent(EventBus.WEB_SERVICE, hostAddress)

app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt

@@ -13,6 +13,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.R
 import io.legado.app.constant.PreferKey
+import io.legado.app.data.appDb
 import io.legado.app.databinding.DialogEditTextBinding
 import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.dialogs.alert
@@ -22,7 +23,14 @@ import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.ui.book.import.BaseImportBookActivity
 import io.legado.app.ui.file.HandleFileContract
 import io.legado.app.ui.widget.SelectActionBar
-import io.legado.app.utils.*
+import io.legado.app.utils.ArchiveUtils
+import io.legado.app.utils.FileDoc
+import io.legado.app.utils.gone
+import io.legado.app.utils.isContentScheme
+import io.legado.app.utils.isUri
+import io.legado.app.utils.launch
+import io.legado.app.utils.putPrefInt
+import io.legado.app.utils.visible
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.Job
@@ -175,6 +183,7 @@ class ImportBookActivity : BaseImportBookActivity<ImportBookViewModel>(),
                             selectFolder.launch()
                         }
                     }
+
                     else -> initRootPath(rootUri.path!!)
                 }
             }
@@ -291,7 +300,9 @@ class ImportBookActivity : BaseImportBookActivity<ImportBookViewModel>(),
 
     override fun startRead(fileDoc: FileDoc) {
         if (!ArchiveUtils.isArchive(fileDoc.name)) {
-            startReadBook(fileDoc.toString())
+            appDb.bookDao.getBookByFileName(fileDoc.name)?.let {
+                startReadBook(it.bookUrl)
+            }
         } else {
             onArchiveFileClick(fileDoc)
         }

app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt

@@ -170,7 +170,11 @@ class RemoteBookActivity : BaseImportBookActivity<RemoteBookViewModel>(),
 
     private fun upPath() {
         binding.tvGoBack.isEnabled = viewModel.dirList.isNotEmpty()
-        var path = "books" + File.separator
+        var path = if (viewModel.isDefaultWebdav) {
+            "books" + File.separator
+        } else {
+            File.separator
+        }
         viewModel.dirList.forEach {
             path = path + it.filename + File.separator
         }

app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt

@@ -90,14 +90,17 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application)
     }.flowOn(Dispatchers.IO)
 
     private var remoteBookWebDav: RemoteBookWebDav? = null
+    var isDefaultWebdav = false
 
     fun initData(onSuccess: () -> Unit) {
         execute {
+            isDefaultWebdav = false
             appDb.serverDao.get(AppConfig.remoteServerId)?.getWebDavConfig()?.let {
                 val authorization = Authorization(it)
                 remoteBookWebDav = RemoteBookWebDav(it.url, authorization, AppConfig.remoteServerId)
                 return@execute
             }
+            isDefaultWebdav = true
             remoteBookWebDav = AppWebDav.defaultBookWebDav
                 ?: throw NoStackTraceException("webDav没有配置")
         }.onError {
@@ -108,7 +111,7 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application)
     }
 
     fun loadRemoteBookList(path: String?, loadCallback: (loading: Boolean) -> Unit) {
-        execute {
+        executeLazy {
             val bookWebDav = remoteBookWebDav
                 ?: throw NoStackTraceException("没有配置webDav")
             dataCallback?.clear()
@@ -122,7 +125,7 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application)
             loadCallback.invoke(true)
         }.onFinally {
             loadCallback.invoke(false)
-        }
+        }.start()
     }
 
     fun addToBookshelf(remoteBooks: HashSet<RemoteBook>, finally: () -> Unit) {

app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt

@@ -278,7 +278,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
             if (textPos.compare(selectEnd) <= 0) {
                 selectStart.upData(pos = textPos)
                 upSelectedStart(
-                    if (textPos.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
+                    if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
                     textLine.lineBottom + relativeOffset,
                     textLine.lineTop + relativeOffset
                 )
@@ -318,7 +318,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                 selectEndMoveIndex(selectStart)
                 selectStart.upData(textPos)
                 upSelectedStart(
-                    if (textPos.columnIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
+                    if (textPos.columnIndex < textLine.columns.size) textColumn.start else textColumn.end,
                     textLine.lineBottom + relativeOffset,
                     textLine.lineTop + relativeOffset
                 )
@@ -498,7 +498,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         val textLine = relativePage(relativePagePos).getLine(lineIndex)
         val textColumn = textLine.getColumn(charIndex)
         upSelectedStart(
-            if (charIndex < textLine.columns.lastIndex) textColumn.start else textColumn.end,
+            if (charIndex < textLine.columns.size) textColumn.start else textColumn.end,
             textLine.lineBottom + relativeOffset(relativePagePos),
             textLine.lineTop + relativeOffset(relativePagePos)
         )
@@ -534,7 +534,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     }
 
     private fun upSelectChars() {
-        if (!selectStart.isSelected() || !selectEnd.isSelected()) {
+        if (!selectStart.isSelected() && !selectEnd.isSelected()) {
             return
         }
         val last = if (callBack.isScroll) 2 else 0
@@ -621,7 +621,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                     if (column is TextColumn) {
                         when {
                             compareStart == 0 -> {
-                                if (textPos.columnIndex < textLine.columns.lastIndex) {
+                                if (textPos.columnIndex < textLine.columns.size) {
                                     builder.append(column.charData)
                                 }
                                 if (

app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt

@@ -154,8 +154,8 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) {
      */
     private fun calcNextPageOffset(): Int {
         val visibleHeight = ChapterProvider.visibleHeight
-        val book = ReadBook.book!!
-        if (book.isImage) {
+        val book = ReadBook.book
+        if (book == null || book.isImage) {
             return -visibleHeight
         }
         val visiblePage = readView.getCurVisiblePage()
@@ -170,8 +170,8 @@ class ScrollPageDelegate(readView: ReadView) : PageDelegate(readView) {
 
     private fun calcPrevPageOffset(): Int {
         val visibleHeight = ChapterProvider.visibleHeight
-        val book = ReadBook.book!!
-        if (book.isImage) {
+        val book = ReadBook.book
+        if (book == null || book.isImage) {
             return visibleHeight
         }
         val visiblePage = readView.getCurVisiblePage()

app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt

@@ -112,7 +112,7 @@ data class TextChapter(
      */
     fun getReadLength(pageIndex: Int): Int {
         if (pageIndex < 0) return 0
-        return pages[min(pageIndex, lastIndex)].lines.first().chapterPosition
+        return pages[min(pageIndex, lastIndex)].chapterPosition
         /*
         var length = 0
         val maxIndex = min(pageIndex, pages.size)
@@ -224,14 +224,13 @@ data class TextChapter(
             return -1
         }
         val bIndex = pages.fastBinarySearchBy(charIndex, 0, pageSize) {
-            it.lines.first().chapterPosition
+            it.chapterPosition
         }
         val index = abs(bIndex + 1) - 1
         // 判断是否已经排版到 charIndex ，没有则返回 -1
         if (!isCompleted && index == pageSize - 1) {
             val page = pages[index]
-            val line = page.lines.first()
-            val pageEndPos = line.chapterPosition + page.charSize
+            val pageEndPos = page.chapterPosition + page.charSize
             if (charIndex > pageEndPos) {
                 return -1
             }

app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt

@@ -45,6 +45,7 @@ data class TextPage(
     val lines: List<TextLine> get() = textLines
     val lineSize: Int get() = textLines.size
     val charSize: Int get() = text.length.coerceAtLeast(1)
+    val chapterPosition: Int get() = textLines.first().chapterPosition
     val searchResult = hashSetOf<TextColumn>()
     var isMsgPage: Boolean = false
     var canvasRecorder = CanvasRecorderFactory.create(true)

app/src/main/java/io/legado/app/ui/book/read/page/provider/TextChapterLayout.kt

@@ -177,7 +177,7 @@ class TextChapterLayout(
         val contents = bookContent.textList
         var absStartX = paddingLeft
         var durY = 0f
-        if (ReadBookConfig.titleMode != 2 || bookChapter.isVolume) {
+        if (ReadBookConfig.titleMode != 2 || bookChapter.isVolume || contents.isEmpty()) {
             //标题非隐藏
             displayTitle.splitNotBlank("\n").forEach { text ->
                 setTypeText(

modules/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java

@@ -106,11 +106,13 @@ public class PackageDocumentReader extends PackageDocumentBase {
         NodeList originItemElements = manifestElement
                 .getElementsByTagNameNS(NAMESPACE_OPF, OPFTags.item);
         for (int i = 0; i < originItemElements.getLength(); i++) {
-            Element itemElement = (Element) originItemElements.item(i);
-            fixedElements.add(itemElement);
+            Element itemElement = (Element) originItemElements.item(i).cloneNode(false);
             String href = DOMUtil.getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
+            String resolvedHref = packagePath.resolve(href).toString();
+            itemElement.setAttribute("href", resolvedHref);
+            fixedElements.add(itemElement);
             try {
-                href = URLDecoder.decode(packagePath.resolve(href).toString(), Constants.CHARACTER_ENCODING);
+                href = URLDecoder.decode(resolvedHref, Constants.CHARACTER_ENCODING);
             } catch (UnsupportedEncodingException e) {
                 Log.e(TAG, e.getMessage());
             }
@@ -177,7 +179,7 @@ public class PackageDocumentReader extends PackageDocumentBase {
                     .getAttribute(itemElement, NAMESPACE_OPF, OPFAttributes.href);
 
             try {
-                href = URLDecoder.decode(packagePath.resolve(href).toString(), Constants.CHARACTER_ENCODING);
+                href = URLDecoder.decode(href, Constants.CHARACTER_ENCODING);
             } catch (UnsupportedEncodingException e) {
                 Log.e(TAG, e.getMessage());
             }

modules/web/package.json

@@ -35,7 +35,7 @@
     "sass": "^1.62.1",
     "unplugin-auto-import": "^0.17.5",
     "unplugin-icons": "^0.18.5",
-    "unplugin-vue-components": "^0.26.0",
+    "unplugin-vue-components": "^0.27.0",
     "vite": "^5.1.3"
   }
 }