release V608

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

diff --git a/app/app.iml b/app/app.iml
index e442beb..10a5102 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -29,15 +29,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
     <exclude-output/>\r
     <content url="file://$MODULE_DIR$">\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r

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 12ead55..3caf198 100644 (file)
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 5178136..283d1d8 100644 (file)
--- 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);\r
                     //trigger AP10 报警定位\r
 //                   CoreService.this.locationClient.triggerSOSLocationProcess();\r
-                    connection.send(protocolAPIHelper.getWarningMSG(runtime));\r
+                    Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));\r
 \r
                     //开启紧急定位模式,GPS 优先1分钟一次定位，持续5分钟\r
                     runtime.getLocationInstance().setWorkingMod(EMERGNECY_MOD);\r

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 463a4e3..d1bedaa 100644 (file)
--- 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个包开始发送语音分包。\r
       voicePacket voicepacket = voicePacket.getInstanceSent();\r
       if (voicepacket.getCurrentIndexToSent() < voicepacket.getPacketCount()) {\r
-        ICLogger.i("voicepacket " + voicepacket.getName() + " filetype " + voicepacket.getFiletype() + " , datatype " + voicepacket.getDateType() + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());\r
+        ICLogger.i("voicepacket " + voicepacket.getName() + " filetype " + voicepacket.getFiletype() + " , datatype " + voicepacket.getDateType() +" "+ voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());\r
         if(mConnection instanceof  NettyConnection) {\r
           ((NettyConnection) mConnection).sendMsg("RAWPACKET",\r
                   protocolAPIHelper.getVoicePacketItem(voicepacket.getPacketTime(),\r
@@ -520,6 +520,10 @@ public class Deliver extends AbstractConnectionService {
           AudioService.getInstance().stopRecord();\r
           ICLogger.i("Monitor Record to send "+recordfilepath);\r
           //创建voiceConent并添加到数据\r
+          /**\r
+           *        *        * 1 语音——  1.监听语音      *   2.SOS语音      *      3.扩展\r
+           *        *          * 2 图片——        1.签到图片      *   2.指令图片      *   3.设备图片      *   4.扩展\r
+           */\r
           final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, "123", recordfilepath,1,1);\r
 \r
           // 把voiceContent拆解成1024的分包\r
@@ -527,8 +531,6 @@ public class Deliver extends AbstractConnectionService {
           //trigger 分包发送\r
           if (CoreService.getInstance().getConnection()!=null)\r
             CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", "");\r
-\r
-\r
         }\r
       },recordtime*1000);\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 6ce7375..709f657 100644 (file)
--- 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
 \r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_HEART_RATE_HIGH);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
 \r
     }else if ( runtime.getHRS().ppg_threshold_min>0 && runtime.getHRS().getPPG()<runtime.getHRS().ppg_threshold_min) {\r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_HEART_RATE_LOW);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
     }\r
 \r
     //bph\r
@@ -73,12 +73,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 \r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPH_HIGH);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
 \r
     }else if ( runtime.getHRS().bph_threshold_min>0 && runtime.getHRS().getBPH()<runtime.getHRS().bph_threshold_min) {\r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPH_LOW);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
 \r
     }\r
 \r
@@ -87,12 +87,12 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 \r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPL_HIGH);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
 \r
     }else if ( runtime.getHRS().bpl_threshold_min>0 && runtime.getHRS().getBPL()<runtime.getHRS().bpl_threshold_min) {\r
       runtime.setAlarmType(Runtime.AlarmType.ALARM_BPL_LOW);\r
       //trigger AP10 报警定位\r
-      CoreService.getInstance().getConnection().send( protocolAPIHelper.getWarningMSG(runtime));\r
+      Deliver.sendLocationMSG( protocolAPIHelper.getWarningMSG(runtime));\r
 \r
     }\r
   }\r
@@ -116,26 +116,23 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
               StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(runtime);\r
               sendBroadcastPPGResult();\r
               //因为协议中没有时间变量，所以只能实时传输，如果恰巧没有网络也只能丢弃，有时间变量的话，可以考虑通过deliver的buffer来进行缓存发送\r
-              if (connection.isServerConnected()) {\r
                 if(PPGDATA==null){\r
                   StringMessage ppgd=protocolAPIHelper.getPPG_MSG(runtime.getHRS().getPPG(),runtime);\r
                   StringMessage bloodd=protocolAPIHelper.getBlood_MSG( runtime.getHRS().getBPH(), runtime.getHRS().getBPL(),runtime);\r
                   StringMessage oxd=protocolAPIHelper.getOxygen_MSG(runtime.getHRS().getSpo2(),runtime);\r
-                  connection.send( ppgd);\r
-                  connection.send(bloodd);\r
-                  connection.send( oxd);\r
+                  Deliver.sendLocationMSG( ppgd);\r
+                  Deliver.sendLocationMSG(bloodd);\r
+                  Deliver.sendLocationMSG( oxd);\r
 \r
                   checkWarning();\r
 \r
                 }else {\r
-                  connection.send( PPGDATA);\r
+                  Deliver.sendLocationMSG( PPGDATA);\r
                   ICLogger.i("Send PPG " + PPGDATA.isFromCache());\r
                   checkWarning();\r
                 }\r
 \r
-              } else {\r
-                ICLogger.i("Skip PPG " );\r
-              }\r
+\r
             } else {\r
               ICLogger.i("PPG Failed for Timeout!");\r
             }\r
