Skip to content

Commit 6f1efc9

Browse files
committed
v3.9.4
1 parent 5a8589f commit 6f1efc9

File tree

24 files changed

+101
-172
lines changed

24 files changed

+101
-172
lines changed

.idea/codeStyles/Project.xml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId = "com.cyh128.hikari_novel"
1515
minSdk = 24
1616
targetSdk = 34 //暂时不要升到35,不然之前的edgeToEdge效果会消失
17-
versionCode = 250419
18-
versionName = "3.9.3"
17+
versionCode = 250608
18+
versionName = "3.9.4"
1919

2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
}
@@ -85,18 +85,18 @@ android {
8585
dependencies {
8686
//android相关
8787
implementation("androidx.core:core-ktx:1.16.0")
88-
implementation("androidx.appcompat:appcompat:1.7.0")
89-
implementation("com.google.android.material:material:1.13.0-alpha12")
88+
implementation("androidx.appcompat:appcompat:1.7.1")
89+
implementation("com.google.android.material:material:1.13.0-alpha14")
9090
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
9191
implementation("androidx.recyclerview:recyclerview:1.4.0")
9292
implementation("androidx.viewpager2:viewpager2:1.1.0")
93-
implementation("androidx.navigation:navigation-fragment-ktx:2.8.9")
94-
implementation("androidx.navigation:navigation-ui-ktx:2.8.9")
93+
implementation("androidx.navigation:navigation-fragment-ktx:2.9.0")
94+
implementation("androidx.navigation:navigation-ui-ktx:2.9.0")
9595

9696
//数据库
97-
implementation("androidx.room:room-ktx:2.7.0")
98-
implementation("androidx.room:room-runtime:2.7.0")
99-
ksp("androidx.room:room-compiler:2.7.0")
97+
implementation("androidx.room:room-ktx:2.7.1")
98+
implementation("androidx.room:room-runtime:2.7.1")
99+
ksp("androidx.room:room-compiler:2.7.1")
100100

101101
//图片查看
102102
implementation("com.github.chrisbanes:PhotoView:2.3.0")
@@ -108,7 +108,7 @@ dependencies {
108108

109109
//lifecycle
110110
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
111-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.7")
111+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.1")
112112

113113
//协程
114114
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
@@ -126,7 +126,7 @@ dependencies {
126126
//持久化存储
127127
//请勿修改此版本,否则app会不支持32位设备
128128
//noinspection GradleDependency
129-
implementation("com.tencent:mmkv:1.3.11")
129+
implementation("com.tencent:mmkv:1.3.14")
130130

131131
//图片加载
132132
implementation("com.github.bumptech.glide:glide:4.16.0")

app/src/main/java/com/cyh128/hikari_novel/data/model/AppTheme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ enum class AppTheme {
55
GreenApple,
66
Lavender,
77
MidnightDusk,
8-
Nord,
8+
Nord, //已废弃
99
StrawberryDaiquiri,
1010
Tako,
1111
TealTurquoise,

app/src/main/java/com/cyh128/hikari_novel/data/model/Event.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ sealed class Event {
1818
data object SignInFailureEvent: Event() //签到失败
1919
data object TempSignInUnableEvent: Event() //临时签到不可用事件
2020
data object RefreshSearchHistoryEvent: Event() //刷新搜索记录事件
21+
data object EmptyContentEvent: Event() //空内容事件
2122

2223
data object RemoveNovelFromListEvent: Event() //从书架批量删除小说事件
2324
data object MoveNovelFromListEvent: Event() //从书架批量移动小说事件

app/src/main/java/com/cyh128/hikari_novel/data/model/Exception.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ class InFiveSecondException: Exception()
1010
class SignedInException: Exception()
1111

1212
//临时登录签到异常
13-
class TempSignInException: Exception()
13+
class TempSignInException: Exception()
14+
15+
//空内容异常
16+
class EmptyException: Exception()

app/src/main/java/com/cyh128/hikari_novel/data/repository/Wenku8Repository.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.cyh128.hikari_novel.R
55
import com.cyh128.hikari_novel.data.model.Bookshelf
66
import com.cyh128.hikari_novel.data.model.ChapterContentResponse
77
import com.cyh128.hikari_novel.data.model.CommentResponse
8+
import com.cyh128.hikari_novel.data.model.EmptyException
89
import com.cyh128.hikari_novel.data.model.HomeBlock
910
import com.cyh128.hikari_novel.data.model.InFiveSecondException
1011
import com.cyh128.hikari_novel.data.model.LoginResponse
@@ -634,6 +635,8 @@ class Wenku8Repository @Inject constructor(
634635
network.getFromAppWenku8Com(requestUrl)
635636
.awaitResult {
636637
try {
638+
if (it.trim().isEmpty()) return Result.failure(EmptyException())
639+
637640
val image = Wenku8Parser.getImageFromContent(it)
638641
var content = it
639642
content = content.replace(

0 commit comments

Comments
 (0)