release 434

1、去掉脱腕检测调试用的声音报警
2、更新温度接口，增加腕温转体温接口，上报增加体温数值。
3、接收界面测试温度消息，转发服务器。

diff --git a/app/release/ICSer_V433_2007021842_release.apk b/app/release/ICSer_V434_2007041154_release.apk
similarity index 79%
rename from app/release/ICSer_V433_2007021842_release.apk
rename to app/release/ICSer_V434_2007041154_release.apk
index aefbb9a..bb6cd67 100644 (file)
Binary files a/app/release/ICSer_V433_2007021842_release.apk and b/app/release/ICSer_V434_2007041154_release.apk differ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a7e5d5..a14fc12 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -152,6 +152,8 @@
                 <action android:name="com.enqualcomm.support.ACTION_RETRY_SERVER_CONNECT" />
                 <action android:name="com.enqualcomm.support.ACTION_CHECK_LOCATION_RESULT" />
                 <action android:name= "com.ic.action.message_sent" />
+                <action android:name= "com.ic.action.temp_result" />
+
                 <!-- <action android:name="com.eqc.heartrate.action.SILENT_START" /> -->
             </intent-filter>
         </receiver>

diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index 7dcef29..b9ce84e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -295,5 +295,11 @@ public interface Constants {
   public static final String KEY_MESSAGE_FROM = "msgFrom"; // 消息来源（发送者名称），预留，暂时不用。\r
 \r
 \r
+\r
+  public static final String ACTION_TEMP_RESULT = "com.ic.action.temp_result";\r
+  public static final String KEY_TEMP_BODY = "body";  // double 体温\r
+  public static final String KEY_TEMP_WRIST= "wrist";  //  double 腕温\r
+\r
+\r
 }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 87dbed2..734f029 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -74,9 +74,12 @@ import static com.enqualcomm.support.Constants.ANTI_ALARM;
 import static com.enqualcomm.support.Constants.HEART_ALARM;\r
 import static com.enqualcomm.support.Constants.KEY_SAVE_STEP_COUNT;\r
 import static com.enqualcomm.support.Constants.KEY_STEP_COUNT;\r
+import static com.enqualcomm.support.Constants.KEY_TEMP_BODY;\r
+import static com.enqualcomm.support.Constants.KEY_TEMP_WRIST;\r
 import static com.enqualcomm.support.Constants.STEP_COUNT_ALARM_ACTION;\r
 import static com.enqualcomm.support.Constants.TEMP_ALARM;\r
 import static com.enqualcomm.support.bean.ICLocation.*;\r
