release v462

给短信，推送文本，在没有弹出窗口的情况下添加震动提醒。

diff --git a/app/release/ICSer_V460_2007231643_release.apk b/app/release/ICSer_V462_2007281030_release.apk
similarity index 77%
rename from app/release/ICSer_V460_2007231643_release.apk
rename to app/release/ICSer_V462_2007281030_release.apk
index 2c26abc..c977aec 100644 (file)
Binary files a/app/release/ICSer_V460_2007231643_release.apk and b/app/release/ICSer_V462_2007281030_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 78984a6..95f4bda 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":461,"versionName":"2007280710","enabled":true,"outputFile":"ICSer_V461_2007280710_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V461_2007280710_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":462,"versionName":"2007281030","enabled":true,"outputFile":"ICSer_V462_2007281030_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V462_2007281030_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 9af8d4d..7909095 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -51,7 +51,7 @@ public class Config {
   public static final int WiFiLocationTimeoutInSeconds=12;\r
 \r
   public static String c43_branch_name="none";\r
-  public static String c41_branch_name="none";\r
+  public static String custom_branch_name="none";\r
 \r
   public static boolean noSMSNotifyDialog=false;\r
   public static boolean noPushTxtNotifyDialog=false;\r
@@ -361,23 +361,28 @@ public class Config {
           noPPGSensor=true;\r
         }\r
     }\r
-    c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");\r
+    custom_branch_name=Util.getSystemProperties("persist.sys.customname");\r
 \r
-    if ((c41_branch_name.equals("H88")) ){\r
+    if ((custom_branch_name.equals("H88")) ){\r
       noPushTxtNotifyDialog=true;\r
       noSMSNotifyDialog=false;\r
       noVoiceNotifyDialog=false;\r
       noPPGSensor=false;\r
       noTempSensor=false;\r
       needBroadcastAntiAlarm=false;\r
-    }else if  ((c41_branch_name.equals("AK")) ){\r
+    }else if  ((custom_branch_name.equals("AK")) ){\r
       noPPGSensor=false;\r
       noTempSensor=true;\r
+    }else if ((custom_branch_name.equals("l004")) ) {\r
+      noPushTxtNotifyDialog=true;\r
+      noSMSNotifyDialog=true;\r
+      noVoiceNotifyDialog=false;\r
+      needBroadcastAntiAlarm=false;\r
+      noPPGSensor=false;\r
+      noTempSensor=false;\r
     }\r
-\r
-\r
     noPPGSensor=(ICJniUtils.isPPGavailable()==0);\r
-   // noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\r
+    noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);\r
 \r
   }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f8c3234..1d4bb43 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -521,7 +521,7 @@ public class CoreService extends Service {
 \r
         //初始化消息相关配置\r
         Config.LoadMessageConfigs();\r
-        if (Config.c41_branch_name.equals("H88")){\r
+        if (Config.custom_branch_name.equals("H88")){\r
 \r
             if (Config.getConfigInitFlag(this)==0) {\r
                 Config.setLocationMode(this, CUSTOM_MOD);\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 731571f..03baabd 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -344,6 +344,7 @@ public class ContextProxy {
           }else{\r
             WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
             play_waning_notify(_context);\r
+            VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
             try {\r
               Thread.sleep(2000);\r
             } catch (InterruptedException e) {\r
@@ -367,6 +368,7 @@ public class ContextProxy {
           }else{\r
             WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
             play_waning_notify(_context);\r
+            VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
             try {\r
               Thread.sleep(2000);\r
             } catch (InterruptedException e) {\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 1032990..c035321 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Jul 28 07:10:49 CST 2020\r
-VERSION_CODE=461\r
+#Tue Jul 28 10:30:36 CST 2020\r
+VERSION_CODE=462\r

diff --git a/local.properties b/local.properties
index f174905..0f01e02 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
-#Wed Jul 22 00:25:44 CST 2020\r
-sdk.dir=D\:\\Android\\Sdk\r
+#Tue Jul 28 09:11:20 CST 2020\r
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r