From: snickersun <scy@incartech.cn>
Date: Thu, 10 Sep 2020 11:01:01 +0000 (+0800)
Subject: release V611
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=12e29ebe26320f4895247ea670096ceb9286460b;p=protocol_srv.git

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 461f52c6..c57c7fbe 100644
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 283d1d8d..9339130b 100644
--- 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()
                                     + " score " + si.getScore()
                             );
-                            Deliver.sendLocationMSG(protocolAPIHelper.getSleepMSG(SleepInfo.getInstance()));
+                            Deliver.sendLocationMSG(protocolAPIHelper.getSleepMSG(SleepInfo.getInstance(),runtime));
 //                        }
 //                    });
 
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 709f6579..f901c653 100644
--- 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(){
 
 
 
-              StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2));
+              StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2),runtime);
               if(PPGDATA==null){
                 StringMessage ppgd=protocolAPIHelper.getPPG_MSG(Integer.parseInt(ppg),runtime);
                 StringMessage bloodd=protocolAPIHelper.getBlood_MSG( Integer.parseInt(bph), Integer.parseInt(bpl),runtime);
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 1ce0437a..e1060e09 100644
--- 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();
           VibrateUtil.getInstance(context).VibrateOn(false);
           if(CoreService.getInstance()!=null) {
-            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG());
+            CoreService.getInstance().getConnection().send(protocolAPIHelper.getPushTxtReadFlagToSrvMSG(CoreService.getInstance().getRuntime()));
           }
         }
       }).create();
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 31b3b033..adf5d763 100644
--- 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);
                 break;
             case Config.PROTOCOL_IC:
-                ret=protocol_ic.APTP(temp_adusted,body_temp);
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
+                {
+                    //为了兼容即爱的服务器而设定。
+                    ret=null;
+                }else {
+                    ret=protocol_ic.APTP(temp_adusted,body_temp);
+                }
+
                 break;
             case Config.PROTOCOL_FZD:
                 ret=protocol_fzd.temp(body_temp);
@@ -465,7 +472,7 @@ public class protocolAPIHelper {
         }
         return ret;
     }
-    public static StringMessage getPPG_ECG_MSG(int  ppg,int bph,int bpl,int spo2){
+    public static StringMessage getPPG_ECG_MSG(int  ppg,int bph,int bpl,int spo2,Runtime runtime){
         if (is_protocol_not_Initialled()) return null;
 
         StringMessage ret=null;
@@ -478,7 +485,13 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.APHP(ppg,bph,bpl,spo2);
                 break;
             case Config.PROTOCOL_IC:
-                ret=protocol_ic.APHP(ppg,bph,bpl,spo2);
+                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);
+                }
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
@@ -537,7 +550,7 @@ public class protocolAPIHelper {
         }
         return ret;
     }
-    public static StringMessage getSleepMSG(SleepInfo sr){
+    public static StringMessage getSleepMSG(SleepInfo sr,Runtime runtime){
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret=null;
         switch(Config.protocol_no)
@@ -549,7 +562,12 @@ public class protocolAPIHelper {
                 ret=null;
                 break;
             case Config.PROTOCOL_IC:
-                ret=protocol_ic.APSL(sr.getCurrentDate(),sr.getDeepsleep_minutes(),sr.getLightsleep_minutes(),sr.getScore());
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
+                {
+                    ret=null;
+                }else {
+                    ret = protocol_ic.APSL(sr.getCurrentDate(), sr.getDeepsleep_minutes(), sr.getLightsleep_minutes(), sr.getScore());
+                }
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
@@ -561,7 +579,7 @@ public class protocolAPIHelper {
         return ret;
     }
 
-    public static StringMessage getPushTxtReadFlagToSrvMSG( ){
+    public static StringMessage getPushTxtReadFlagToSrvMSG(Runtime runtime ){
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret=null;
         switch(Config.protocol_no)
@@ -573,7 +591,12 @@ public class protocolAPIHelper {
                 ret=null;
                 break;
             case Config.PROTOCOL_IC:
-                ret=null;
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
+                {
+                    ret=protocolic_handler.AP94();;
+                }else {
+                    ret = null;
+                }
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
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 2166cabc..31a9d40f 100644
--- 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,
         AP92,//CDMA 混合定位
         BP92,
+        AP94,
+        BP94,
         AP03,//心跳包
         BP03,
         AP05,//语音查询接收
@@ -151,6 +153,8 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BP02, "BP02");
         cmdMap.put(CMD_TYPE.AP92, "AP92");
         cmdMap.put(CMD_TYPE.BP92, "BP92");
+        cmdMap.put(CMD_TYPE.AP94, "AP94");
+        cmdMap.put(CMD_TYPE.BP94, "BP94");
         cmdMap.put(CMD_TYPE.AP03, "AP03");
         cmdMap.put(CMD_TYPE.BP03, "BP03");
         cmdMap.put(CMD_TYPE.AP05, "AP05");
@@ -2226,6 +2230,28 @@ public class protocol_ic {
 
 
 
+    public static StringMessage AP94( ){
+        /***
+         * 15确认已读文字（上行协议号：AP94，响应：BP94）
+         * 示例：
+         * IWAP94,123456,1#
+         * 说明：
+         * IWAP94：标识符
+         * APHCI: 命令字符
+         * 123456: 文字来源系统流水号
+         * 1:确认阅读、0：取消阅读
+         * 平台响应：	IWBP94#
+         * 表示平台已接收，可不作响应
+         * 说明：	本消息适用所有终端
+         */
+
+        //在UI逻辑中，只要有处理就都是已经阅读。所以不存在取消阅读的说法。
+        return genStringMessage(cmdMap.get(protocol_ic.CMD_TYPE.AP94),new StringBuffer(CMDHEADER).append(cmdMap.get(protocol_ic.CMD_TYPE.AP94))
+                .append(CMDSPLIT).append(Runtime.PushtxtMsg_srv_index)
+                .append(CMDSPLIT).append("1")
+                .append(CMDEND).toString());
+
+    }
 
 
 
diff --git a/app/version_code.properties b/app/version_code.properties
index a8ba9c26..9f233db6 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 11:42:44 CST 2020
-VERSION_CODE=610
+#Thu Sep 10 18:59:36 CST 2020
+VERSION_CODE=611