release V624

A9 解锁 恢复出厂设置改为5秒后执行。

diff --git a/app/app.iml b/app/app.iml
index e442beb..10a5102 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -29,15 +29,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
     <exclude-output/>\r
     <content url="file://$MODULE_DIR$">\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r

diff --git a/app/release/ICSer_V622_2009191813_release.apk b/app/release/ICSer_V624_2009192208_release.apk
similarity index 87%
rename from app/release/ICSer_V622_2009191813_release.apk
rename to app/release/ICSer_V624_2009192208_release.apk
index 331d420..df7fde1 100644 (file)
Binary files a/app/release/ICSer_V622_2009191813_release.apk and b/app/release/ICSer_V624_2009192208_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index e02bbe8..4be690b 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":622,"versionName":"2009191813","enabled":true,"outputFile":"ICSer_V622_2009191813_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V622_2009191813_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":624,"versionName":"2009192208","enabled":true,"outputFile":"ICSer_V624_2009192208_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V624_2009192208_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 8e7c7f8..71dfe6a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -650,6 +650,10 @@ public class CoreService extends Service {
                 Config.setPPGTestCycle(this, 0);\r
                 Config.setTemperatureTestCycle(runtime, 0);\r
                 Config.setConfigInitFlag(this, 1);\r
+                Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS,true);\r
+                Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY,true);\r
+                Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED,true);\r
+                Config.ConfigAlarm(Runtime.AlarmType.ALARM_ANTIOFF,true);\r
                 Config.enableSleep=true;\r
 //                int contactcount=runtime.getDbHelper().getContactCount(getContentResolver());\r
 //                ICLogger.i("=====Contact count "+contactcount);\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 87b814b..9a103dc 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1551,7 +1551,7 @@ public class protocol_ic {
                         public void run() {\r
                             Util.doMasterClear(runtime.getContextProxy().context);\r
                         }\r
-                    },500);\r
+                    },5000);\r
                 }\r
             }\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index e1af902..468216a 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Sep 19 18:13:35 CST 2020\r
-VERSION_CODE=622\r
+#Sat Sep 19 22:08:22 CST 2020\r
+VERSION_CODE=624\r