From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 1 Sep 2021 09:46:07 +0000 (+0800)
Subject: completed encode issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=25450e61100b99b45208ca837ef16da04ef91970;p=icsupport.git

completed encode issues.
---

diff --git a/app/release/ICSer_V934_2109011157_release.apk b/app/release/ICSer_V936_2109011634_release.apk
similarity index 77%
rename from app/release/ICSer_V934_2109011157_release.apk
rename to app/release/ICSer_V936_2109011634_release.apk
index 53e6a3d2..27db775d 100644
Binary files a/app/release/ICSer_V934_2109011157_release.apk and b/app/release/ICSer_V936_2109011634_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 5f9e35f8..83c3a63f 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":934,"versionName":"2109011157","enabled":true,"outputFile":"ICSer_V934_2109011157_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V934_2109011157_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":936,"versionName":"2109011634","enabled":true,"outputFile":"ICSer_V936_2109011634_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V936_2109011634_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index 99f7051d..6cbb5c0c 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -243,18 +243,19 @@ public class Util {
             Character.UnicodeBlock ub = Character.UnicodeBlock.of(myBuffer[i]);
             if (ub == Character.UnicodeBlock.BASIC_LATIN) {
                 //英文及数字等
-                sb.append(myBuffer[i]);
+                short s = (short) myBuffer[i];
+                String hexS = Integer.toHexString(s);
+                sb.append("00").append(hexS.toLowerCase());
             } else if (ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
                 //全角半角字符
-                int j = (int) myBuffer[i] - 65248;
-                sb.append((char) j);
+                short j = (short) ((short) myBuffer[i] - 65248);
+                String hexS = Integer.toHexString(j);
+                sb.append("00").append(hexS);
             } else {
                 //汉字
                 short s = (short) myBuffer[i];
                 String hexS = Integer.toHexString(s);
-//                String unicode = "\\u" + hexS;
-                String unicode = hexS;
-                sb.append(unicode.toLowerCase());
+                sb.append(hexS.toLowerCase());
             }
         }
         return sb.toString();
diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 3609af4d..5fa73404 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -609,14 +609,12 @@ public class protocol_s123 {
         } else {
             return "";
         }
-
         for (CMD_TYPE key : cmdMap.keySet()) {
             if (msg.startsWith(CMDHEADER + cmdMap.get(key))) {
                 ICLogger.i("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key));
                 return cmdMap.get(key);
             }
         }
-
         return "";
     }
 
@@ -2992,7 +2990,12 @@ public class protocol_s123 {
             responseText = "";
             type = "1";
         }
+        //AP94
         ICLogger.d("responseText ==> " + responseText);
+        String encode = Util.utf8ToUnicode(responseText);
+        ICLogger.d("encode ==> " + encode);
+        String result = Util.decodeUnicode2Utf8(encode);
+        ICLogger.d("parse result ===> " + result);
         //在UI逻辑中，只要有处理就都是已经阅读。所以不存在取消阅读的说法。
         return genStringMessage(cmdMap.get(CMD_TYPE.AP94),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP94))
diff --git a/app/version_code.properties b/app/version_code.properties
index 8d18ed6c..9fd1a2eb 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 01 11:57:24 CST 2021
-VERSION_CODE=934
+#Wed Sep 01 16:34:35 CST 2021
+VERSION_CODE=936