From: snickersun <scy@incartech.cn>
Date: Tue, 8 Sep 2020 11:47:31 +0000 (+0800)
Subject: release V608
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c62e0bd75869afda36994b8567cda87edb3c15d8;p=protocol_srv.git

release V608
Protocol_ic 上 兼容Jiai的心率上传协议， 兼容Jiai的对讲协议
除了电量报警，登录，心跳等协议，大多数协议都改为走Deliver的buffer发送，以保证都能上传到服务器。
---

diff --git a/app/app.iml b/app/app.iml
index e442bebb..10a51020 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -29,15 +29,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>
     <exclude-output/>
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>
diff --git a/app/release/ICSer_V605_2009072103_release.apk b/app/release/ICSer_V608_2009081941_release.apk
similarity index 78%
rename from app/release/ICSer_V605_2009072103_release.apk
rename to app/release/ICSer_V608_2009081941_release.apk
index 12ead55c..3caf1982 100644
Binary files a/app/release/ICSer_V605_2009072103_release.apk and b/app/release/ICSer_V608_2009081941_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 5178136c..283d1d8d 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -202,7 +202,7 @@ public class CoreService extends Service {
                     runtime.setAlarmType(Runtime.AlarmType.ALARM_SOS);
                     //trigger AP10 报警定位
 //                   CoreService.this.locationClient.triggerSOSLocationProcess();
-                    connection.send(protocolAPIHelper.getWarningMSG(runtime));
+                    Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));
 
                     //开启紧急定位模式,GPS 优先1分钟一次定位，持续5分钟
                     runtime.getLocationInstance().setWorkingMod(EMERGNECY_MOD);
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 463a4e3d..d1bedaa3 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -357,7 +357,7 @@ public class Deliver extends AbstractConnectionService {
       //收到SentVoicePacket 表示 有一个VoiceMessage要发送，需要从第0个包开始发送语音分包。
       voicePacket voicepacket = voicePacket.getInstanceSent();
       if (voicepacket.getCurrentIndexToSent() < voicepacket.getPacketCount()) {
-        ICLogger.i("voicepacket " + voicepacket.getName() + " filetype " + voicepacket.getFiletype() + " , datatype " + voicepacket.getDateType() + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());
+        ICLogger.i("voicepacket " + voicepacket.getName() + " filetype " + voicepacket.getFiletype() + " , datatype " + voicepacket.getDateType() +" "+ voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());
         if(mConnection instanceof  NettyConnection) {
           ((NettyConnection) mConnection).sendMsg("RAWPACKET",
                   protocolAPIHelper.getVoicePacketItem(voicepacket.getPacketTime(),
@@ -520,6 +520,10 @@ public class Deliver extends AbstractConnectionService {
           AudioService.getInstance().stopRecord();
           ICLogger.i("Monitor Record to send "+recordfilepath);
           //创建voiceConent并添加到数据
+          /**
+           *        *        * 1 语音——	1.监听语音      * 	2.SOS语音      * 	3.扩展
+           *        *          * 2 图片——	1.签到图片      * 	2.指令图片      * 	3.设备图片      * 	4.扩展
+           */
           final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, "123", recordfilepath,1,1);
 
           // 把voiceContent拆解成1024的分包
@@ -527,8 +531,6 @@ public class Deliver extends AbstractConnectionService {
           //trigger 分包发送
           if (CoreService.getInstance().getConnection()!=null)
             CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", "");
-
-
         }
       },recordtime*1000);
 
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 6ce7375e..709f6579 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -60,12 +60,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 
       runtime.setAlarmType(Runtime.AlarmType.ALARM_HEART_RATE_HIGH);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
 
     }else if ( runtime.getHRS().ppg_threshold_min>0 && runtime.getHRS().getPPG()<runtime.getHRS().ppg_threshold_min) {
       runtime.setAlarmType(Runtime.AlarmType.ALARM_HEART_RATE_LOW);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
     }
 
     //bph
@@ -73,12 +73,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPH_HIGH);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
 
     }else if ( runtime.getHRS().bph_threshold_min>0 && runtime.getHRS().getBPH()<runtime.getHRS().bph_threshold_min) {
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPH_LOW);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
 
     }
 
@@ -87,12 +87,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPL_HIGH);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
 
     }else if ( runtime.getHRS().bpl_threshold_min>0 && runtime.getHRS().getBPL()<runtime.getHRS().bpl_threshold_min) {
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPL_LOW);
       //trigger AP10 报警定位
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));
 
     }
   }
@@ -116,26 +116,23 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
               StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(runtime);
               sendBroadcastPPGResult();
               //因为协议中没有时间变量，所以只能实时传输，如果恰巧没有网络也只能丢弃，有时间变量的话，可以考虑通过deliver的buffer来进行缓存发送
-              if (connection.isServerConnected()) {
                 if(PPGDATA==null){
                   StringMessage ppgd=protocolAPIHelper.getPPG_MSG(runtime.getHRS().getPPG(),runtime);
                   StringMessage bloodd=protocolAPIHelper.getBlood_MSG( runtime.getHRS().getBPH(), runtime.getHRS().getBPL(),runtime);
                   StringMessage oxd=protocolAPIHelper.getOxygen_MSG(runtime.getHRS().getSpo2(),runtime);
-                  connection.send( ppgd);
-                  connection.send(bloodd);
-                  connection.send( oxd);
+                  Deliver.sendLocationMSG( ppgd);
+                  Deliver.sendLocationMSG(bloodd);
+                  Deliver.sendLocationMSG( oxd);
 
                   checkWarning();
 
                 }else {
-                  connection.send( PPGDATA);
+                  Deliver.sendLocationMSG( PPGDATA);
                   ICLogger.i("Send PPG " + PPGDATA.isFromCache());
                   checkWarning();
                 }
 
-              } else {
-                ICLogger.i("Skip PPG " );
-              }
+
             } else {
               ICLogger.i("PPG Failed for Timeout!");
             }
