From: TrillGates <williamtrillgates@gmail.com>
Date: Sat, 14 Aug 2021 10:19:31 +0000 (+0800)
Subject: release ICSer_V913_2108141818_release
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a3e2de571e363365c1965877671f00617fe3fb1a;p=icsupport.git

release ICSer_V913_2108141818_release
---

diff --git a/app/release/ICSer_V912_2108131507_release.apk b/app/release/ICSer_V913_2108141818_release.apk
similarity index 76%
rename from app/release/ICSer_V912_2108131507_release.apk
rename to app/release/ICSer_V913_2108141818_release.apk
index 6b67368e..3fb7fabd 100644
Binary files a/app/release/ICSer_V912_2108131507_release.apk and b/app/release/ICSer_V913_2108141818_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index c9fcc883..0a485e2e 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":912,"versionName":"2108131507","enabled":true,"outputFile":"ICSer_V912_2108131507_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V912_2108131507_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":913,"versionName":"2108141818","enabled":true,"outputFile":"ICSer_V913_2108141818_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V913_2108141818_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 252c2e0c..03ff6db2 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -1045,17 +1045,16 @@ public class Config {
             noPushTxtReadReply = false;//即爱需要阅读反馈
             noBroadCastPushTxtNotify = true;
         } else if (Config.custom_name.equals("VitracK") || Config.custom_name.equals("wtsrui")) {
-
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true);
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF, true);
             enableSleep = true;
+            Config.forceMoveCheck = false;
             DefaultLocationMode = CUSTOM_MOD8_GPS;
             DefaultLocationCycle = 15 * 60;
             DefaultPPGTestCycleInMinutes = 15;
             DefaultTemperatureTestCycle = 15 * 60;
-
         } else {
             DefaultLocationMode = NORMAL_MOD;
             DefaultLocationCycle = 900;
@@ -1064,7 +1063,5 @@ public class Config {
             noBroadCastPushTxtNotify = true;
         }
     }
-
-
 }
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index d0cc8476..217d7a5a 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1353,17 +1353,6 @@ public class CoreService extends Service {
                         return Service.START_STICKY;
                     }
                 }