@@ -415,23 +412,21 @@ public static void triggerPPGtest(){
           }\r
 \r
 \r
-            if (connection.isServerConnected()) {\r
+\r
               StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2));\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
                 StringMessage oxd=protocolAPIHelper.getOxygen_MSG(Integer.parseInt(spo2),runtime);\r
-                connection.send( ppgd);\r
-                connection.send(bloodd);\r
-                connection.send( oxd);\r
+                Deliver.sendLocationMSG(ppgd);\r
+                Deliver.sendLocationMSG(bloodd);\r
+                Deliver.sendLocationMSG( oxd);\r
 \r
               }else {\r
-                connection.send( PPGDATA);\r
+                Deliver.sendLocationMSG( PPGDATA);\r
                 ICLogger.i("Send PPG " + PPGDATA.isFromCache());\r
               }\r
-            } else {\r
-              ICLogger.i("Skip PPG ");\r
-            }\r
+\r
 \r
          callback(message.replyTo, Constants.RESULT_OK);\r
 \r

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 4788775..436070a 100644 (file)
--- 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;\r
 \r
             //创建voiceConent并添加到数据\r
-            final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, number, filepath);\r
+            final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, number, filepath,1,3);\r
             final Uri uri2 = runtime.getDbHelper().insertOrUpdate(voiceContent, bundle.getLong("id"));\r
 \r
             //回复UI消息，表示已经接收到\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 4a41b28..1ce0437 100644 (file)
--- 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)) {\r
         double wrist_temp = paramIntent.getDoubleExtra(KEY_TEMP_WRIST, 0.0f);\r
         double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f);\r
+        ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp);\r
         StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);\r
-        if (temperatureMsg!=null)ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());\r
+        if (temperatureMsg!=null)\r
+        {\r
+          ICLogger.i("temp 发送体温测量值 " + temperatureMsg.isFromCache());\r
+        }\r
         Deliver.sendLocationMSG(temperatureMsg);\r
     }else if (ACTION_SET_SIT_RANGE.equals(str)) {\r
         if (paramIntent.hasExtra( Constants.KEY_SIT_RANGE)){\r

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 e686104..46d11c8 100644 (file)
--- 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;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.StringMessage;\r
+import com.enqualcomm.support.service.Deliver;\r
 import com.ic.jni.ICJniUtils;\r
 import com.ic.protocols.protocolAPIHelper;\r
 \r
@@ -65,7 +66,7 @@ public class TemperatureUtil {
                     wrist_temp = TemperatureUtil.get_temp_value_adjusted();\r
                     body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);\r
                     StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, null);\r
-                    CoreService.getInstance().getConnection().send(temperatureMsg);\r
+                    Deliver.sendLocationMSG(temperatureMsg);\r
                     if  (temperatureMsg!=null) ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());\r
 \r
                     Runtime runtime = CoreService.getInstance().getRuntime();\r
@@ -80,12 +81,12 @@ public class TemperatureUtil {
                             case 1:\r
                                 runtime.setAlarmType(Runtime.AlarmType.ALARM_TEMP_HIGH);\r
                                 //trigger AP10 报警定位\r
-                                CoreService.getInstance().getConnection().send(protocolAPIHelper.getWarningMSG(runtime));\r
+                                Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));\r
                                 break;\r
                             case 2:\r
                                 runtime.setAlarmType(Runtime.AlarmType.ALARM_TEMP_LOW);\r
                                 //trigger AP10 报警定位\r
-                                CoreService.getInstance().getConnection().send(protocolAPIHelper.getWarningMSG(runtime));\r
+                                Deliver.sendLocationMSG(protocolAPIHelper.getWarningMSG(runtime));\r
                                 break;\r
                         }\r
                     }\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index d4ac633..31b3b03 100644 (file)
--- 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);\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APTU(packetTime,filetype,datatype,count,index,datalen,amrdata);\r
+                /***\r
+                 *          * 1 语音——   1.监听语音      *   2.SOS语音      *      3.扩展\r
+                 *          * 2 图片——   1.签到图片      *   2.指令图片      *   3.设备图片      *   4.扩展\r
+                 */\r
+                if(filetype==1 && datatype==3){\r
+                    //对讲用的类型\r
+                    ret=protocol_ic.AP07(packetTime,count,index,datalen,amrdata);\r
+                }else {\r
+                    ret = protocol_ic.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata);\r
+                }\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata);\r
@@ -318,7 +327,13 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.APHP(runtime);\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APHP(runtime);\r
+                if(Config.getProtocolServerHost(runtime.getContextProxy().context).equals(protocol_jiai.defaultServerIP))\r
+                {\r
+                    //为了兼容即爱的服务器而设定。\r
+                    ret=protocol_ic.APHT(runtime);\r
+                }else {\r
+                    ret = protocol_ic.APHP(runtime);\r
+                }\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;\r

diff --git a/app/version_code.properties b/app/version_code.properties
index de527b2..8628d58 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 07 21:03:09 CST 2020\r
-VERSION_CODE=605\r
+#Tue Sep 08 19:41:57 CST 2020\r
+VERSION_CODE=608\r