release V611

通过服务器地址兼容protocol_ic和protocol_jiai

diff --git a/app/release/ICSer_V610_2009101142_release.apk b/app/release/ICSer_V611_2009101859_release.apk
similarity index 78%
rename from app/release/ICSer_V610_2009101142_release.apk
rename to app/release/ICSer_V611_2009101859_release.apk
index 461f52c..c57c7fb 100644 (file)
Binary files a/app/release/ICSer_V610_2009101142_release.apk and b/app/release/ICSer_V611_2009101859_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 283d1d8..9339130 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -837,7 +837,7 @@ public class CoreService extends Service {
                                     + " light " + si.getLightsleep_minutes()\r
                                     + " score " + si.getScore()\r
                             );\r
-                            Deliver.sendLocationMSG(protocolAPIHelper.getSleepMSG(SleepInfo.getInstance()));\r
+                            Deliver.sendLocationMSG(protocolAPIHelper.getSleepMSG(SleepInfo.getInstance(),runtime));\r
 //                        }\r
 //                    });\r
 \r

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 709f657..f901c65 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -413,7 +413,7 @@ public static void triggerPPGtest(){
 \r
 \r
 \r
-              StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2));\r
+              StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2),runtime);\r
               if(PPGDATA==null){\r
                 StringMessage ppgd=protocolAPIHelper.getPPG_MSG(Integer.parseInt(ppg),runtime);\r
                 StringMessage bloodd=protocolAPIHelper.getBlood_MSG( Integer.parseInt(bph), Integer.parseInt(bpl),runtime);\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 1ce0437..e1060e0 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -192,7 +192,7 @@ public class ProcessReceiver extends BroadcastReceiver {
           var1.dismiss();\r
           VibrateUtil.getInstance(context).VibrateOn(false);\r
           if(CoreService.getInstance()!=null) {\r
-            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG());\r
+            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG(CoreService.getInstance().getRuntime()));\r
           }\r
         }\r
       }).create();\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 31b3b03..adf5d76 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -153,7 +153,14 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.APTP(temp_adusted,body_temp);\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APTP(temp_adusted,body_temp);\r
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))\r
+                {\r
+                    //为了兼容即爱的服务器而设定。\r
+                    ret=null;\r
+                }else {\r
+                    ret=protocol_ic.APTP(temp_adusted,body_temp);\r
+                }\r
+\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=protocol_fzd.temp(body_temp);\r
@@ -465,7 +472,7 @@ public class protocolAPIHelper {
         }\r
         return ret;\r
     }\r
-    public static StringMessage getPPG_ECG_MSG(int  ppg,int bph,int bpl,int spo2){\r
+    public static StringMessage getPPG_ECG_MSG(int  ppg,int bph,int bpl,int spo2,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
 \r
         StringMessage ret=null;\r
@@ -478,7 +485,13 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.APHP(ppg,bph,bpl,spo2);\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APHP(ppg,bph,bpl,spo2);\r
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))\r
+                {\r
+                    ret=protocol_ic.APHT(ppg,bph,bpl);\r
+\r
+                }else {\r
+                    ret = protocol_ic.APHP(ppg, bph, bpl, spo2);\r
+                }\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;\r
@@ -537,7 +550,7 @@ public class protocolAPIHelper {
         }\r
         return ret;\r
     }\r
-    public static StringMessage getSleepMSG(SleepInfo sr){\r
+    public static StringMessage getSleepMSG(SleepInfo sr,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
@@ -549,7 +562,12 @@ public class protocolAPIHelper {
                 ret=null;\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APSL(sr.getCurrentDate(),sr.getDeepsleep_minutes(),sr.getLightsleep_minutes(),sr.getScore());\r
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))\r
+                {\r
+                    ret=null;\r
+                }else {\r
+                    ret = protocol_ic.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());\r
+                }\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;\r
@@ -561,7 +579,7 @@ public class protocolAPIHelper {
         return ret;\r
     }\r
 \r
-    public static StringMessage getPushTxtReadFlagToSrvMSG( ){\r
+    public static StringMessage getPushTxtReadFlagToSrvMSG(Runtime runtime ){\r
         if (is_protocol_not_Initialled()) return null;\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
@@ -573,7 +591,12 @@ public class protocolAPIHelper {
                 ret=null;\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=null;\r
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))\r
+                {\r
+                    ret=protocolic_handler.AP94();;\r
+                }else {\r
+                    ret = null;\r
+                }\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;\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 2166cab..31a9d40 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -55,6 +55,8 @@ public class protocol_ic {
         BP02,\r
         AP92,//CDMA 混合定位\r
         BP92,\r
+        AP94,\r
+        BP94,\r
         AP03,//心跳包\r
         BP03,\r
         AP05,//语音查询接收\r
@@ -151,6 +153,8 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BP02, "BP02");\r
         cmdMap.put(CMD_TYPE.AP92, "AP92");\r
         cmdMap.put(CMD_TYPE.BP92, "BP92");\r
+        cmdMap.put(CMD_TYPE.AP94, "AP94");\r
+        cmdMap.put(CMD_TYPE.BP94, "BP94");\r
         cmdMap.put(CMD_TYPE.AP03, "AP03");\r
         cmdMap.put(CMD_TYPE.BP03, "BP03");\r
         cmdMap.put(CMD_TYPE.AP05, "AP05");\r
@@ -2226,6 +2230,28 @@ public class protocol_ic {
 \r
 \r
 \r
+    public static StringMessage AP94( ){\r
+        /***\r
+         * 15确认已读文字（上行协议号：AP94，响应：BP94）\r
+         * 示例：\r
+         * IWAP94,123456,1#\r
+         * 说明：\r
+         * IWAP94：标识符\r
+         * APHCI: 命令字符\r
+         * 123456: 文字来源系统流水号\r
+         * 1:确认阅读、0：取消阅读\r
+         * 平台响应：     IWBP94#\r
+         * 表示平台已接收，可不作响应\r
+         * 说明：   本消息适用所有终端\r
+         */\r
+\r
+        //在UI逻辑中，只要有处理就都是已经阅读。所以不存在取消阅读的说法。\r
+        return genStringMessage(cmdMap.get(protocol_ic.CMD_TYPE.AP94),new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_ic.CMD_TYPE.AP94))\r
+                .append(CMDSPLIT).append(Runtime.PushtxtMsg_srv_index)\r
+                .append(CMDSPLIT).append("1")\r
+                .append(CMDEND).toString());\r
+\r
+    }\r
 \r
 \r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index a8ba9c2..9f233db 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 11:42:44 CST 2020\r
-VERSION_CODE=610\r
+#Thu Sep 10 18:59:36 CST 2020\r
+VERSION_CODE=611\r