beehome添加APVR 版本号上传协议。

修复 heartrate 不能定时测试问题

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index fbce34f..bfeeaee 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -899,6 +899,8 @@ public class Config {
             noPPGSensor = false;
             noTempSensor = false;
             L004_BroadCastActionStrip = true;
+            Config.forceMoveCheck = false; //即爱对gps不进行运动检测，此变量专门为了给其他协议进行强制运动检测用的。
+
         } else if (Config.custom_name.equals("l005")) {
             ConfigAlarm(Runtime.AlarmType.ALARM_CUTOFF, true);
             ConfigAlarm(Runtime.AlarmType.ALARM_ILLEGAL_CUTOFF, true);

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 43905b5..f826fad 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -123,10 +123,13 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
         Intent intent = new Intent();
         intent.setAction(ACTION_HEART_RATE);
         ICApplication.sContext.bindService(intent, mRemoteConnection, Context.BIND_AUTO_CREATE);
+
     }
 
     public void init(Runtime runtime) {
         this.runtime = runtime;
+        //此注册不能去掉，否则无法定时检测心率
+        regReceiver();
     }
 
     private IHeartRateSensorService heartRateSensorService;

diff --git a/app/src/main/java/com/enqualcomm/support/service/Initialize.java b/app/src/main/java/com/enqualcomm/support/service/Initialize.java
index 7b1adca..da8a55b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Initialize.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Initialize.java
@@ -92,11 +92,9 @@ public class Initialize extends AbstractConnectionService {
       return false; \r
     if (paramStringMessage.cmd().equals("login")) {\r
       this.initOK = true;\r
-//      try {\r
-//        paramRuntime.setKey(((JSONObject)(new JSONTokener(paramStringMessage.all()[1])).nextValue()).getString("KEY"));\r
-//      } catch (Exception e) {\r
-//        e.printStackTrace();\r
-//      }\r
+      //login成功后，上传当前版本号\r
+      paramConnection.send(protocolAPIHelper.getDeviceVersion(paramRuntime));\r
+\r
       if (!hasContacts(paramRuntime)) {\r
 //        paramConnection.send(API.H06(paramRuntime));\r
         ICLogger.i("没有联系人");\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 9edf97e..fb433c4 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -159,6 +159,30 @@ public class protocolAPIHelper {
         return ret;
     }
 
+    public static StringMessage getDeviceVersion(Runtime runtime){
+        if (is_protocol_not_Initialled()) return null;
+        StringMessage ret = null;
+        switch (Config.protocol_no) {
+            case Config.PROTOCOL_JIAI:
+                ret = null;
+                break;
+            case Config.PROTOCOL_BEEHOME:
+                ret = protocolbeehome_handler.APVR(runtime);
+                break;
+            case Config.PROTOCOL_IC:
+                ret = null;
+                break;
+            case Config.PROTOCOL_FZD:
+                ret = null;
+                break;
+            case Config.PROTOCOL_MQTT:
+                ret = null;
+                break;
+        }
+        return ret;
+
+
+    }
     public static StringMessage getSyncTimeMSG(Runtime runtime) {
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret = null;

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 e44670c..ebd45aa 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -17,6 +17,7 @@ import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
@@ -65,6 +66,8 @@ public class protocol_beehome {
         BPHT,
         APTM,//基站校时及获取定位
         BPTM,
+        APVR,
+        BPVR,
         /* 服务器发起*/
         AP12,
         BP12,//SOS 号码设置
@@ -149,6 +152,8 @@ public class protocol_beehome {
         cmdMap.put(CMD_TYPE.BPHT, "BPHT");
         cmdMap.put(CMD_TYPE.APTM, "APTM");
         cmdMap.put(CMD_TYPE.BPTM, "BPTM");
+        cmdMap.put(CMD_TYPE.BPVR,"BPVR");
+        cmdMap.put(CMD_TYPE.APVR,"APVR");
         cmdMap.put(CMD_TYPE.AP12, "AP12");
         cmdMap.put(CMD_TYPE.BP12, "BP12");
         cmdMap.put(CMD_TYPE.AP14, "AP14");
@@ -1292,6 +1297,22 @@ public class protocol_beehome {
 
 
     }
+//
+
+    public static StringMessage APVR(Runtime ds) {
+        //示例数据： IWAPVR,353456789012345,C42F-LPTL004-US-P1-V0.3.35.2021#
+        //说明：
+        //IW：标识符
+        //APVR : 命令字符
+        //IMEI:
+        /// Version String
+
+        return genStringMessage(cmdMap.get(CMD_TYPE.APVR), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APVR))
+                .append(CMDSPLIT).append(ds.IMEI())
+                .append(CMDSPLIT).append(DeviceInfoUtil.getSWVersionDisplayName())
+                .append(CMDEND).toString());
+    }
+
 
     public static StringMessage AP15(String index) {
 //IWAP15, 080835#