v2.5.8

优化
1. 主页加载速度
2. 默认UA判定
3. TCP Client

Author: fumiama

.idea/dictionaries/fumiama.xml

@@ -12,8 +12,8 @@ android {
         minSdkVersion 23
         //noinspection OldTargetApi
         targetSdkVersion 34
-        versionCode 80
-        versionName '2.5.7'
+        versionCode 81
+        versionName '2.5.8'
         resourceConfigurations += ['zh', 'zh-rCN']
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -124,4 +124,5 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
     implementation 'com.airbnb.android:lottie:6.6.6'
     implementation 'net.java.dev.jna:jna:5.17.0@aar'
+    implementation 'top.fumiama:sdict:0.1.0'
 }

app/build.gradle

@@ -63,7 +63,7 @@ import top.fumiama.copymanga.api.update.Update
 import top.fumiama.copymanga.api.user.Member
 import top.fumiama.copymanga.lib.Comancry
 import top.fumiama.copymanga.lib.Comandy
-import top.fumiama.copymanga.storage.DataLoader
+import top.fumiama.copymanga.storage.ConfigLoader
 import top.fumiama.copymanga.strings.Base16384
 import top.fumiama.dmzj.copymanga.BuildConfig
 import top.fumiama.dmzj.copymanga.R
@@ -225,15 +225,15 @@ class MainActivity : AppCompatActivity() {
                         toolsBox.buildInfo("备份管理", "可选择导出或导入base16384格式配置项",
                             "导出", "导入", "取消", { // ok
                                 MaterialDialog(this).show {
-                                    input(prefill = Base16384.encode(DataLoader().toByteArray()))
+                                    input(prefill = Base16384.encode(ConfigLoader().toByteArray()))
                                     positiveButton(android.R.string.ok)
                                     title(null, "请复制配置文本并保存")
                                 }
                             }, { // neutral
                                 MaterialDialog(this).show {
                                     input { _, c ->
                                         try {
-                                            DataLoader(Base16384.decode(c.toString())).settings.export()
+                                            ConfigLoader(Base16384.decode(c.toString())).settings.export()
                                             navController?.apply {
                                                 currentDestination?.id?.let {
                                                     popBackStack()

app/src/main/java/top/fumiama/copymanga/MainActivity.kt

@@ -58,6 +58,7 @@ object Config {
 
     val proxyUrl = MainActivity.mainWeakReference?.get()?.getString(R.string.proxyUrl)!!
     val pc_ua get() = MainActivity.mainWeakReference?.get()?.getString(R.string.pc_ua)?.format(app_ver.value)?:""
+    val default_ua get() = MainActivity.mainWeakReference?.get()?.getString(R.string.default_ua)?:""
     val referer get() = MainActivity.mainWeakReference?.get()?.getString(R.string.referer)?.format(app_ver.value)?:""
 
     val navTextInfo = UserPreferenceString("navTextInfo", R.string.navTextInfo)
@@ -95,7 +96,7 @@ object Config {
     val net_img_resolution = PreferenceString(R.string.imgResolutionKeyID)
     val net_umstring = PreferenceString("settings_cat_net_et_umstring")
     val net_source = PreferenceString("settings_cat_net_et_source", R.string.source)
-    val net_ua = PreferenceString("settings_cat_net_et_ua", "__default_ua__")
+    val net_ua = PreferenceString("settings_cat_net_et_ua", R.string.default_ua)
 
     val view_manga_inverse_chapters = PreferenceBoolean("settings_cat_vm_sw_inverse_chapters", false)
     val view_manga_always_dark_bg = PreferenceBoolean("settings_cat_vm_sw_always_dark_bg", false)

app/src/main/java/top/fumiama/copymanga/api/Config.kt

@@ -1,7 +1,7 @@
 package top.fumiama.copymanga.api.update
 
 import android.util.Log
-import top.fumiama.copymanga.net.Client
+import top.fumiama.sdict.io.Client
 
 class SimpleKanban(private val client: Client, private val pwd: String) {   //must run in thread
     private val raw: ByteArray?
@@ -51,13 +51,13 @@ class SimpleKanban(private val client: Client, private val pwd: String) {   //mu
             client.sendMessage("${pwd}get${version}quit")
             client.receiveRawMessage(36)             //Welcome to simple kanban server. get
             val r = try {
-                val firstRecv = client.receiveRawMessage(4)
-                if(firstRecv.decodeToString() == "null") "null"
+                val firstReceive = client.receiveRawMessage(4)
+                if(firstReceive.decodeToString() == "null") "null"
                 else {
-                    val length = convert2Int(firstRecv)
+                    val length = convert2Int(firstReceive)
                     Log.d("MySK", "Msg len: $length")
                     var re = byteArrayOf()
-                    if(firstRecv.size > 4) re += firstRecv.copyOfRange(4, firstRecv.size)
+                    if(firstReceive.size > 4) re += firstReceive.copyOfRange(4, firstReceive.size)
                     re += client.receiveRawMessage(length - re.size)
                     if(re.isNotEmpty()) re.decodeToString() else "null"
                 }

app/src/main/java/top/fumiama/copymanga/api/update/ByteArrayQueue.kt

@@ -16,10 +16,11 @@ import kotlinx.android.synthetic.main.dialog_progress.view.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import top.fumiama.copymanga.net.Client
+import top.fumiama.sdict.io.Client
 import top.fumiama.copymanga.view.interaction.UITools
 import top.fumiama.dmzj.copymanga.BuildConfig
 import top.fumiama.dmzj.copymanga.R
+import top.fumiama.sdict.utils.Utils.toHexStr
 import java.io.File
 import java.security.MessageDigest
 
@@ -63,7 +64,7 @@ object Update {
                     fetch(client, kanban, this@apply) {
                         lifecycleScope.launch {
                             val md5 = msg.substringAfterLast("md5:")
-                            if (md5 == UITools.toHexStr(
+                            if (md5 == toHexStr(
                                     MessageDigest.getInstance("MD5").digest(it)
                                 )
                             ) {

app/src/main/java/top/fumiama/copymanga/api/update/SimpleKanban.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import top.fumiama.copymanga.MainActivity
 import top.fumiama.copymanga.json.ComandyVersion
-import top.fumiama.copymanga.net.Client
+import top.fumiama.sdict.io.Client
 import top.fumiama.copymanga.net.DownloadTools
 import top.fumiama.copymanga.storage.PreferenceBoolean
 import top.fumiama.copymanga.storage.UserPreferenceInt

app/src/main/java/top/fumiama/copymanga/api/update/Update.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
+import top.fumiama.sdict.io.Client
 import top.fumiama.copymanga.api.Config
 import top.fumiama.copymanga.api.Config.proxyUrl
 import top.fumiama.copymanga.json.ComandyCapsule
@@ -34,7 +35,7 @@ object DownloadTools {
         connection.apply {
             Config.net_ua.value.let {
                 if (it.isEmpty()) return@let
-                setRequestProperty("user-agent", if (it == "__default_ua__") Config.pc_ua else it)
+                setRequestProperty("user-agent", if (it == Config.default_ua) Config.pc_ua else it)
             }
             Config.net_source.value.let { if(it.isNotEmpty()) setRequestProperty("source", it) }
             // deviceinfo
@@ -43,7 +44,7 @@ object DownloadTools {
             if (Config.net_use_gzip.value) setRequestProperty("accept-encoding", "gzip")
             setRequestProperty("authorization", "Token${Config.token.value?.let { tk ->
                 if (tk.isNotEmpty()) " $tk" else ""
-            }}")
+            }?:""}")
             if (Config.net_platform.value) setRequestProperty("platform", Config.platform.value)
             if (Config.net_referer.value) setRequestProperty("referer", Config.referer)
             if (Config.net_use_json.value) setRequestProperty("accept", "application/json")
@@ -66,7 +67,7 @@ object DownloadTools {
             capsule.headers = hashMapOf()
             Config.net_ua.value.let {
                 if (it.isEmpty()) return@let
-                capsule.headers["user-agent"] = if (it == "__default_ua__") Config.pc_ua else it
+                capsule.headers["user-agent"] = if (it == Config.default_ua) Config.pc_ua else it
             }
             Config.net_source.value.let { if(it.isNotEmpty()) capsule.headers["source"] = it }
             // deviceinfo
@@ -75,7 +76,7 @@ object DownloadTools {
             if (Config.net_use_gzip.value) capsule.headers["accept-encoding"] = "gzip"
             capsule.headers["authorization"] = "Token${Config.token.value?.let { tk ->
                 if (tk.isNotEmpty()) " $tk" else ""
-            }}"
+            }?:""}"
             if (Config.net_platform.value) capsule.headers["platform"] = Config.platform.value
             if (Config.net_referer.value) capsule.headers["referer"] = Config.referer
             if (Config.net_use_json.value) capsule.headers["accept"] = "application/json"