From: snickersun <scy@incartech.cn>
Date: Wed, 28 Oct 2020 03:23:15 +0000 (+0800)
Subject: release V681
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=2a6aa0a775b3a6b5d92eabab1a7b1e26b373f3ee;p=protocol_srv.git

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 040c7e1d..3a55c186 100644
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 366412b5..be1196fd 100644
--- 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 4a3981e8..c328fc23 100644
--- 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 {
           }
           msg.append("; ");
           if (extra_status == BATTERY_STATUS_CHARGING) {
+            if(mRuntime.getBatterychanging()==false){
+              ICLogger.i("Send BatteryCharging event!");
+              connection.send(protocolAPIHelper.getChargingMSG(1));
+            }
             mRuntime.setBatterychanging(true);
             mRuntime.setBatteryLow(false);
           } else {
+            if(mRuntime.getBatterychanging()==true){
+              //send
+              ICLogger.i("Send no BatteryCharging event!");
+              connection.send(protocolAPIHelper.getChargingMSG(0));
+            }
             mRuntime.setBatterychanging(false);
           }
           int batLevel = intent.getIntExtra(EXTRA_LEVEL, 0) * 100 / intent.getIntExtra(EXTRA_SCALE, 100);
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 122af8be..d08f72c1 100644
--- 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 {
         }
         return ret;
     }
+
+    public static StringMessage getChargingMSG(int charging){
+        if (is_protocol_not_Initialled()) return null;
+        StringMessage ret=null;
+        switch(Config.protocol_no)
+        {
+            case Config.PROTOCOL_JIAI:
+                break;
+            case Config.PROTOCOL_BEEHOME:
+                break;
+            case Config.PROTOCOL_IC:
+                if(Config.custom_name.equals("VitracK"))
+                    ret=protocol_ic.APCH(charging);
+                break;
+            case Config.PROTOCOL_FZD:
+                break;
+            case Config.PROTOCOL_MQTT:
+                break;
+        }
+        return ret;
+    }
+
     public static StringMessage getWarningMSG(Runtime runtime){
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret=null;
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 700718c3..a44141f6 100644
--- 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,
         APTM,//基站校时及获取定位
         BPTM,
+        APCH,//充电提示
+        BPCH,
         /* 服务器发起*/
         AP12,
         BP12,//SOS 号码设置
@@ -181,6 +183,8 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BPHT, "BPHT");
         cmdMap.put(CMD_TYPE.APTM, "APTM");
         cmdMap.put(CMD_TYPE.BPTM, "BPTM");
+        cmdMap.put(CMD_TYPE.APCH, "APCH");
+        cmdMap.put(CMD_TYPE.BPCH, "BPCH");
         /* 服务器发起*/
         cmdMap.put(CMD_TYPE.AP12, "AP12");
         cmdMap.put(CMD_TYPE.BP12, "BP12");
@@ -1213,7 +1217,13 @@ public class protocol_ic {
         if (cmdlist.length == 4){
             String cmdindex=cmdlist[2];
             String txtmsg=cmdlist[3];
-            txtmsg=Util.UrlGB2312ToUTF8(txtmsg);
+            if(Config.custom_name.equals("AK")) {
+                txtmsg = Util.UrlGB2312ToUTF8(txtmsg);
+            }else if (Config.custom_name.equals("VitracK")){
+
+            }else{
+                txtmsg = Util.decodeUnicode2Utf8(txtmsg);
+            }
             StringMessage msg=AP40(cmdindex,1);
             //设定当前工作模式及循环频率
             connection.send(msg);
@@ -2567,6 +2577,16 @@ public class protocol_ic {
             ICLogger.i(" BPAT Format error！");
         }
     }
+
+
+    public static StringMessage APCH(int charging)
+    {
+        return genStringMessage("APCH",new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APCH))
+                .append(CMDSPLIT).append(charging)
+                .append(CMDEND).toString());
+    }
+
+
     public boolean handleCmd(CMD_TYPE type, String cmd) {
 
            //普通非二进制命令用此函数处理
diff --git a/app/version_code.properties b/app/version_code.properties
index 75b56ed0..e7c88a35 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Oct 27 18:15:20 CST 2020
-VERSION_CODE=680
+#Wed Oct 28 10:30:12 CST 2020
+VERSION_CODE=681