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 498090c..4e6ff5d 100644 (file)
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 f32d67b..ed9a255 100644 (file)
--- 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) {\r
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {\r
                         //测试温度并上报\r
-                        double wrist_temp=paramIntent.getDoubleExtra(KEY_TEMP_WRIST,0.0f);\r
-                        double body_temp=paramIntent.getDoubleExtra(KEY_TEMP_BODY,0.0f);\r
+                        double wrist_temp=TemperatureUtil.get_temp_value_adjusted();\r
+                        double body_temp=TemperatureUtil.getBodyTemp(wrist_temp,26.0f);\r
                         String temperatureMsg=getTemperatureMSG(wrist_temp,body_temp);\r
                         ICLogger.i("发送体温测量值 "+temperatureMsg);\r
                         Deliver.sendLocationMSG(temperatureMsg);\r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index f087fa6..b71917b 100644 (file)
--- 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#")) {\r
                 sendSMS(phonenumber, DeviceInfoUtil.getPackageVersions(mContext));\r
            } else if (sms.startsWith(ENCRYPED_HEADER+"#showui#")) {\r
+                Util.setSystemProperties("persist.sys.debugprotocol","true");\r
                 Intent intent=new Intent();\r
 //                intent.setClassName(MainActivity.class.getPackage().getName(),MainActivity.class.getName());\r
                 intent.setClass(mContext,MainActivity.class);\r
@@ -852,8 +853,21 @@ public class ICSmsManager {
                         {\r
                             sendSMS(phonenumber, "current is JiAi Protocol!");\r
                         }\r
+                    }else if(strtmp.equalsIgnoreCase("ic")){\r
+                        if(Config.protocol_no!=Config.PROTOCOL_IC) {\r
+                            Util.setSystemProperties("persist.sys.protocol_no", "2");\r
+                            Config.getProtocolNumber();\r
+                            Config.setCustomServer(mContext,false,Config.BeehomeHost,Config.BeehomePort);\r
+                            Config.loadServerSettings(runtime);\r
+                            sendSMS(phonenumber, "set setprotocol to IC Protocol!");\r
+                            CoreService.getInstance().disconnect_server();\r
+                            CoreService.getInstance().ReConnectToServer();\r
+                        }else\r
+                        {\r
+                            sendSMS(phonenumber, "current is IC Protocol!");\r
+                        }\r
                     }else{\r
-                        sendSMS(phonenumber, " only support protocol JiAi and Beehome!");\r
+                        sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!");\r
                     }\r
                 } else {\r
                     sendSMS(phonenumber, " setprotocol cmd Format error!");\r

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 de7d437..e9c8afa 100644 (file)
--- 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;\r
 import static com.ic.protocols.protocolAPIHelper.genStringMessage;\r
 import static com.ic.protocols.protocolAPIHelper.getTemperatureMSG;\r
-import static com.ic.protocols.protocol_beehome.APTP;\r
+\r
 \r
 public class ProcessReceiver extends BroadcastReceiver {\r
   private static final int MICRO_CHAT = 2;\r

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 17af63f..7fa942d 100644 (file)
--- 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;\r
             case BPHT:\r
                 ICLogger.i("服务器收到上传的心率血压");\r
+                mConnection.DeliverCMDMessageToSystem("IWAPHT",cmd);//通知下面线程状态变化\r
                 break;\r
             case BP84:\r
                 handleBP84(cmd,mConnection);\r
@@ -1983,9 +1984,12 @@ public class protocol_beehome {
 \r
             case BPTP:\r
                 handleBPTP();\r
-                mConnection.DeliverCMDMessageToSystem("APTP",cmd);//通知下面线程状态变化\r
+                mConnection.DeliverCMDMessageToSystem("IWAPTP",cmd);//通知下面线程状态变化\r
+                break;\r
+            case BPHP:\r
+                handleBPHP();\r
+                mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化\r
                 break;\r
-\r
             case BPX1://设置 心率血压血氧修正值\r
                 handleBPX1(cmd,mConnection,mRuntime);\r
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");\r

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 73d12db..80aaaa2 100644 (file)
--- 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;\r
             case BPHT:\r
                 ICLogger.i("服务器收到上传的心率血压");\r
+                mConnection.DeliverCMDMessageToSystem("IWAPHT",cmd);//通知下面线程状态变化\r
                 break;\r
             case BP84:\r
                 handleBP84(cmd,mConnection);\r
@@ -1982,9 +1983,12 @@ public class protocol_ic {
 \r
             case BPTP:\r
                 handleBPTP();\r
-                mConnection.DeliverCMDMessageToSystem("APTP",cmd);//通知下面线程状态变化\r
+                mConnection.DeliverCMDMessageToSystem("IWAPTP",cmd);//通知下面线程状态变化\r
+                break;\r
+            case BPHP:\r
+                handleBPHP();\r
+                mConnection.DeliverCMDMessageToSystem("IWAPHP",cmd);//通知下面线程状态变化\r
                 break;\r
-\r
             case BPX1://设置 心率血压血氧修正值\r
                 handleBPX1(cmd,mConnection,mRuntime);\r
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f10bb81..f71d654 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jul 04 18:37:53 CST 2020\r
-VERSION_CODE=436\r
+#Fri Jul 10 09:28:07 CST 2020\r
+VERSION_CODE=438\r