From: snickersun <scy@incartech.cn>
Date: Fri, 6 Nov 2020 08:00:15 +0000 (+0800)
Subject: release V689
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f35cd9496a2cdd4485ac9bc4c8a85028167431b3;p=protocol_srv.git

release V689
修改protocol_ic BP40下发文本协议 解码，VitracK 直接使用不解码，默认采用gb2312解码。解决与原来客户H88兼容问题。
---

diff --git a/app/release/ICSer_V688_2011041727_release.apk b/app/release/ICSer_V689_2011061556_release.apk
similarity index 78%
rename from app/release/ICSer_V688_2011041727_release.apk
rename to app/release/ICSer_V689_2011061556_release.apk
index 1e3bbb34..f93e814c 100644
Binary files a/app/release/ICSer_V688_2011041727_release.apk and b/app/release/ICSer_V689_2011061556_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 52963475..a9c2eeff 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":688,"versionName":"2011041727","enabled":true,"outputFile":"ICSer_V688_2011041727_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V688_2011041727_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":689,"versionName":"2011061556","enabled":true,"outputFile":"ICSer_V689_2011061556_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V689_2011061556_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 6296d98b..e28e300d 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1231,12 +1231,11 @@ public class protocol_ic {
         if (cmdlist.length == 4){
             String cmdindex=cmdlist[2];
             String txtmsg=cmdlist[3];
-            if(Config.custom_name.equals("AK")) {
-                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);
-            }else if (Config.custom_name.equals("VitracK")){
+            if (Config.custom_name.equals("VitracK")){
 
             }else{
-                txtmsg = Util.decodeUnicode2Utf8(txtmsg);
+//                txtmsg = Util.decodeUnicode2Utf8(txtmsg);
+                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);
             }
             StringMessage msg=AP40(cmdindex,1);
             //设定当前工作模式及循环频率
diff --git a/app/version_code.properties b/app/version_code.properties
index 7594c8cd..9c22d76e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Nov 04 17:27:07 CST 2020
-VERSION_CODE=688
+#Fri Nov 06 15:56:55 CST 2020
+VERSION_CODE=689