[release] 5.4.8

heyanLE · heyanLE · commit 076efff74c8c · 2025-08-03T21:31:01.000+08:00
diff --git a/app/src/main/assets/extension_test.js b/app/src/main/assets/extension_test.js
diff --git a/app/src/main/assets/update_log.txt b/app/src/main/assets/update_log.txt
@@ -1,3 +1,8 @@
+- 2025/08/03 5.4.7
+  修复 历史记录丢失问题
+  修复 添加 js 源时崩溃问题
+
+
 - 2024/11/10 5.4.6 紧急修复
   新增 js 番剧源加载和添加功能（调试套件下版本添加）
   修复 录制视频 Bug
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/extension/push/PushFromRepo.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/extension/push/PushFromRepo.kt
@@ -62,11 +62,13 @@ class PushFromRepo(
         // 2. 解析 jsonl
         val taskList = repoJsonlFile.bufferedReader().use {
             it.readLines().map {
-                JSONObject(it)
+                runCatching {
+                    JSONObject(it)
+                }.getOrNull()
             }.mapNotNull {
-                val url = it.optString("url")
-                val key = it.optString("key")
-                if (url.isEmpty() || key.isEmpty()) {
+                val url = it?.optString("url")
+                val key = it?.optString("key")
+                if (url?.isEmpty() != false || key?.isEmpty() != false) {
                     return@mapNotNull null
                 }
                 key to url
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/component/JSPageComponent.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/component/JSPageComponent.kt
@@ -190,7 +190,11 @@ class JSPageComponent(
                     if (data.isNotEmpty() && data.first() !is CartoonCover) {
                         throw ParserException("js parse error")
                     }
-                    return@requestRunWithScope nextKey to data.filterIsInstance<CartoonCover>()
+                    return@requestRunWithScope nextKey to data.filterIsInstance<CartoonCover>().apply {
+                        this.forEach {
+//                            it.coverUrl.logi("JsPageComponent")
+                        }
+                    }
                 }
             }.apply {
                 this.logi("JSPageComponent")
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/source/JSComponentBundle.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/source/JSComponentBundle.kt
@@ -67,23 +67,26 @@ class JSComponentBundle(
 
 
         jsSource.jsScope.runWithScope { context, scriptable ->
-            // 2. import
-            context.evaluateString(
-                scriptable,
-                JsSource.JS_IMPORT,
-                "import",
-                1,
-                null
-            )
 
-            // 3. 注入工具给 JS
+
+
+            // 2. 注入工具给 JS
             bundle.forEach { (k, v) ->
                 val simpleName = k.simpleName ?: return@forEach
                 val name = "Inject_${simpleName}"
                 name.logi("JsImport")
                 scriptable.put(name, scriptable, v)
             }
 
+            // 3. import
+            context.evaluateString(
+                scriptable,
+                JsSource.JS_IMPORT,
+                "import",
+                1,
+                null
+            )
+
             // 4. 加载插件源代码
             if (jsFile == null) {
                 context.evaluateString(
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/source/JsSource.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/source/JsSource.kt
@@ -41,10 +41,14 @@ class JsSource(
             importPackage(Packages.java.net);
             
             importPackage(Packages.org.jsoup);
+            importPackage(Packages.org.json);
             importPackage(Packages.okhttp3);
            
+           
             
             var Log = JSLogUtils;
+            var SourceUtils = JSSourceUtils;
+            var source = Inject_Source;
          
             
             function makeCartoonCover(map) {
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/JSSourceUtils.java b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/JSSourceUtils.java
@@ -3,6 +3,8 @@
 
 import com.heyanle.easybangumi4.source_api.utils.core.SourceUtils;
 
+import org.jsoup.Jsoup;
+
 import kotlin.text.Regex;
 
 /**
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/OkhttpRequestKtWrapper.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/OkhttpRequestKtWrapper.kt
@@ -0,0 +1,71 @@
+package com.heyanle.easybangumi4.plugin.js.utils
+
+import com.heyanle.easybangumi4.source_api.utils.core.network.GET
+import com.heyanle.easybangumi4.source_api.utils.core.network.POST
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.Request
+import org.jsoup.Jsoup
+
+/**
+ * Created by heyanle on 2025/8/3
+ * https://github.com/heyanLE
+ */
+object OkhttpRequestKtWrapper {
+    fun get(url: String): Request {
+        return GET(url)
+    }
+
+    fun get(url: String, headerMap: Map<String, String>): Request {
+        val hb = Headers.Builder()
+        headerMap.forEach { (key, value) ->
+            hb.add(key, value)
+        }
+        return GET(url, hb.build())
+    }
+
+    fun post(url: String): Request {
+        return POST(url)
+    }
+
+    fun postFormBody(
+        url: String,
+        formBody: Map<String, Any> = emptyMap(),
+        headerMap: Map<String, Any> = emptyMap()
+    ): Request {
+        val hb = Headers.Builder()
+        headerMap.forEach { (key, value) ->
+            hb.add(key, value.toString())
+        }
+        val fb = FormBody.Builder()
+        formBody.forEach { (key, value) ->
+            fb.add(key, value.toString())
+        }
+
+
+        return POST(
+            url,
+            hb.build(),
+            fb.build()
+        )
+    }
+
+
+    fun postFormBody(
+        url: String,
+        formBody: Map<String, Any> = emptyMap(),
+    ): Request {
+
+        val fb = FormBody.Builder()
+        formBody.forEach { (key, value) ->
+            fb.add(key, value.toString())
+        }
+
+
+        return POST(
+            url,
+            Headers.Builder().build(),
+            fb.build()
+        )
+    }
+}
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/OkhttpUtils.java b/app/src/main/java/com/heyanle/easybangumi4/plugin/js/utils/OkhttpUtils.java
@@ -0,0 +1,38 @@
+package com.heyanle.easybangumi4.plugin.js.utils;
+
+import com.google.gson.JsonObject;
+import com.heyanle.easybangumi4.source_api.utils.core.network.RequestKt;
+
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+
+import java.util.Map;
+
+import okhttp3.Request;
+
+/**
+ * Created by heyanle on 2025/8/3
+ * https://github.com/heyanLE
+ */
+public class OkhttpUtils {
+
+    public static Request get(String url){
+        return OkhttpRequestKtWrapper.INSTANCE.get(url);
+    }
+
+    public static Request get(String url, Map<String, String> header){
+        return OkhttpRequestKtWrapper.INSTANCE.get(url, header);
+    }
+
+    public static Request post(String url){
+        return OkhttpRequestKtWrapper.INSTANCE.post(url);
+    }
+
+    public static Request postFromBody(String url, Map<String, Object> fromBody){
+        return OkhttpRequestKtWrapper.INSTANCE.postFormBody(url, fromBody);
+    }
+
+
+
+
+}
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/source/utils/network/OkhttpHelperImpl.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/source/utils/network/OkhttpHelperImpl.kt
@@ -10,9 +10,11 @@ import com.heyanle.easybangumi4.plugin.source.utils.network.interceptor.UserAgen
 import com.heyanle.easybangumi4.source_api.utils.api.NetworkHelper
 import com.heyanle.easybangumi4.source_api.utils.api.OkhttpHelper
 import com.heyanle.easybangumi4.source_api.utils.api.WebViewHelper
+import com.heyanle.easybangumi4.source_api.utils.core.network.GET
 import okhttp3.Cache
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import org.jsoup.Jsoup
 import java.io.File
 import java.security.SecureRandom
 import java.security.cert.CertificateException
@@ -81,6 +83,9 @@ class OkhttpHelperImpl(
     override val cloudflareWebViewClient: OkHttpClient
         get() = _cloudflareWebViewClient
 
+    init {
+    }
+
     private fun createSSLSocketFactory(): SSLSocketFactory {
         return runCatching {
             SSLContext.getInstance("TLS").let {
diff --git a/app/src/main/java/com/heyanle/easybangumi4/plugin/source/utils/network/WebViewHelperV2Impl.kt b/app/src/main/java/com/heyanle/easybangumi4/plugin/source/utils/network/WebViewHelperV2Impl.kt
@@ -167,6 +167,7 @@ class WebViewHelperV2Impl: WebViewHelperV2 {
                         ignoreTimeoutExt = false
                     )
                 } catch (e: CancellationException) {
+                    e.printStackTrace()
                     recyclerWebView(webview)
                     return@withContext WebViewHelperV2.RenderedResult(
                         strategy,
diff --git a/app/src/main/java/com/heyanle/easybangumi4/ui/cartoon_play/view_model/CartoonPlayingViewModel.kt b/app/src/main/java/com/heyanle/easybangumi4/ui/cartoon_play/view_model/CartoonPlayingViewModel.kt
@@ -418,6 +418,7 @@ class CartoonPlayingViewModel(
         val epi = playingEpisode ?: return
         val cartoon = cartoonPlayingState?.cartoonSummary ?: return
         scope.launch {
+            val process = if (ps >= 0) ps else exoPlayer.currentPosition
             cartoonInfoDao.transaction {
                 val old = cartoonInfoDao.getByCartoonSummary(cartoon.id, cartoon.source)
                 if (old != null) {
@@ -428,7 +429,8 @@ class CartoonPlayingViewModel(
                                 lineIndex,
                                 line,
                                 epi,
-                                if (ps >= 0) ps else exoPlayer.currentPosition
+                                process
+
                             )
                         )
                     }
diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/Android.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/Android.kt
@@ -9,8 +9,8 @@ object Android {
     const val targetSdk = 34
     const val compileSdk = 34
 
-    const val versionCode = 99
-    const val versionName = "5.4.7"
+    const val versionCode = 100
+    const val versionName = "5.4.8"
 
 
 }

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,11 @@ class JSPageComponent(`
`190`	`190`	`if (data.isNotEmpty() && data.first() !is CartoonCover) {`
`191`	`191`	`throw ParserException("js parse error")`
`192`	`192`	`}`
`193`		`- return@requestRunWithScope nextKey to data.filterIsInstance<CartoonCover>()`
	`193`	`+ return@requestRunWithScope nextKey to data.filterIsInstance<CartoonCover>().apply {`
	`194`	`+ this.forEach {`
	`195`	`+// it.coverUrl.logi("JsPageComponent")`
	`196`	`+ }`
	`197`	`+ }`
`194`	`198`	`}`
`195`	`199`	`}.apply {`
`196`	`200`	`this.logi("JSPageComponent")`