From: k.liang <liangkang648253071@126.com>
Date: Tue, 3 Aug 2021 10:20:38 +0000 (+0800)
Subject: 1.安安下发心率测试时，改为全部测试，而不是只有心率测试   2.增加聚合定位指令  3.增加体温上下行指令  4.修改血压上传时舒张压数据错误的bug
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d07cea0078515de2f21993b8a025e88deefeb998;p=icsupport.git

1.安安下发心率测试时，改为全部测试，而不是只有心率测试   2.增加聚合定位指令  3.增加体温上下行指令  4.修改血压上传时舒张压数据错误的bug
---

diff --git a/app/release/output.json b/app/release/output.json
index 235c8408..e38ca067 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":904,"versionName":"2107301549","enabled":true,"outputFile":"ICSer_V904_2107301549_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V904_2107301549_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":906,"versionName":"2108031814","enabled":true,"outputFile":"ICSer_V906_2108031814_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V906_2108031814_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index af24db43..6e348d69 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -622,7 +622,7 @@ public class Config {
                     ICLogger.i("协议 Gator");
                     break;
                 default:
-                    ICLogger.i("协议版本 目前支持0,1,2,3,4,5,6,7");
+                    ICLogger.i("协议版本 目前支持0,1,2,3,4,5,6,7" + tmp);
                     ret = PROTOCOL_UNKNOWN;
                     break;
             }
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index c28f4059..3a268058 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -401,7 +401,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
                 if (heartRateSensorService != null) {
                     //判断类型，如果不是GH301的硬件，直接走全部测试
                     String isGh301 = Util.getSystemProperties("persist.sys.is_gh301", "false");
-                    if (!Boolean.parseBoolean(isGh301)) {
+                    String customname = Util.getSystemProperties("persist.sys.customname");
+                    ICLogger.i("customname = "+customname);
+                    if (!Boolean.parseBoolean(isGh301) || customname.equals("AA")) {
                         heartRateSensorService.getHeartRateInfo(from, HeartRateManager.class.getName());
                     } else {
                         //如果是的话，就要判断类型了
diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index c3223b90..5aa661e9 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -342,6 +342,7 @@ public class Util {
             e.printStackTrace();
             ICLogger.e(e.getMessage(), e);
         }
+        ICLogger.i("getSystemProperties str = "+str);
         return str;
     }
 
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index b42678f6..0c7e5ea9 100644
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -371,6 +371,9 @@ public class protocolAPIHelper {
             case Config.PROTOCOL_GATOR:
                 ret = null;
                 break;
+            case PROTOCOL_ANAN:
+                ret = protocol_anan.APTP(body_temp, tempout);
+                break;
         }
         return ret;
     }
diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 477f4219..367a4ce1 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -132,7 +132,7 @@ public class protocol_anan {
     /**
      * 聚合定位
      */
-    public static StringMessage APDW(Runtime ds){
+    public static StringMessage APDW(Runtime ds) {
         int apsum = 0;
         String wifiinfo = ds.getWifiInfo();
         if (!wifiinfo.isEmpty()) {
@@ -216,6 +216,7 @@ public class protocol_anan {
         APFD/*交好友*/,
         AP07/*语音上行*/,
         AP95/*语音上行给好友*/,
+        APTP/*体温上行*/,
 
         /**
          * # 平台下发指令
@@ -299,7 +300,8 @@ public class protocol_anan {
         BP00/*登录包*/,
         BP03/*心跳*/,
         APDW/*聚合定位上行*/,
-        BPDW/*聚合定位下行*/
+        BPDW/*聚合定位下行*/,
+        BPTP/*体温下行*/
     }
 
     private final static HashMap<CMD_TYPE, String> cmdMap;
@@ -319,6 +321,7 @@ public class protocol_anan {
         cmdMap.put(CMD_TYPE.APWA, "APWA");
         cmdMap.put(CMD_TYPE.APFD, "APFD");
         cmdMap.put(CMD_TYPE.APDW, "APDW");
+        cmdMap.put(CMD_TYPE.APTP, "APTP");
         /* 服务器发起*/
         cmdMap.put(CMD_TYPE.BP12, "BP12");
         cmdMap.put(CMD_TYPE.AP45, "AP45");
@@ -370,7 +373,8 @@ public class protocol_anan {
         cmdMap.put(CMD_TYPE.AP26, "AP26");
         cmdMap.put(CMD_TYPE.BP03, "BP03");
         cmdMap.put(CMD_TYPE.BPDW, "BPDW");
-        cmdMap.put(CMD_TYPE.BPBJ,"BPBJ");
+        cmdMap.put(CMD_TYPE.BPBJ, "BPBJ");
+        cmdMap.put(CMD_TYPE.BPTP, "BPTP");
     }
 
 
@@ -466,6 +470,7 @@ public class protocol_anan {
         if (!lang.contains("zh")) {
             language = 1;
         }
+        ICLogger.i("AnAn APTQ");
         String mnc = runtime.getLocationInstance().getMNC();
         return genStringMessage("APTQ", new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTQ))
                 .append(CMDSPLIT).append(runtime.getLocationInstance().getMCC())
@@ -641,7 +646,7 @@ public class protocol_anan {
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APHT)).append(CMDSPLIT)
                         .append(runtime.getHRS().getPPG()/*心率*/)
                         .append(CMDSPLIT)
-                        .append(runtime.getHRS().getBPL()/*收缩压*/)
+                        .append(runtime.getHRS().getBPH()/*收缩压*/)
                         .append(CMDSPLIT)
                         .append(runtime.getHRS().getBPL()/*舒张压*/)
                         .append(CMDSPLIT)
@@ -1951,4 +1956,19 @@ public class protocol_anan {
         return -1;
     }
 
+
+    public static StringMessage APTP(double body_temp,double tempout) {
+        //体温上行
+        //IWAPTP,34.3,27.3#
+        //设备：	IWAPTP,36.3,33,132#
+        //IW：标识符
+        //APTP : 命令字符
+        //35.3：测量体温 （摄氏度）
+        //33，132：温补用的参数，此处不用，可以用0 来代替。 目前是代表的腕温，室外温度
+        return genStringMessage(cmdMap.get(protocol_anan.CMD_TYPE.APTP), new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_anan.CMD_TYPE.APTP))
+                .append(CMDSPLIT).append(String.format("%1$.1f", body_temp))
+                .append(CMDSPLIT).append(String.format("%1$.1f", tempout))
+                .append(CMDEND).toString());
+    }
+
 }
diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 841ee1ba..1e390592 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -3267,8 +3267,9 @@ public class protocol_s123 {
             case BPXL:
                 handleBPXL(cmd, mConnection);
                 ICLogger.i("收到服务器心率检测命令");
-                if (mRuntime.check_stat_do_ppg_test())
+                if (mRuntime.check_stat_do_ppg_test()) {
                     HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
+                }
                 break;
             case BPXY:
                 handleBPXY(cmd, mConnection);
diff --git a/app/version_code.properties b/app/version_code.properties
index e6f1f187..812d87f0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Jul 30 15:49:03 CST 2021
-VERSION_CODE=904
+#Tue Aug 03 18:14:04 CST 2021
+VERSION_CODE=906