+import static com.ic.protocols.protocolAPIHelper.getTemperatureMSG;\r
 \r
 \r
 public class CoreService extends Service {\r
@@ -760,12 +763,12 @@ public class CoreService extends Service {
                     return Service.START_STICKY;\r
                 }\r
             } else if (TEMP_ALARM.equals(paramIntent.getAction())) {\r
-\r
                 if (this.mKeepAlive != null) {\r
-\r
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {\r
                         //测试温度并上报\r
-                        String temperatureMsg=protocolAPIHelper.getTemperatureMSG(TemperatureUtil.get_temp_value_adjusted());\r
+                        double wrist_temp=paramIntent.getDoubleExtra(KEY_TEMP_WRIST,0.0f);\r
+                        double body_temp=paramIntent.getDoubleExtra(KEY_TEMP_BODY,0.0f);\r
+                        String temperatureMsg=getTemperatureMSG(wrist_temp,body_temp);\r
                         ICLogger.i("发送体温测量值 "+temperatureMsg);\r
                         Deliver.sendLocationMSG(temperatureMsg);\r
                     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index e93d95e..43bdf43 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -58,7 +58,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         }\r
          if (current_anti_status==0){\r
             //佩戴\r
-            play_notify();\r
+        //    play_notify();\r
             mRuntime.setAlarmType(Runtime.AlarmType.ALARM_WEARED);\r
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
             Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
@@ -70,7 +70,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 //            send_anti_event_broadcast(0);\r
         }else{\r
              //脱腕\r
-             play_notify();\r
+        //     play_notify();\r
           //   screen_on();\r
              mRuntime.setAlarmType(Runtime.AlarmType.ALARM_ANTIOFF);\r
             String msg=protocolAPIHelper.getWarningMSG(mRuntime);\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 6a06553..020620c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -231,16 +231,17 @@ public class Deliver extends AbstractConnectionService {
 \r
 public static void sendLocationMSG( String Msg){\r
 \r
+    if(Msg.trim().isEmpty()){\r
+      ICLogger.i("命令为空，跳过发送！");\r
+      return ;\r
+    }\r
     if(mRuntime.getUseQueue()){\r
       if(!ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("queue",Msg))) {\r
         ICLogger.i(" MessageQueue 已满，数据将被丢弃，" + Msg);\r
         if (Config.LOG_TOFILE)ICLogger.logToFile( "APILog", " queueFullskip  " + Msg);\r
-\r
       }\r
-\r
 //      if(queue.size()>5) //测试queue 发送逻辑用\r
         triggerSendThread();\r
-\r
     }else {\r
       if (checkNetwork()) {\r
         ICLogger.i(" first send " + Msg);\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 5117842..de7d437 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -25,6 +25,7 @@ import com.enqualcomm.support.LocationClient;
 import com.enqualcomm.support.R;\r
 import com.enqualcomm.support.bean.NotificationParam;\r
 import com.enqualcomm.support.bean.VoiceContent;\r
+import com.enqualcomm.support.service.Deliver;\r
 import com.ic.jni.ICJniUtils;\r
 import com.enqualcomm.support.bean.Contact;\r
 import com.enqualcomm.support.service.AudioService;\r
@@ -49,14 +50,20 @@ import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA;
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START;\r
 import static com.enqualcomm.support.Constants.ACTION_SEND_SOS_MSG;\r
 import static com.enqualcomm.support.Constants.ACTION_SHUTDOWN;\r
+import static com.enqualcomm.support.Constants.ACTION_TEMP_RESULT;\r
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;\r
 import static com.enqualcomm.support.Constants.KEY_MESSAGE_FROM;\r
 import static com.enqualcomm.support.Constants.KEY_MESSAGE_TYPE;\r
 import static com.enqualcomm.support.Constants.KEY_MESSAGE_URL;\r
+import static com.enqualcomm.support.Constants.KEY_TEMP_BODY;\r
+import static com.enqualcomm.support.Constants.KEY_TEMP_WRIST;\r
 import static com.enqualcomm.support.Constants.RESUME_ACTION;\r
 import static com.enqualcomm.support.Constants.SOS_ACTION;\r
 import static com.enqualcomm.support.Constants.STEP_COUNT_ALARM_ACTION;\r
 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
 public class ProcessReceiver extends BroadcastReceiver {\r
   private static final int MICRO_CHAT = 2;\r
@@ -363,8 +370,14 @@ public class ProcessReceiver extends BroadcastReceiver {
         if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
           mCustomDialog.dismiss();\r
         }\r
-\r
-      } else {\r
+      }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
+      String temperatureMsg=getTemperatureMSG(wrist_temp,body_temp);\r
+      ICLogger.i("发送体温测量值 "+temperatureMsg);\r
+      Deliver.sendLocationMSG(temperatureMsg);\r
+\r
+    } else {\r
         if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
           mCustomDialog.dismiss();\r
         }\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 b0d3d11..8be2096 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -10,6 +10,7 @@ public class TemperatureUtil {
 \r
     private static double temp_value_orig =0.0f;\r
     private static double temp_adjust_value=0.0f;\r
+    private static double body_temp_value=0.0f;\r
     public static double get_temp_value_origin()\r
     {\r
         temp_value_orig= ICJniUtils.getTemperature();\r
@@ -28,4 +29,9 @@ public class TemperatureUtil {
         return temp_adjust_value;\r
 \r
     }\r
+    public static double getBodyTemp(double wristtemp,double envtemp){\r
+        body_temp_value=ICJniUtils.getBodyTempFromWristTemp(wristtemp,envtemp);\r
+        ICLogger.i("get body Temperature value="+body_temp_value);\r
+        return body_temp_value;\r
+    }\r
 }\r

diff --git a/app/src/main/java/com/ic/jni/ICJniUtils.java b/app/src/main/java/com/ic/jni/ICJniUtils.java
index ca48df9..338a64c 100644 (file)
--- a/app/src/main/java/com/ic/jni/ICJniUtils.java
+++ b/app/src/main/java/com/ic/jni/ICJniUtils.java
@@ -82,5 +82,7 @@ public class ICJniUtils {
     /*此操作仅仅为了检查标志状态设置成功与否，标志已经在内部被使用*/\r
     public static native int getTemperatureValidFlag();\r
 \r
+    /*根据环境参考温度和腕温换算 体温*/\r
+    public static native double getBodyTempFromWristTemp(double wrist_temp,double ref_temp);\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 a4b4aaf..545edb4 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -42,7 +42,7 @@ public class protocolAPIHelper {
         return sm;\r
     }\r
 \r
-    public static String getTemperatureMSG(double temp_adusted){\r
+    public static String getTemperatureMSG(double temp_adusted,double body_temp){\r
         String ret="";\r
         switch(Config.protocol_no)\r
         {\r
@@ -50,7 +50,7 @@ public class protocolAPIHelper {
                 ret="";\r
                 break;\r
             case 1:\r
-                ret=protocol_beehome.APTP(temp_adusted);\r
+                ret=protocol_beehome.APTP(temp_adusted,body_temp);\r
                 break;\r
         }\r
         return ret;\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 4305320..b9c932a 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -1593,8 +1593,11 @@ public class protocol_beehome {
             ICLogger.i("收到服务器指令：测量体温 "+freq+"分钟一次。");\r
             Config.setTemperatureTestCycle(runtime,freq);\r
             CoreService.getInstance().setTempAlarm();\r
-            String temperatureMsg=APTP(TemperatureUtil.get_temp_value_adjusted());\r
-             connection.send(genStringMessage("APTP",temperatureMsg));\r
+            double wrist_temp,body_temp;\r
+            wrist_temp=TemperatureUtil.get_temp_value_adjusted();\r
+            body_temp=TemperatureUtil.getBodyTemp(wrist_temp,26.0f);\r
+            String temperatureMsg=APTP(wrist_temp,body_temp);\r
+            connection.send(genStringMessage("APTP",temperatureMsg));\r
             ICLogger.i("发送体温测量值 "+temperatureMsg);\r
         }else{\r
             ICLogger.i("BP89 format error!");\r
@@ -1602,9 +1605,8 @@ public class protocol_beehome {
 \r
     }\r
 \r
-\r
     //体温上行（上行协议号：APTP，响应：BPTP）\r
-    public static String APTP(double temperature){\r
+    public static String APTP(double wrist_temp,double body_temp){\r
 \r
         //设备：    IWAPTP,36.3,33,132#\r
         //IW：标识符\r
@@ -1612,8 +1614,9 @@ public class protocol_beehome {
         //35.3：测量体温 （摄氏度）\r
         //33，132：温补用的参数，此处不用，可以用0 来代替。\r
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP))\r
-                .append(CMDSPLIT).append(String.format("%1$.2f",temperature))\r
-                .append(CMDSPLIT).append(0).append(CMDSPLIT).append(0)\r
+                .append(CMDSPLIT).append(String.format("%1$.2f",wrist_temp))\r
+                .append(CMDSPLIT).append(String.format("%1$.2f",body_temp))\r
+                .append(CMDSPLIT).append(0)\r
                 .append(CMDEND).toString();\r
     }\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index 0dee1f5..278fbdc 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jul 02 18:42:10 CST 2020\r
-VERSION_CODE=433\r
+#Sat Jul 04 11:54:24 CST 2020\r
+VERSION_CODE=434\r