From: snickersun <scy@incartech.cn>
Date: Fri, 10 Jul 2020 01:29:30 +0000 (+0800)
Subject: release V438
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=da696b040829012c95e5baeb039f4fe5721901c3;p=protocol_srv.git

release V438
1、添加 showui persist.sys.debugprotocol 变量，配合系统phoneWindowManager修改进行协议调试窗口的弹出
2、添加 #setProtocol IC protocol的短信命令
3、修复体温检测上报错误
4、修复 APHT,APTP,APHP 三个命令用Deliver发送时checkresponse 失败总是重试的问题。
---

diff --git a/app/release/ICSer_V436_2007041837_release.apk b/app/release/ICSer_V438_2007100928_release.apk
similarity index 78%
rename from app/release/ICSer_V436_2007041837_release.apk
rename to app/release/ICSer_V438_2007100928_release.apk
index 498090ca..4e6ff5d7 100644
Binary files a/app/release/ICSer_V436_2007041837_release.apk and b/app/release/ICSer_V438_2007100928_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f32d67b4..ed9a2550 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -770,8 +770,8 @@ public class CoreService extends Service {
                 if (this.mKeepAlive != null) {
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {
                         //测试温度并上报
-                        double wrist_temp=paramIntent.getDoubleExtra(KEY_TEMP_WRIST,0.0f);
-                        double body_temp=paramIntent.getDoubleExtra(KEY_TEMP_BODY,0.0f);
+                        double wrist_temp=TemperatureUtil.get_temp_value_adjusted();
+                        double body_temp=TemperatureUtil.getBodyTemp(wrist_temp,26.0f);
                         String temperatureMsg=getTemperatureMSG(wrist_temp,body_temp);
                         ICLogger.i("发送体温测量值 "+temperatureMsg);
                         Deliver.sendLocationMSG(temperatureMsg);
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index f087fa64..b71917b4 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -724,6 +724,7 @@ public class ICSmsManager {
             }else if (sms.startsWith(ENCRYPED_HEADER+"#packagevers#")) {
                 sendSMS(phonenumber, DeviceInfoUtil.getPackageVersions(mContext));
            } else if (sms.startsWith(ENCRYPED_HEADER+"#showui#")) {
+                Util.setSystemProperties("persist.sys.debugprotocol","true");
                 Intent intent=new Intent();
 //                intent.setClassName(MainActivity.class.getPackage().getName(),MainActivity.class.getName());
                 intent.setClass(mContext,MainActivity.class);
@@ -852,8 +853,21 @@ public class ICSmsManager {
                         {
                             sendSMS(phonenumber, "current is JiAi Protocol!");
                         }
+                    }else if(strtmp.equalsIgnoreCase("ic")){
+                        if(Config.protocol_no!=Config.PROTOCOL_IC) {
+                            Util.setSystemProperties("persist.sys.protocol_no", "2");
+                            Config.getProtocolNumber();
+                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);
+                            Config.loadServerSettings(runtime);
+                            sendSMS(phonenumber, "set setprotocol to IC Protocol!");
+                            CoreService.getInstance().disconnect_server();
+                            CoreService.getInstance().ReConnectToServer();
+                        }else
+                        {
+                            sendSMS(phonenumber, "current is IC Protocol!");
+                        }
                     }else{
-                        sendSMS(phonenumber, " only support protocol JiAi and Beehome!");
+                        sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!");
                     }
                 } else {
                     sendSMS(phonenumber, " setprotocol cmd Format error!");
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index de7d4370..e9c8afad 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -63,7 +63,7 @@ import static com.enqualcomm.support.Constants.STEP_COUNT_ALARM_ACTION;
 import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP;
 import static com.ic.protocols.protocolAPIHelper.genStringMessage;
 import static com.ic.protocols.protocolAPIHelper.getTemperatureMSG;
-import static com.ic.protocols.protocol_beehome.APTP;
+
 
 public class ProcessReceiver extends BroadcastReceiver {
   private static final int MICRO_CHAT = 2;
diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java
index 17af63fb..7fa942d3 100644
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -1952,6 +1952,7 @@ public class protocol_beehome {
                 break;
             case BPHT:
                 ICLogger.i("服务器收到上传的心率血压");
+                mConnection.DeliverCMDMessageToSystem("IWAPHT",cmd);//通知下面线程状态变化
                 break;
             case BP84:
                 handleBP84(cmd,mConnection);
@@ -1983,9 +1984,12 @@ public class protocol_beehome {
 
             case BPTP:
                 handleBPTP();
-                mConnection.DeliverCMDMessageToSystem("APTP",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAPTP",cmd);//通知下面线程状态变化
+                break;
+            case BPHP:
+                handleBPHP();
+                mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化
                 break;
-
             case BPX1://设置 心率血压血氧修正值
                 handleBPX1(cmd,mConnection,mRuntime);
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");
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 73d12dbd..80aaaa23 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1951,6 +1951,7 @@ public class protocol_ic {
                 break;
             case BPHT:
                 ICLogger.i("服务器收到上传的心率血压");
+                mConnection.DeliverCMDMessageToSystem("IWAPHT",cmd);//通知下面线程状态变化
                 break;
             case BP84:
                 handleBP84(cmd,mConnection);
@@ -1982,9 +1983,12 @@ public class protocol_ic {
 
             case BPTP:
                 handleBPTP();
-                mConnection.DeliverCMDMessageToSystem("APTP",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAPTP",cmd);//通知下面线程状态变化
+                break;
+            case BPHP:
+                handleBPHP();
+                mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化
                 break;
-
             case BPX1://设置 心率血压血氧修正值
                 handleBPX1(cmd,mConnection,mRuntime);
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");
diff --git a/app/version_code.properties b/app/version_code.properties
index f10bb818..f71d6541 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jul 04 18:37:53 CST 2020
-VERSION_CODE=436
+#Fri Jul 10 09:28:07 CST 2020
+VERSION_CODE=438