From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 28 Oct 2021 07:35:58 +0000 (+0800)
Subject: SOS添加时长
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=291be2220df3b3622079781b1a88b86730e294fd;p=icsupport.git

SOS添加时长
---

diff --git a/app/release/ICSer_V1001_2110281156_release.apk b/app/release/ICSer_V1002_2110281527_release.apk
similarity index 77%
rename from app/release/ICSer_V1001_2110281156_release.apk
rename to app/release/ICSer_V1002_2110281527_release.apk
index c29ae6a6..d63298e9 100644
Binary files a/app/release/ICSer_V1001_2110281156_release.apk and b/app/release/ICSer_V1002_2110281527_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 60227e5e..d4a9c28c 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1001,"versionName":"2110281156","enabled":true,"outputFile":"ICSer_V1001_2110281156_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1001_2110281156_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1002,"versionName":"2110281527","enabled":true,"outputFile":"ICSer_V1002_2110281527_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1002_2110281527_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index c7e61691..5553deaa 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1299,18 +1299,12 @@ public class CoreService extends Service {
             stringBuilder.append(" paramInt2=");
             stringBuilder.append(paramInt2);
             ICLogger.i(stringBuilder.toString());
-//            if (ACTION_ALARM.equals(paramIntent.getAction())) {
 
             if (HEARTBEAT_ALARM.equals(paramIntent.getAction())) {
                 //发送心跳间隔广播给其他应用
                 this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
                 this.connectionServiceChain.processAlarmClock(this.connection, this.runtime);
                 this.invokeHandlerServiceChain.processAlarmClock(this.connection, this.runtime);
-//                if (SystemClock.elapsedRealtime() - this.mWeatherTime > 60000L && this.mHaveSetWeatherAlarm) {
-//                    setWeatherAlarm();
-//                    this.mHaveSetWeatherAlarm = false;
-//                    return Service.START_NOT_STICKY;
-//                }
 
                 locationClient.updateStepCount();
                 updateSleepDate(); //检查睡眠
@@ -1325,13 +1319,9 @@ public class CoreService extends Service {
                         locationClient.triggerBLEProcess();//每次心跳检测一次BLE
                         Deliver.triggerSendThread();
                     } else {
-                        // if (this.mKeepAlive.is_retry_time_above_limit()) {
                         ICLogger.i("check 发送心跳包时，如果发现服务器没有响应，或者socket连接，则重新尝试连接服务器！");
                         connection.disconnectServer();
                         this.startConnectionRetryTimer();
-                        // }else{
-                        //      ICLogger.i("");
-                        //  }
                     }
                 }
                 //检测电池电量 并上报低电报警
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 a268e47e..3ab480cf 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -11,6 +11,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.SystemProperties;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoCdma;
 import android.telephony.CellInfoGsm;
@@ -1228,6 +1229,15 @@ public class protocol_s123 {
             contentValues3.put(ICDatabaseHelper.fPhoneNum, phNum3);
             resolver.insert(Uri.parse(ICMembersProvider.MEMBERS), contentValues3);
             ICLogger.d("inset sos data okay...");
+
+            try {
+                String duration = cmdList[6];
+                ICLogger.d("duration ==> " + duration);
+                //设置到prop里
+                SystemProperties.set("persist.sys.sos.time", duration);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         } else {
             ICLogger.i(" BP12 format error!");
         }
diff --git a/app/version_code.properties b/app/version_code.properties
index 4133261a..c3bb0fc9 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Oct 28 11:56:21 CST 2021
-VERSION_CODE=1001
+#Thu Oct 28 15:27:36 CST 2021
+VERSION_CODE=1002