v1.2

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "top.fumiama.simpledict"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 3
+        versionCode 4
-        versionName '1.1.1'
+        versionName '1.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -54,7 +54,6 @@ android {
 }
 
 dependencies {
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -82,7 +81,6 @@ andResGuard {
     // it's always better to remove duplicated resource from repo
     mergeDuplicatedRes = true
     whiteList = [
-            "R.drawable.load",
             // your icon
             "R.drawable.icon",
             // for fabric
@@ -94,14 +92,9 @@ andResGuard {
             "R.string.ga_trackingId",
             "R.string.firebase_database_url",
             "R.string.google_api_key",
-            "R.string.google_crash_reporting_api_key",
+            "R.string.google_crash_reporting_api_key"
-            "R.font.*"
     ]
     compressFilePattern = [
-            "*.png",
-            "*.jpg",
-            "*.jpeg",
-            "*.gif",
             "resources.arsc"
     ]
     sevenzip {

app/src/main/java/top/fumiama/simpledict/Client.kt

@@ -57,27 +57,27 @@ class Client(val ip: String, val port: Int) {
         }
     }
 
-    fun receiveRawMessage()= try {
+    fun receiveRawMessage() : ByteArray {
+        var re = byteArrayOf()
+        try {
             if (isConnect) {
                 Log.d("MyC", "开始接收服务端信息")
-                val inMessage = ByteArray(1024)     //设置接受缓冲，避免接受数据过长占用过多内存
+                val inMessage = ByteArray(4096)     //设置接受缓冲，避免接受数据过长占用过多内存
-                val a = din?.read(inMessage) //a存储返回消息的长度
+                var a: Int
-                if (a == null || a <= -1) null
+                do {
-                else {
+                    a = din?.read(inMessage)?:0 //a存储返回消息的长度
-                    Log.d("MyC", "reply length:$a")
+                    Log.d("MyC", "reply length:$a: ${inMessage.decodeToString()}")
-                    inMessage.copyOf(a)
+                    re += inMessage.copyOf(a)
-                }
+                } while (a == 4096)
-            } else {
+            } else Log.d("MyC", "no connect to receive message")
-                Log.d("MyC", "no connect to receive message")
-                null
-            }
         } catch (e: IOException) {
             Log.d("MyC", "receive message failed")
             e.printStackTrace()
-            null
         }
+        return re
+    }
 
-    fun receiveMessage() = receiveRawMessage()?.decodeToString()
+    fun receiveMessage() = receiveRawMessage().decodeToString()
 
     /**
      * 关闭连接

app/src/main/java/top/fumiama/simpledict/SimpleDict.kt

@@ -6,13 +6,13 @@ import java.lang.Thread.sleep
 class SimpleDict(private val client: Client, private val pwd: String) {   //must run in thread
     private var dict = HashMap<String, String?>()
     val keys get() = dict.keys
-    val values get() = dict.values
+    //val values get() = dict.values
     //val size get() = dict.size
-    private val raw: ByteArray?
+    private val raw: ByteArray
         get() {
             initDict()
             client.sendMessage("cat")
-            sleep(233)
+            sleep(2333)
             val re = client.receiveRawMessage()
             closeDict()
             return re
@@ -47,7 +47,7 @@ class SimpleDict(private val client: Client, private val pwd: String) {   //must
 
     fun fetchDict() {
         val dictBlock = ByteArray(128)
-        raw?.inputStream()?.let {
+        raw.inputStream().let {
             var c = '1'
             while (!it.read().toChar().isDigit()) Log.d("MySD", "Skip banner.")
             while (c.isDigit()) {

app/src/main/res/layout/activity_main.xml

@@ -18,6 +18,7 @@
             android:layout_height="match_parent"
             app:contentScrim="?attr/colorSurface"
 
+            app:layout_scrollFlags="scroll"
             app:toolbarId="@+id/toolbar">
 
             <com.lapism.search.widget.MaterialSearchView

app/src/main/res/layout/line_word.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"

app/src/main/res/values-night/themes.xml

@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>

app/winrelease/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "top.fumiama.simpledict",
+  "variantName": "processWinreleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 4,
+      "versionName": "1.2",
+      "outputFile": "app-winrelease.apk"
+    }
+  ]
+}