fixed s123 some bugs.
authorTrillGates <williamtrillgates@gmail.com>
Mon, 9 Aug 2021 01:45:10 +0000 (09:45 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Mon, 9 Aug 2021 01:45:10 +0000 (09:45 +0800)
app/src/main/java/com/ic/protocols/protocol_s123.java
app/version_code.properties

index 3a49cd5..de088c2 100644 (file)
@@ -1468,15 +1468,18 @@ public class protocol_s123 {
 
 
     public static StringMessage AP33(String cmdindex, int workMode) {
-//IWAP33,080835,1#
-//080835:指令流水号
-//1:设置信息,供服务器同步
+        //IWAP33,080835,1#
+        //080835:指令流水号
+        //1:设置信息,供服务器同步
         return genStringMessage("AP33",
                 new StringBuffer(CMDHEADER)
                         .append(cmdMap.get(CMD_TYPE.AP33))
                         .append(CMDSPLIT).append(cmdindex)
                         .append(CMDSPLIT).append(workMode)
-                        .append(CMDSPLIT).append()
+                        // 下发内容与文档字段对不上
+                        // - 文档内容:IW**BP33**,353456789012345,080835,1,15,**0**#
+                        // - 下发内容:IWBP33,866671044898063,22453,1
+                        .append(CMDSPLIT).append("0")//这里得按协议来修改
                         .append(CMDEND).toString());
     }
 
@@ -2241,7 +2244,7 @@ public class protocol_s123 {
                 String index = list[2];
                 String freqstr = list[3];
                 int freq = Integer.parseInt(freqstr);
-                connection.send(APTE(index, freq));
+                connection.send(APTE(index));
                 ICLogger.i("收到服务器指令:测量体温 " + freq + "分钟一次。");
                 Config.setTemperatureTestCycle(runtime, freq * 60);
                 CoreService.getInstance().setTempAlarm(true);
@@ -2629,19 +2632,19 @@ public class protocol_s123 {
 
 
     public void handleBPTU(String cmd, Connection connection) {
-/***
- * 平台响应
- * IWBPTU,6654111,080835,1,1,6,1,1#
- * IW:标识符
- * APCU : 命令字符
- * 6654111:语音图片文字目标
- * 080835 :流水号
- * 1:文件类型
- * 1:内容类型
- * 6:内容总包数
- * 1:当前包序号
- * 1:成功 (0:失败)
- */
+        /***
+         * 平台响应
+         * IWBPTU,6654111,080835,1,1,6,1,1#
+         * IW:标识符
+         * APCU : 命令字符
+         * 6654111:语音图片文字目标
+         * 080835 :流水号
+         * 1:文件类型
+         * 1:内容类型
+         * 6:内容总包数
+         * 1:当前包序号
+         * 1:成功 (0:失败)
+         */
         String[] cmdlist = cmd.split(CMDSPLIT);
         if (cmdlist.length == 8) {
             try {
index 5062110..9e98f56 100644 (file)
@@ -1,2 +1,2 @@
-#Thu Aug 05 20:21:58 CST 2021\r
-VERSION_CODE=907\r
+#Fri Aug 06 21:21:29 CST 2021\r
+VERSION_CODE=909\r