release ICProtocolV2 V955

Gator 默认GPS定位，间隔5分钟，强制运动检测

diff --git a/app/release/ICSer_V954_2109151840_release.apk b/app/release/ICSer_V955_2109171904_release.apk
similarity index 78%
rename from app/release/ICSer_V954_2109151840_release.apk
rename to app/release/ICSer_V955_2109171904_release.apk
index 95153e9..0a1803d 100644 (file)
Binary files a/app/release/ICSer_V954_2109151840_release.apk and b/app/release/ICSer_V955_2109171904_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 6de95d2..2631e6f 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":954,"versionName":"2109151840","enabled":true,"outputFile":"ICSer_V954_2109151840_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V954_2109151840_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":955,"versionName":"2109171904","enabled":true,"outputFile":"ICSer_V955_2109171904_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V955_2109171904_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 de1651f..fcf588c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -1060,6 +1060,16 @@ public class Config {
             DefaultLocationCycle = 15 * 60;
             DefaultPPGTestCycleInMinutes = 15;
             DefaultTemperatureTestCycle = 15 * 60;
+        } else if (Config.custom_name.equals("Gator") ) {
+            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);
+            Config.forceMoveCheck = true;
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
+            DefaultLocationCycle = 5 * 60;
+            DefaultPPGTestCycleInMinutes = 0;
+            DefaultTemperatureTestCycle = 0;
         } else {
             DefaultLocationMode = NORMAL_MOD;
             DefaultLocationCycle = 900;

diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java
index dfd8f1a..cd4e51b 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_gator.java
+++ b/app/src/main/java/com/ic/protocols/protocol_gator.java
@@ -1585,219 +1585,6 @@ SOS报警上行WIFI、LBS混合定位数据,步数为255步,电量等级5，数
                 ICLogger.d("app端发起视频通话到手表...");
                 handleAP50(mRuntime, mConnection, cmd);
                 break;
-//            case AP14:// wifi定位包
-//                handleBP02(cmd);
-//                ICLogger.i("服务器收到定位AP02");
-//                mConnection.DeliverCMDMessageToSystem("AP02", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14: //心跳包
-//                handleBP03(cmd);
-//                ICLogger.i("服务器收到心跳包AP03");
-//                mConnection.DeliverCMDMessageToSystem("heartbeat", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                //收到发送的语音包
-//                handleBP07(cmd, mConnection);
-//                break;
-//            case AP14:
-//                //报警包
-//                mConnection.DeliverCMDMessageToSystem("AP10", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                mConnection.DeliverCMDMessageToSystem("APBR", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                //校时命令
-//                handleBPTM(cmd);
-//                ICLogger.i("服务器收到校时命令APTM");
-//                mConnection.DeliverCMDMessageToSystem("APTM", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14://设置闹钟
-//                handleBP85(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到服务器设置闹钟命令BP85");
-//                mConnection.DeliverCMDMessageToSystem("AP85", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                handleBP87(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到服务器 QRCode uri BP87");
-//                break;
-//            case BP33:
-//                //设置工作模式
-//                handleBP33(mConnection, mRuntime, cmd);
-//                mConnection.DeliverCMDMessageToSystem("setWorkMod", cmd);//通知下面线程状态变化
-//
-//                break;
-//            case BP34:
-//                //设置工作模式
-//                handleBP34(mConnection, mRuntime, cmd);
-//                mConnection.DeliverCMDMessageToSystem("setWorkMod", cmd);//通知下面线程状态变化
-//                break;
-
-//
-//            case AP14: //立即拍照
-//                ICLogger.i("立即拍照！");
-//                handleBP46(cmd, mConnection, mRuntime);
-//                break;
-//
-//            case AP14:
-//                //收到设置SOS号码
-//                handleBP12(mConnection, cmd, mRuntime);
-//                ICLogger.i("收到服务器设置SOS号码命令BP12");
-//                break;
-
-//            case AP14:
-//                //收到设置白名单号码
-//                handleBPWL(mConnection, cmd, mRuntime);
-//                ICLogger.i("收到服务器设置白名单号码命令BPWL");
-//                break;
-//            case AP14:
-//                handleBP15(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到服务器设置定位命令BP15");
-//                break;
-//            case AP14:
-//                //收到恢复出厂设置
-//                handleBP17(mConnection, cmd);
-//                ICLogger.i("收到服务器恢复出厂设置命令BP17");
-//                mConnection.DeliverCMDMessageToSystem("FactoryReset", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                //收到重启
-//                handleBP18(mConnection, cmd);
-//                ICLogger.i("收到服务器重启命令BP18");
-//                mConnection.DeliverCMDMessageToSystem("Reboot", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case BP31:
-//                //收到关机
-//                handleBP31(mConnection, cmd);
-//                ICLogger.i("收到服务器关机命令BP31");
-//                mConnection.DeliverCMDMessageToSystem("poweroff", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                //服务器推送文本
-//                handleBP40(mConnection, mRuntime, cmd);
-//                ICLogger.i("收到服务器推送文本消息");
-//                mConnection.DeliverCMDMessageToSystem("showTxt", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                handleBPXL(cmd, mConnection);
-//                ICLogger.i("收到服务器心率检测命令");
-//                if (mRuntime.check_stat_do_ppg_test())
-//                    HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
-//                break;
-//            case AP14:
-//                handleBPXY(cmd, mConnection);
-//                ICLogger.i("收到服务器血压检测命令");
-//                if (mRuntime.check_stat_do_ppg_test())
-//                    HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
-//                break;
-//            case AP14:
-//                handleBPJZ(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到服务器血压校准命令");
-//                break;
-//            case AP14:
-//                ICLogger.i("服务器收到上传的心率血压");
-//                mConnection.DeliverCMDMessageToSystem("APHT", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                handleBP84(cmd, mConnection);
-//                ICLogger.i("收到服务器白名单命令");
-//                break;
-//
-//            case AP14:
-//                //心率周期
-//                handleBP86(cmd, mConnection, mRuntime);
-//                mConnection.DeliverCMDMessageToSystem("AP86", cmd);//通知下面线程状态变化
-//
-//                break;
-//            case AP14: //绑定解绑
-//                handleBP68(cmd, mConnection, mRuntime);
-//                break;
-//            case AP14:
-//                //收到查找设备消息
-//                handleBP88(cmd, mConnection);
-//                mConnection.DeliverCMDMessageToSystem("findDev", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                //心率/血压阀值
-//                handleBP89(cmd, mConnection);
-//                mConnection.DeliverCMDMessageToSystem("AP89", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14: //设置测试体温
-//                handleBPTE(cmd, mConnection, mRuntime);
-//                mConnection.DeliverCMDMessageToSystem("APTE", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                handleBPTP();
-//                mConnection.DeliverCMDMessageToSystem("APTP", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                handleBPHP();
-//                mConnection.DeliverCMDMessageToSystem("APHP", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14://设置 心率血压血氧修正值
-//                handleBPX1(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");
-//                mConnection.DeliverCMDMessageToSystem("APX1", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14: //提醒设置(时间段) 主要为久坐设置提醒时长。
-//                handleBPS4(cmd, mConnection, mRuntime);
-//                ICLogger.i("收到 提醒设置(时间段)");
-//                mConnection.DeliverCMDMessageToSystem("APS4", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                handleBPDE(mConnection, cmd, mRuntime);
-//                ICLogger.i(" 收到 进出围栏通知！");
-//                mConnection.DeliverCMDMessageToSystem("APDE", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                handleBPTU(cmd, mConnection);
-//                ICLogger.i("收到服务器 图片语音 消息 BPTU");
-//                //    mConnection.DeliverCMDMessageToSystem("APTU", "");//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                handleBPDG(mConnection, cmd, mRuntime);
-//                ICLogger.i(" 收到 体温阈值设置！");
-//                mConnection.DeliverCMDMessageToSystem("APDG", cmd);//通知下面线程状态变化
-//                break;
-//            case AP14:
-//                ICLogger.i("睡眠数据上传完毕！");
-//                mConnection.DeliverCMDMessageToSystem("APSL", cmd);//通知下面线程状态变化
-//                break;
-//
-//            case AP14:
-//                ICLogger.i("聆听");
-//                handleBPDH(mConnection, mRuntime, cmd);
-//                break;
-//
-//            case AP14: //天气下发
-//                handleBPTQ(mConnection, mRuntime, cmd);
-//                break;
-//            case AP14://剪断开关设定
-//                handleBPAT(mConnection, mRuntime, cmd);
-//                break;
-//
-//            case AP14://蓝牙扫描设置
-//                handleBPBT(mConnection, mRuntime, cmd);
-//                break;
-//            case AP14://蓝牙扫描设置Majorlist
-//                handleBPBS(mConnection, mRuntime, cmd);
-//                break;
-//
-//            case AP14://声音设置
-//                handleBP65(mConnection, mRuntime, cmd);
-//                break;
-//            case AP14://震动设置
-//                handleBP47(mConnection, mRuntime, cmd);
-//                break;
-//
 
         }
 

diff --git a/app/version_code.properties b/app/version_code.properties
index 4c6ead6..d40775b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 15 18:40:20 CST 2021\r
-VERSION_CODE=954\r
+#Fri Sep 17 19:04:57 CST 2021\r
+VERSION_CODE=955\r

diff --git a/local.properties b/local.properties
index 8bb0634..bfdf41b 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Fri Jul 02 14:52:39 CST 2021\r
-sdk.dir=E\:\\Android\\Sdk\r
+#Mon Sep 13 18:24:11 CST 2021\r
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r