-//                    if (cmcm_call_eiot_into_powersave_mode() == 1) {
-//                        ICLogger.i("2 into powersave return");
-//                        return Service.START_NOT_STICKY;
-//                    }
-
-//                //wakeup后1分钟唤醒一次，5分钟后，心跳改为从配置信息读取的值，默认为3分钟
-//                if (this.startAlarmCount < 5 && alarmCycle == 1) {
-//                    this.startAlarmCount++;
-//                } else {
-//                    alarmCycle = Config.getAlarmCycle(this);
-//                }
                 AlarmWakeUp.setAlarmWakeUpTime();
                 boolean screenon = ((PowerManager) getSystemService(POWER_SERVICE)).isScreenOn();
                 if (!screenon) {
@@ -1398,7 +1387,6 @@ public class CoreService extends Service {
             } else if (Constants.ACTION_ALARM_BLE_SCAN.equals(paramIntent.getAction())) {
                 //循环蓝牙扫描
                 setBleScanAlarm(runtime.bleInfo.bleScanCycle);
-
             } else if (Constants.ACTION_PRACTICE_REPORT_ALARM.equals(paramIntent.getAction())) {
                 //alarm是延迟的，所以这个判断主要是给最后一次可能无效的测量
                 if (Runtime.practising) {
@@ -1614,13 +1602,9 @@ public class CoreService extends Service {
             ICLogger.i("skip set LocationAlarm ");
         sb.append(" setLocationAlarm  " + ACTION_LOCATION_ALARM + " mod " + mod + ", cycle in Seconds " + cycle);
         ICLogger.i(sb.toString());
-        if (Config.LOG_TOFILE)
+        if (Config.LOG_TOFILE) {
             FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", sb.toString());
-
-//        if (Runtime.practising==true) {
-//            ICLogger.i("自由锻炼中，跳过原有的循环定位！");
-//            return;
-//        }
+        }
         ICLogger.i("triggerLocationProcess ");
         locationClient.triggerLocationProcess();
 
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index a4668eb8..ee4a01dc 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -415,7 +415,7 @@ public class LocationClient {
         boolean needReOpenGPS = runtime.getFactoryTestingStat();
 
         //防止与工厂测试冲突
-        if (FactryModeOpening == false || needReOpenGPS == true) {
+        if (!FactryModeOpening || needReOpenGPS) {
 
             if (needReOpenGPS == true) {
                 ICLogger.i("工厂模式关闭了GPS，需要重新关闭GPS以同步状态！");
diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 1319ec43..22514065 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -886,11 +886,6 @@ public class protocol_s123 {
                         .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString());
     }
 
-    //处理 定位 BP01
-    public void handleBP01(String cmd) {
-        log("BP01定位接收成功");
-    }
-
     /*LBS+WiFi混合定位*/
     public static StringMessage APFF(Runtime ds) {
         //示例数据：IWAP02,
@@ -941,12 +936,6 @@ public class protocol_s123 {
                         .toString());  //wifi信息数据
     }
 
-    //处理 定位 BP01
-    public void handleBP02(String cmd) {
-        log("BP02定位接收成功");
-    }
-
-
     public static StringMessage APXL(String id) {
         //设备响应：	IWAPXL,080835#
         //080835:指令流水号
@@ -1724,8 +1713,8 @@ public class protocol_s123 {
 
     //立即定位反馈
     public static StringMessage AP16(String cmdindex) {
-//IWAP16,080835#
-//080835:指令流水号
+        //IWAP16,080835#
+        //080835:指令流水号
         return genStringMessage(cmdMap.get(CMD_TYPE.AP16), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP16))
                 .append(CMDSPLIT).append(cmdindex)
                 .append(CMDEND).toString());
@@ -1734,16 +1723,15 @@ public class protocol_s123 {
     //    立即定位指令（长链接有效）
     public void handleBP16(Connection connection, Runtime runtime, String cmd) {
         //示例数据：IWBP16,867155030001063,335386
-//        IWBP16,353456789012345,080835#
-//        说明：
-//        IW：标识符
-//        BP16 : 命令字符
-//        353456789012345:IMEI号，设备唯一ID
-//        080835 :指令流水号
+        //        IWBP16,353456789012345,080835#
+        //        说明：
+        //        IW：标识符
+        //        BP16 : 命令字符
+        //        353456789012345:IMEI号，设备唯一ID
+        //        080835 :指令流水号
         String[] cmdlist = cmd.split(",");
         if (cmdlist.length == 3) {
             log("imei " + cmdlist[1] + ", cmdindex " + cmdlist[2]);
-
             connection.send(AP16(cmdlist[2]));
         } else {
             log("error BP16 format");
@@ -2034,17 +2022,6 @@ public class protocol_s123 {
 
     }
 
-
-    //17.设置心率/血压测量周期（下行协议号：BP86，响应：AP86）
-    public static StringMessage AP86(String index) {
-
-        //设备响应：	IWAP86, 080835#
-        //080835:指令流水号
-        return genStringMessage("AP86", new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP86))
-                .append(CMDSPLIT).append(index)
-                .append(CMDEND).toString());
-    }
-
     public void handleBP86(String cmd, Connection connection, Runtime runtime) {
 
         //示例：
@@ -2056,16 +2033,13 @@ public class protocol_s123 {
         //080835 :指令流水号
         //1: 表示心率周期；2 ：表示血压周期
         //720: 表示720分钟
-
         String[] list = cmd.split(CMDSPLIT);
-
         if (list.length == 5) {
             String index = list[2];
             String type = list[3];
             String cycle = list[4];
-            connection.send(AP86(index));
+            responseWithId(cmdMap.get(CMD_TYPE.AP86), index, "1");
             ICLogger.i("收到服务器指令：设置" + (type.equals("1") ? "心率周期 " : "血压周期 ") + cycle + "分钟");
-
             try {
                 //发送重置PPGCycle的广播，会在CoreServer里面执行
                 CoreService.getInstance().setHeartRateDetectAlarm(Integer.parseInt(cycle));
@@ -3397,7 +3371,6 @@ public class protocol_s123 {
             case AP01:
                 break;
             case BP01: //gps定位包
-                handleBP01(cmd);
                 ICLogger.i("服务器收到定位AP01");
                 mConnection.DeliverCMDMessageToSystem("AP01", cmd);//通知下面线程状态变化
                 break;
diff --git a/app/version_code.properties b/app/version_code.properties
index b9d6f331..e4f26e51 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Aug 13 15:07:13 CST 2021
-VERSION_CODE=912
+#Sat Aug 14 18:18:12 CST 2021
+VERSION_CODE=913