From: snickersun <scy@incartech.cn>
Date: Thu, 24 Sep 2020 07:18:10 +0000 (+0800)
Subject: release ICL02ProtocolV2 V627
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=4ee43172480dfc10564677bc263be85ca649d168;p=protocol_srv.git

release ICL02ProtocolV2 V627
1、jiai协议补全，添加温度，天气等
2、bleScan timeout时间 从5 改为10 ，因为客户说 现场布置可能超过67个设备。会造成想要扫描的设备还没扫到就停止扫描了。
3、SMS增加 #getWeather#命令
4、缩减一些无用的日志，节省日志空间。
---

diff --git a/app/release/ICSer_V624_2009192208_release.apk b/app/release/ICSer_V627_2009241508_release.apk
similarity index 78%
rename from app/release/ICSer_V624_2009192208_release.apk
rename to app/release/ICSer_V627_2009241508_release.apk
index df7fde12..d9e6d9e7 100644
Binary files a/app/release/ICSer_V624_2009192208_release.apk and b/app/release/ICSer_V627_2009241508_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 4be690bd..b127e662 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":624,"versionName":"2009192208","enabled":true,"outputFile":"ICSer_V624_2009192208_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V624_2009192208_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":627,"versionName":"2009241508","enabled":true,"outputFile":"ICSer_V627_2009241508_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V627_2009241508_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 f3eb5773..a9b81ccb 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -34,7 +34,7 @@ public class Config {
   private static String json;
   public static int defaultHeartbeatCycle=5;
   public static int sw_release_no = -1;
-
+  public static int bleScanTimeout=10;
   public static String work_mode = "2@1";
 
   public static final String JiAiHost="watch.jiai.pro";
diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index eed0c6c7..72862202 100644
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -285,8 +285,9 @@ public interface Constants {
   
   public static final String WAKE_ALARM = "com.enqualcomm.support.WAKE_ALARM";
   
-  public static final String WEATHER_ALARM = "com.enqualcomm.support.ACTION_WEATHER_ALARM";
-  
+  public static final String WEATHER_ALARM = "com.ic.alarm.ACTION_WEATHER_ALARM";
+  public static final String WEATHER_ACTION = "com.ic.action.ACTION_GET_WEATHER";
+
   public static final int WIFI_SET_RESULT = 217;
   
   public static final int WORKMODE_CHANGED = 211;
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 9ef58550..842094c0 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -797,6 +797,9 @@ public class ICSmsManager  extends BroadcastReceiver {
                 CoreService.DevliverStringMessage("poweroff");
             }else if (sms.startsWith(ENCRYPED_HEADER+"#packagevers#")) {
                 sendSMS(phonenumber, DeviceInfoUtil.getPackageVersions(mContext));
+            }else if (sms.startsWith(ENCRYPED_HEADER+"#getWeather#")) {
+                sendSMS(phonenumber, "do get Weather!");
+                CoreService.DevliverStringMessage("getWeather");
            } else if (sms.startsWith(ENCRYPED_HEADER+"#showui#")) {
                 Util.setSystemProperties("persist.sys.debugprotocol","true");
                 Intent intent=new Intent();
diff --git a/app/src/main/java/com/enqualcomm/support/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
index 038c34b2..e073847f 100644
--- a/app/src/main/java/com/enqualcomm/support/NMEAListener.java
+++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
@@ -269,7 +269,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
         if (snr.trim().isEmpty()) {
           snr = "0";
         }
-        ICLogger.i("Sat=" + satindex + ",prn=" + prn + ",snr=" + snr);
+//        ICLogger.i("Sat=" + satindex + ",prn=" + prn + ",snr=" + snr);
 
         int intprn = Integer.valueOf(prn);
         float floatsnr = Float.valueOf(snr);
diff --git a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
index db7192e7..19c96d9c 100644
--- a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
@@ -9,6 +9,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Handler;
 
+import com.enqualcomm.support.Config;
 import com.enqualcomm.support.utils.ICLogger;
 
 import java.util.ArrayList;
@@ -183,15 +184,15 @@ public class BTHelper {
 
 
 
-        mBtAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE,5);
+        mBtAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE, Config.bleScanTimeout);
         LeScanCallback lecallback=new LeScanCallback(){
 
             @Override
             public void onLeScan(BluetoothDevice bluetoothDevice, int rssi, byte[] scanRecode) {
-                ICLogger.i( "BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi);
-                ICLogger.logToFile("LBS","BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi );
+//                ICLogger.i( "BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi);
+//                ICLogger.logToFile("LBS","BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi );
                 if(!mNewDevicesArray.contains(bluetoothDevice.getAddress()))
-                    mNewDevicesArray.add(bluetoothDevice.getAddress());
+                    mNewDevicesArray.add(bluetoothDevice.getAddress()+","+rssi);
             }
         };
 
diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index 8d793f01..40981b04 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -451,6 +451,10 @@ public class Deliver extends AbstractConnectionService {
     } else if ("heartbeat".equals(paramStringMessage.cmd())) {
       //每次心跳，查询一下 是否有语音消息需要接收。
 //      paramConnection.send(protocolAPIHelper.genStringMessage("AP05",protocolAPIHelper.AP05(true)));
+
+    } else if ("getWeather".equals(paramStringMessage.cmd())) {
+      ICLogger.i("获取天气");
+      mConnection.send(protocolAPIHelper.getWeatherMSG(mRuntime));
     } else if ("NewVoice".equals(paramStringMessage.cmd()))
     {
       new Handler().postDelayed(new Runnable() {
@@ -539,8 +543,6 @@ public class Deliver extends AbstractConnectionService {
       return true;
     }
 
-
-
     return false;
   }
 
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index d727af54..9e193271 100644
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -169,7 +169,7 @@ public class protocolAPIHelper {
         switch(Config.protocol_no)
         {
             case Config.PROTOCOL_JIAI:
-                ret=null;
+                ret=protocol_jiai.AP50(runtime);
                 break;
             case Config.PROTOCOL_BEEHOME:
                 ret=protocol_beehome.APTP(temp_adusted,body_temp);
@@ -350,19 +350,13 @@ public class protocolAPIHelper {
         switch(Config.protocol_no)
         {
             case Config.PROTOCOL_JIAI:
-                ret=protocol_jiai.APHT(runtime);
+                ret=protocol_jiai.APHP(runtime);
                 break;
             case Config.PROTOCOL_BEEHOME:
                 ret=protocol_beehome.APHP(runtime);
                 break;
             case Config.PROTOCOL_IC:
-                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
-                {
-                    //为了兼容即爱的服务器而设定。
-                    ret=protocol_ic.APHT(runtime);
-                }else {
-                    ret = protocol_ic.APHP(runtime);
-                }
+                ret = protocol_ic.APHP(runtime);
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
@@ -501,19 +495,13 @@ public class protocolAPIHelper {
         switch(Config.protocol_no)
         {
             case Config.PROTOCOL_JIAI:
-                ret=protocol_jiai.APHT(ppg,bph,bpl);
+                ret=protocol_jiai.APHP(ppg,bph,bpl,spo2);
                 break;
             case Config.PROTOCOL_BEEHOME:
                 ret=protocol_beehome.APHP(ppg,bph,bpl,spo2);
                 break;
             case Config.PROTOCOL_IC:
-                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
-                {
-                    ret=protocol_ic.APHT(ppg,bph,bpl);
-
-                }else {
-                    ret = protocol_ic.APHP(ppg, bph, bpl, spo2);
-                }
+                ret = protocol_ic.APHP(ppg, bph, bpl, spo2);
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
@@ -524,7 +512,30 @@ public class protocolAPIHelper {
         }
         return ret;
     }
+    public static StringMessage getWeatherMSG(Runtime runtime){
+        if (is_protocol_not_Initialled()) return null;
 
+        StringMessage ret=null;
+        switch(Config.protocol_no)
+        {
+            case Config.PROTOCOL_JIAI:
+                ret=protocol_jiai.APWT();
+                break;
+            case Config.PROTOCOL_BEEHOME:
+                ret=null;
+                break;
+            case Config.PROTOCOL_IC:
+                ret = null;
+                break;
+            case Config.PROTOCOL_FZD:
+                ret=null;
+                break;
+            case Config.PROTOCOL_MQTT:
+                ret=null;
+                break;
+        }
+        return ret;
+    }
 
     public static String getDefaultServerIP(){
 
diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java
index c2e55c97..0b84819c 100644
--- a/app/src/main/java/com/ic/protocols/protocol_jiai.java
+++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
+import android.text.TextUtils;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.CoreService;
@@ -60,10 +61,16 @@ public class protocol_jiai {
         BP10,
         AP49,//心率上传
         BP49,
+        AP50,//体温上传
+        BP50,
         APHT,//心率血压上传
         BPHT,
+        APHP,//心率血压血氧上传
+        BPHP,
         APTM,//基站校时及获取定位
         BPTM,
+        APWT,//同步天气
+        BPWT,
         AP94,//消息已读
         BP94,
         /* 服务器发起*/
@@ -101,10 +108,14 @@ public class protocol_jiai {
         BP85,//设置闹钟
         AP86,
         BP86,//心率血压测试周期
+        AP87,
+        BP87,//体温测试周期
         AP89,
         BP89,//心率血压阀值设置
         AP93,
         BP93,//服务器下发文本
+        APXT,
+        BPXT,//服务器下发测量体温
         UNKNOWN_CMD,
     }
 
@@ -130,10 +141,16 @@ public class protocol_jiai {
         cmdMap.put(CMD_TYPE.BP10, "BP10");
         cmdMap.put(CMD_TYPE.AP49, "AP49");
         cmdMap.put(CMD_TYPE.BP49, "BP49");
+        cmdMap.put(CMD_TYPE.AP50, "AP50");
+        cmdMap.put(CMD_TYPE.BP50, "BP50");
         cmdMap.put(CMD_TYPE.APHT, "APHT");
         cmdMap.put(CMD_TYPE.BPHT, "BPHT");
+        cmdMap.put(CMD_TYPE.APHP, "APHP");
+        cmdMap.put(CMD_TYPE.BPHP, "BPHP");
         cmdMap.put(CMD_TYPE.APTM, "APTM");
         cmdMap.put(CMD_TYPE.BPTM, "BPTM");
+        cmdMap.put(CMD_TYPE.APWT, "APWT");
+        cmdMap.put(CMD_TYPE.BPWT, "BPWT");
         cmdMap.put(CMD_TYPE.AP94, "AP94");
         cmdMap.put(CMD_TYPE.BP94, "BP94");
         cmdMap.put(CMD_TYPE.AP12, "AP12");
@@ -170,10 +187,14 @@ public class protocol_jiai {
         cmdMap.put(CMD_TYPE.BP85, "BP85");
         cmdMap.put(CMD_TYPE.AP86, "AP86");
         cmdMap.put(CMD_TYPE.BP86, "BP86");
+        cmdMap.put(CMD_TYPE.AP87, "AP87");
+        cmdMap.put(CMD_TYPE.BP87, "BP87");
         cmdMap.put(CMD_TYPE.AP89, "AP89");
         cmdMap.put(CMD_TYPE.BP89, "BP89");
         cmdMap.put(CMD_TYPE.AP93, "AP93");
         cmdMap.put(CMD_TYPE.BP93, "BP93");
+        cmdMap.put(CMD_TYPE.APXT, "APXT");
+        cmdMap.put(CMD_TYPE.BPXT, "BPXT");
     }
 
     private Connection mConnection=null;
@@ -1085,8 +1106,26 @@ public class protocol_jiai {
 
     }
 
+/***
+ * 9温度数据上传（上行协议号：AP50，响应：BP50）
+ * 示例：
+ * IWAP50,36.7,90#
+ * 说明：
+ * IW：标识符
+ * AP50 : 命令字符
+ * 36.7:温度
+ * 90:电量
+ * 平台响应：	IWBP50#
+ * 说明：	本消息适用所有终端
+ */
+public static StringMessage AP50(Runtime ds){
+    //示例数据：IWAP50,36.7,90#
+    return genStringMessage(cmdMap.get(CMD_TYPE.AP50),new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP50))
+            .append(CMDSPLIT).append(ds.tempInfo.currentBodyTemp)
+            .append(CMDSPLIT).append("100")
+            .append(CMDEND).toString());
 
-
+}
 
     /**
      * 返回上传心率血压的协议字串
@@ -1125,7 +1164,65 @@ public class protocol_jiai {
                 .append(CMDSPLIT).append(bpl)
                 .append(CMDEND).toString());
     }
+    public static StringMessage APHP(Runtime ds){
+        //IWAPHP,60,130,85,95,90, , , , , , , , #
+        //IW：标识符
+        //APHT : 命令字符
+        //60 : 表示心率
+        //130: 血压高压 [收缩压]
+        //85 : 血压低压 [舒张压]
+        //95：血氧
+        //90：血糖
+//        本消息适用所有终端，其中需要每项指标不一定全部有值，如果无值，则留空
+        return genStringMessage(cmdMap.get(protocol_ic.CMD_TYPE.APHP),new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_ic.CMD_TYPE.APHP))
+                .append(CMDSPLIT).append(ds.getHRS().getPPG())
+                .append(CMDSPLIT).append(ds.getHRS().getBPH())
+                .append(CMDSPLIT).append(ds.getHRS().getBPL())
+                .append(CMDSPLIT).append(ds.getHRS().getSpo2())
+                .append(CMDSPLIT).append(0)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDEND).toString());
+    }
+    public static StringMessage APHP(int ppg,int bph, int bpl, int spo2){
+        //IWAPHP,60,130,85,95,90, , , , , , , , #
+        //IW：标识符
+        //APHT : 命令字符
+        //60 : 表示心率
+        //130: 血压高压 [收缩压]
+        //85 : 血压低压 [舒张压]
+        //95：血氧
+        //90：血糖
+//        本消息适用所有终端，其中需要每项指标不一定全部有值，如果无值，则留空
+        return genStringMessage(cmdMap.get(protocol_ic.CMD_TYPE.APHP),new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_ic.CMD_TYPE.APHP))
+                .append(CMDSPLIT).append(ppg)
+                .append(CMDSPLIT).append(bph)
+                .append(CMDSPLIT).append(bpl)
+                .append(CMDSPLIT).append(spo2)
+                .append(CMDSPLIT).append(0)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDSPLIT)
+                .append(CMDEND).toString());
+    }
+
 
+    public void handleBPHP(){
+
+        ICLogger.i("服务器收到APHP 心率血压血氧 !");
+
+    }
 
     //立即定位反馈
     public static StringMessage AP16(String  cmdindex){
@@ -1555,10 +1652,124 @@ public class protocol_jiai {
 
     }
 
+
     public void handleBP94(){
 
     }
 
+    public static StringMessage APWT(){
+
+        return genStringMessage("APWT",new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APWT)).append(CMDEND).toString());
+
+    }
+
+    public void handleBPWT(Connection connection,Runtime runtime , String cmd) {
+/**
+ * 14同步天气（上行协议号：APWT，响应：BPWT）
+ * 示例：
+ * IWAPWT#
+ * 说明：
+ * IW：标识符
+ * APWT : 命令字符
+ * 平台响应：	IWBPWT, 深圳,  2018-12-24 16:45:5, 2018-12-25,1, 3,1,晴, 2018-12-26, -1,4,2, 阴, 2018-12-27,3,7, 3,小雨#
+ * 实际返回需要转换为unicode：
+ * IWBPWT, 6df15733,  2018-12-24 16:45:5, 2018-12-25,1, 3, 1, 6674, 2018-12-26, -1,4, 2,  9634, 2018-12-27,3,7, 3, 5c0f96e8#
+ * 深圳,所在城市，
+ * 2018-12-24 16:45:51 预报时间
+ * 2018-12-25: 当天日期
+ * 1：当天最低温度，表示1度
+ * 3：当天最高温度，表示3度
+ * 1:天气大类（1-晴、2-多云、3-雨、4-雪、5-未知）
+ * 晴：当天天气小类，中文描述
+ * 2018-12-26：第二天日期
+ * -1：第二天最低温度，表示-1度
+ * 4：第二天最高温度，表示4度
+ * 2：天气大类（1-晴、2-多云、3-雨、4-雪、5-未知）
+ * 阴：第二天天气
+ * 2018-12-27：第三天日期
+ * 3：第三天最低温度，表示3度
+ * 7：第三天最高温度，表示7度
+ * 3：天气大类（1-晴、2-多云、3-雨、4-雪、5-未知）
+ * 小雨：第三天天气
+ * 注：城市、天气为HEX的UNICODE编码,非明文；
+ * 在没有定位数据的情况下，则无法取到天气
+ * 如果未取到天气，则相关栏位留空，注意城市也有可能为空
+ * 说明：	本消息适用所有终端
+ */
+        String tmp,City,forecastTime,day1,day2,day3;
+        int temp_h_day1,temp_h_day2,temp_h_day3;
+        int temp_l_day1,temp_l_day2,temp_l_day3;
+        int temp_type_day1,temp_type_day2,temp_type_day3;
+        String temp_str_day1,temp_str_day2,temp_str_day3;
+
+        temp_h_day1=temp_h_day2=temp_h_day3=0;
+        temp_l_day1=temp_l_day2=temp_l_day3=0;
+        temp_type_day1=temp_type_day2=temp_type_day3=1;
+
+
+        String list[]=cmd.split(CMDSPLIT);
+
+        if (list.length==18){
+            try {
+                City = Util.decodeUnicode2Utf8(list[1]);
+                forecastTime = list[2];
+                day1 = list[3];
+                tmp = list[4];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_h_day1 = Integer.parseInt(tmp);
+                }
+                tmp = list[5];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_l_day1 = Integer.parseInt(tmp);
+                }
+                tmp = list[6];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_type_day1 = Integer.parseInt(tmp);
+                }
+                temp_str_day1=Util.decodeUnicode2Utf8(list[7]);
+                day2=list[8];
+                tmp = list[9];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_h_day2 = Integer.parseInt(tmp);
+                }
+                tmp = list[10];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_l_day2 = Integer.parseInt(tmp);
+                }
+                tmp = list[11];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_type_day2 = Integer.parseInt(tmp);
+                }
+                temp_str_day2=Util.decodeUnicode2Utf8(list[12]);
+                day3=list[13];
+                tmp = list[14];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_h_day3 = Integer.parseInt(tmp);
+                }
+                tmp = list[15];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_l_day3 = Integer.parseInt(tmp);
+                }
+                tmp = list[16];
+                if (Util.isNumeric(tmp.trim().replace("-",""))) {
+                    temp_type_day3 = Integer.parseInt(tmp);
+                }
+                temp_str_day3=Util.decodeUnicode2Utf8(list[17]);
+
+                ICLogger.i("天气预报城市 "+City+", 预报时间 "+forecastTime+",\n第一天 "+day1+", 最高温度 "+temp_h_day1+",最低温度 "+temp_l_day1+",天气类型 "+temp_type_day1+" "+temp_str_day1
+                        +", \n第二天 "+day2+", 最高温度 "+temp_h_day2+",最低温度 "+temp_l_day2+",天气类型 "+temp_type_day2+" "+temp_str_day2
+                        +", \n第三天 "+day3+", 最高温度 "+temp_h_day3+",最低温度 "+temp_l_day3+",天气类型 "+temp_type_day3+" "+temp_str_day3      );
+            }catch (Exception e){
+                e.printStackTrace();
+                ICLogger.i("BPWT format error!"+e.getMessage());
+            }
+
+        }else{
+            ICLogger.i("BPWT format error!");
+        }
+    }
+
+
     public boolean handleCmd(CMD_TYPE type, String cmd) {
 
         //普通非二进制命令用此函数处理
@@ -1574,12 +1785,12 @@ public class protocol_jiai {
             case BP01: //gps定位包
                 handleBP01(cmd);
                 ICLogger.i("服务器收到定位AP01");
-                mConnection.DeliverCMDMessageToSystem("AP01",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP01",cmd);//通知下面线程服务器收到指令
                 break;
             case BP02:// wifi定位包
                 handleBP02(cmd);
                 ICLogger.i("服务器收到定位AP02");
-                mConnection.DeliverCMDMessageToSystem("AP02",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP02",cmd);//通知下面线程服务器收到指令
                 break;
             case BP03: //心跳包
                 handleBP03(cmd);
@@ -1593,19 +1804,19 @@ public class protocol_jiai {
                 break;
             case BP10:
                 //报警包
-                mConnection.DeliverCMDMessageToSystem("AP10",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP10",cmd);//通知下面线程服务器收到指令
                 break;
 
             case BPTM:
                 //校时命令
                 handleBPTM(cmd);
                 ICLogger.i("服务器收到校时命令APTM");
-                mConnection.DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程服务器收到指令
                 break;
             case BP85://设置闹钟
                 handleBP85(cmd,mConnection,mRuntime);
                 ICLogger.i("收到服务器设置闹钟命令BP85");
-                mConnection.DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程服务器收到指令
                 break;
             case BP33:
                 //设置工作模式
@@ -1679,7 +1890,17 @@ public class protocol_jiai {
                 ICLogger.i("收到服务器血压校准命令");
                 break;
             case BPHT:
-                ICLogger.i("服务器收到上传的心率血压");
+                ICLogger.i("服务器收到上传的心率血压APHT");
+                mConnection.DeliverCMDMessageToSystem("APHT",cmd);//通知下面线程服务器收到指令
+                break;
+            case BPHP:
+                ICLogger.i("服务器收到上传的心率血压血氧APHP");
+                mConnection.DeliverCMDMessageToSystem("APHP",cmd);//通知下面线程服务器收到指令
+                break;
+
+            case BP50:
+                ICLogger.i("服务器收到体温AP50");
+                mConnection.DeliverCMDMessageToSystem("AP50",cmd);//通知下面线程服务器收到指令
                 break;
             case BP84:
                 handleBP84(cmd,mConnection);
@@ -1689,7 +1910,7 @@ public class protocol_jiai {
             case BP86:
                 //心率血压周期设置
                 handleBP86(cmd,mConnection,mRuntime);
-//                                ICLogger.i("");
+
                 break;
             case BP89:
                 //心率/血压阀值
@@ -1698,11 +1919,18 @@ public class protocol_jiai {
 
             case BP94:
                 handleBP94();
+                mConnection.DeliverCMDMessageToSystem("AP94",cmd);//通知下面线程状态变化
                 break;
             case BP93:
                 //服务器下发文版
                 handleBP93(mConnection,mRuntime,cmd);
                 break;
+
+            case BPWT:
+                //心率/血压阀值
+                handleBPWT(mConnection,mRuntime,cmd);
+                break;
+
         }
 
         return ret;
diff --git a/app/version_code.properties b/app/version_code.properties
index 468216ad..dfd67894 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Sep 19 22:08:22 CST 2020
-VERSION_CODE=624
+#Thu Sep 24 15:08:04 CST 2020
+VERSION_CODE=627