release V681

添加充电消息APCH
修复S123 Vitrack中 BP40文字解析

diff --git a/app/release/ICSer_V680_2010271815_release.apk b/app/release/ICSer_V681_2010281030_release.apk
similarity index 78%
rename from app/release/ICSer_V680_2010271815_release.apk
rename to app/release/ICSer_V681_2010281030_release.apk
index 040c7e1..3a55c18 100644 (file)
Binary files a/app/release/ICSer_V680_2010271815_release.apk and b/app/release/ICSer_V681_2010281030_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 366412b..be1196f 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":680,"versionName":"2010271815","enabled":true,"outputFile":"ICSer_V680_2010271815_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V680_2010271815_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":681,"versionName":"2010281030","enabled":true,"outputFile":"ICSer_V681_2010281030_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V681_2010281030_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
index 4a3981e..c328fc2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
@@ -63,9 +63,18 @@ public class BatteryUtil {
           }\r
           msg.append("; ");\r
           if (extra_status == BATTERY_STATUS_CHARGING) {\r
+            if(mRuntime.getBatterychanging()==false){\r
+              ICLogger.i("Send BatteryCharging event!");\r
+              connection.send(protocolAPIHelper.getChargingMSG(1));\r
+            }\r
             mRuntime.setBatterychanging(true);\r
             mRuntime.setBatteryLow(false);\r
           } else {\r
+            if(mRuntime.getBatterychanging()==true){\r
+              //send\r
+              ICLogger.i("Send no BatteryCharging event!");\r
+              connection.send(protocolAPIHelper.getChargingMSG(0));\r
+            }\r
             mRuntime.setBatterychanging(false);\r
           }\r
           int batLevel = intent.getIntExtra(EXTRA_LEVEL, 0) * 100 / intent.getIntExtra(EXTRA_SCALE, 100);\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 122af8b..d08f72c 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -186,6 +186,28 @@ public class protocolAPIHelper {
         }\r
         return ret;\r
     }\r
+\r
+    public static StringMessage getChargingMSG(int charging){\r
+        if (is_protocol_not_Initialled()) return null;\r
+        StringMessage ret=null;\r
+        switch(Config.protocol_no)\r
+        {\r
+            case Config.PROTOCOL_JIAI:\r
+                break;\r
+            case Config.PROTOCOL_BEEHOME:\r
+                break;\r
+            case Config.PROTOCOL_IC:\r
+                if(Config.custom_name.equals("VitracK"))\r
+                    ret=protocol_ic.APCH(charging);\r
+                break;\r
+            case Config.PROTOCOL_FZD:\r
+                break;\r
+            case Config.PROTOCOL_MQTT:\r
+                break;\r
+        }\r
+        return ret;\r
+    }\r
+\r
     public static StringMessage getWarningMSG(Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
         StringMessage ret=null;\r

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 700718c..a44141f 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -77,6 +77,8 @@ public class protocol_ic {
         BPHT,\r
         APTM,//基站校时及获取定位\r
         BPTM,\r
+        APCH,//充电提示\r
+        BPCH,\r
         /* 服务器发起*/\r
         AP12,\r
         BP12,//SOS 号码设置\r
@@ -181,6 +183,8 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BPHT, "BPHT");\r
         cmdMap.put(CMD_TYPE.APTM, "APTM");\r
         cmdMap.put(CMD_TYPE.BPTM, "BPTM");\r
+        cmdMap.put(CMD_TYPE.APCH, "APCH");\r
+        cmdMap.put(CMD_TYPE.BPCH, "BPCH");\r
         /* 服务器发起*/\r
         cmdMap.put(CMD_TYPE.AP12, "AP12");\r
         cmdMap.put(CMD_TYPE.BP12, "BP12");\r
@@ -1213,7 +1217,13 @@ public class protocol_ic {
         if (cmdlist.length == 4){\r
             String cmdindex=cmdlist[2];\r
             String txtmsg=cmdlist[3];\r
-            txtmsg=Util.UrlGB2312ToUTF8(txtmsg);\r
+            if(Config.custom_name.equals("AK")) {\r
+                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);\r
+            }else if (Config.custom_name.equals("VitracK")){\r
+\r
+            }else{\r
+                txtmsg = Util.decodeUnicode2Utf8(txtmsg);\r
+            }\r
             StringMessage msg=AP40(cmdindex,1);\r
             //设定当前工作模式及循环频率\r
             connection.send(msg);\r
@@ -2567,6 +2577,16 @@ public class protocol_ic {
             ICLogger.i(" BPAT Format error！");\r
         }\r
     }\r
+\r
+\r
+    public static StringMessage APCH(int charging)\r
+    {\r
+        return genStringMessage("APCH",new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APCH))\r
+                .append(CMDSPLIT).append(charging)\r
+                .append(CMDEND).toString());\r
+    }\r
+\r
+\r
     public boolean handleCmd(CMD_TYPE type, String cmd) {\r
 \r
            //普通非二进制命令用此函数处理\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 75b56ed..e7c88a3 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Oct 27 18:15:20 CST 2020\r
-VERSION_CODE=680\r
+#Wed Oct 28 10:30:12 CST 2020\r
+VERSION_CODE=681\r