v3.3.2

15dd · Dec 11, 2024 · b48ed40 · b48ed40
1 parent 9b5bedb
commit b48ed40
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.cyh128.hikari_novel"
         minSdk = 24
         targetSdk = 35
-        versionCode = 241207
-        versionName = "3.3.1"
+        versionCode = 241211
+        versionName = "3.3.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 241207,
-      "versionName": "3.3.1",
+      "versionCode": 241211,
+      "versionName": "3.3.2",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt b/app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt
@@ -470,11 +470,11 @@ class Wenku8Repository @Inject constructor(
                     ""
                 ) //删除小说内容中的image标签
 
-                val fromLine = 4
-                val toLine = 14
-                content = content.lines()
-                    .filterIndexed { index, _ -> index !in (fromLine - 1) until toLine }
-                    .joinToString("\n")
+//                val fromLine = 4
+//                val toLine = 14
+//                content = content.lines()
+//                    .filterIndexed { index, _ -> index !in (fromLine - 1) until toLine }
+//                    .joinToString("\n")
 
                 return Result.success(ChapterContentResponse(content, image))
             }.onFailure {

diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/SettingActivity.kt
@@ -12,7 +12,6 @@ import com.cyh128.hikari_novel.data.model.DefaultTab
 import com.cyh128.hikari_novel.data.model.Language
 import com.cyh128.hikari_novel.data.model.ReaderOrientation
 import com.cyh128.hikari_novel.databinding.ActivitySettingBinding
-import com.cyh128.hikari_novel.databinding.ViewThemeListBinding
 import com.cyh128.hikari_novel.util.LanguageHelper
 import com.cyh128.hikari_novel.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder

diff --git a/...in/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/ThemeListDialogFragment.kt b/...in/java/com/cyh128/hikari_novel/ui/view/main/more/more/setting/ThemeListDialogFragment.kt
@@ -2,7 +2,6 @@ package com.cyh128.hikari_novel.ui.view.main.more.more.setting
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
 import com.cyh128.hikari_novel.R

diff --git a/app/src/main/java/com/cyh128/hikari_novel/ui/view/read/horizontal/ReadActivity.kt b/app/src/main/java/com/cyh128/hikari_novel/ui/view/read/horizontal/ReadActivity.kt
@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -275,7 +274,13 @@ class ReadActivity : BaseActivity<ActivityHorizontalReadBinding>() {
 
         binding.pvAHRead.onPageChange = object : IPageView.OnPageChange {
             override fun onPageChange(index: Int) {
-                Log.d("r a", "index:$index count:${binding.pvAHRead.maxPageNum}")
+                if (binding.pvAHRead.maxPageNum == 1) {
+                    binding.sAHReadProgress.visibility = View.INVISIBLE
+                    return
+                } else {
+                    binding.sAHReadProgress.visibility = View.VISIBLE
+                }
+
                 binding.sAHReadProgress.valueTo = binding.pvAHRead.maxPageNum.toFloat()
                 binding.sAHReadProgress.value = index.toFloat()
             }