@@ -415,23 +412,21 @@ public static void triggerPPGtest(){
           }
 
 
-            if (connection.isServerConnected()) {
+
               StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2));
               if(PPGDATA==null){
                 StringMessage ppgd=protocolAPIHelper.getPPG_MSG(Integer.parseInt(ppg),runtime);
                 StringMessage bloodd=protocolAPIHelper.getBlood_MSG( Integer.parseInt(bph), Integer.parseInt(bpl),runtime);
                 StringMessage oxd=protocolAPIHelper.getOxygen_MSG(Integer.parseInt(spo2),runtime);
-                connection.send( ppgd);
-                connection.send(bloodd);
-                connection.send( oxd);
+                Deliver.sendLocationMSG(ppgd);
+                Deliver.sendLocationMSG(bloodd);
+                Deliver.sendLocationMSG( oxd);
 
               }else {
-                connection.send( PPGDATA);
+                Deliver.sendLocationMSG( PPGDATA);
                 ICLogger.i("Send PPG " + PPGDATA.isFromCache());
               }
-            } else {
-              ICLogger.i("Skip PPG ");
-            }
+
 
          callback(message.replyTo, Constants.RESULT_OK);
 
diff --git a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
index 4788775c..436070ab 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
@@ -135,7 +135,7 @@ public class SendChatMessage extends AbstractInvokeHandlerService {
             return true;
 
             //创建voiceConent并添加到数据
-            final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, number, filepath);
+            final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, number, filepath,1,3);
             final Uri uri2 = runtime.getDbHelper().insertOrUpdate(voiceContent, bundle.getLong("id"));
 
             //回复UI消息，表示已经接收到
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 4a41b28d..1ce0437a 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -395,8 +395,12 @@ public class ProcessReceiver extends BroadcastReceiver {
       }else if (ACTION_TEMP_RESULT.equals(str)) {
         double wrist_temp = paramIntent.getDoubleExtra(KEY_TEMP_WRIST, 0.0f);
         double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f);
+        ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp);
         StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);
-        if (temperatureMsg!=null)ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
+        if (temperatureMsg!=null)
+        {
+          ICLogger.i("temp 发送体温测量值 " + temperatureMsg.isFromCache());
+        }
         Deliver.sendLocationMSG(temperatureMsg);
     }else if (ACTION_SET_SIT_RANGE.equals(str)) {
         if (paramIntent.hasExtra( Constants.KEY_SIT_RANGE)){
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
index e6861046..46d11c86 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -9,6 +9,7 @@ import com.enqualcomm.support.Constants;
 import com.enqualcomm.support.CoreService;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.Deliver;
 import com.ic.jni.ICJniUtils;
 import com.ic.protocols.protocolAPIHelper;
 
@@ -65,7 +66,7 @@ public class TemperatureUtil {
                     wrist_temp = TemperatureUtil.get_temp_value_adjusted();
                     body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
                     StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, null);
-                    CoreService.getInstance().getConnection().send(temperatureMsg);
+                    Deliver.sendLocationMSG(temperatureMsg);
                     if  (temperatureMsg!=null) ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
 
                     Runtime runtime = CoreService.getInstance().getRuntime();
@@ -80,12 +81,12 @@ public class TemperatureUtil {
                             case 1:
                                 runtime.setAlarmType(Runtime.AlarmType.ALARM_TEMP_HIGH);
                                 //trigger AP10 报警定位
-                                CoreService.getInstance().getConnection().send(protocolAPIHelper.getWarningMSG(runtime));
+                                Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));
                                 break;
                             case 2:
                                 runtime.setAlarmType(Runtime.AlarmType.ALARM_TEMP_LOW);
                                 //trigger AP10 报警定位
-                                CoreService.getInstance().getConnection().send(protocolAPIHelper.getWarningMSG(runtime));
+                                Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));
                                 break;
                         }
                     }
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index d4ac633a..31b3b033 100644
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -295,7 +295,16 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.AP07(packetTime,count,index,datalen,amrdata);
                 break;
             case Config.PROTOCOL_IC:
-                ret=protocol_ic.APTU(packetTime,filetype,datatype,count,index,datalen,amrdata);
+                /***
+                 *          * 1 语音——	1.监听语音      * 	2.SOS语音      * 	3.扩展
+                 *          * 2 图片——	1.签到图片      * 	2.指令图片      * 	3.设备图片      * 	4.扩展
+                 */
+                if(filetype==1 && datatype==3){
+                    //对讲用的类型
+                    ret=protocol_ic.AP07(packetTime,count,index,datalen,amrdata);
+                }else {
+                    ret = protocol_ic.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata);
+                }
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata);
@@ -318,7 +327,13 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.APHP(runtime);
                 break;
             case Config.PROTOCOL_IC:
-                ret=protocol_ic.APHP(runtime);
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))
+                {
+                    //为了兼容即爱的服务器而设定。
+                    ret=protocol_ic.APHT(runtime);
+                }else {
+                    ret = protocol_ic.APHP(runtime);
+                }
                 break;
             case Config.PROTOCOL_FZD:
                 ret=null;
diff --git a/app/version_code.properties b/app/version_code.properties
index de527b27..8628d580 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 07 21:03:09 CST 2020
-VERSION_CODE=605
+#Tue Sep 08 19:41:57 CST 2020
+VERSION_CODE=608