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 1e3bbb3..f93e814 100644 (file)
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 5296347..a9c2eef 100644 (file)
--- 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 6296d98..e28e300 100644 (file)
--- 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){\r
             String cmdindex=cmdlist[2];\r
             String txtmsg=cmdlist[3];\r
-            if(Config.custom_name.equals("AK")) {\r
-                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);\r
-            }else if (Config.custom_name.equals("VitracK")){\r
+            if (Config.custom_name.equals("VitracK")){\r
 \r
             }else{\r
-                txtmsg = Util.decodeUnicode2Utf8(txtmsg);\r
+//                txtmsg = Util.decodeUnicode2Utf8(txtmsg);\r
+                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);\r
             }\r
             StringMessage msg=AP40(cmdindex,1);\r
             //设定当前工作模式及循环频率\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 7594c8c..9c22d76 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Nov 04 17:27:07 CST 2020\r
-VERSION_CODE=688\r
+#Fri Nov 06 15:56:55 CST 2020\r
+VERSION_CODE=689\r