From: snickersun <scy@incartech.cn>
Date: Tue, 28 Jul 2020 02:34:50 +0000 (+0800)
Subject: release v462
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=7204b62c5a90502b4dc5ac1ca0f035952d2d2405;p=protocol_srv.git

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 2c26abcb..c977aec3 100644
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 78984a65..95f4bda9 100644
--- 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 9af8d4d8..7909095f 100644
--- 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;
 
   public static String c43_branch_name="none";
-  public static String c41_branch_name="none";
+  public static String custom_branch_name="none";
 
   public static boolean noSMSNotifyDialog=false;
   public static boolean noPushTxtNotifyDialog=false;
@@ -361,23 +361,28 @@ public class Config {
           noPPGSensor=true;
         }
     }
-    c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");
+    custom_branch_name=Util.getSystemProperties("persist.sys.customname");
 
-    if ((c41_branch_name.equals("H88")) ){
+    if ((custom_branch_name.equals("H88")) ){
       noPushTxtNotifyDialog=true;
       noSMSNotifyDialog=false;
       noVoiceNotifyDialog=false;
       noPPGSensor=false;
       noTempSensor=false;
       needBroadcastAntiAlarm=false;
-    }else if  ((c41_branch_name.equals("AK")) ){
+    }else if  ((custom_branch_name.equals("AK")) ){
       noPPGSensor=false;
       noTempSensor=true;
+    }else if ((custom_branch_name.equals("l004")) ) {
+      noPushTxtNotifyDialog=true;
+      noSMSNotifyDialog=true;
+      noVoiceNotifyDialog=false;
+      needBroadcastAntiAlarm=false;
+      noPPGSensor=false;
+      noTempSensor=false;
     }
-
-
     noPPGSensor=(ICJniUtils.isPPGavailable()==0);
-   // noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);
+    noTempSensor=(ICJniUtils.isTemperatureDevAvailable()==0);
 
   }
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f8c3234e..1d4bb437 100644
--- 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 {
 
         //初始化消息相关配置
         Config.LoadMessageConfigs();
-        if (Config.c41_branch_name.equals("H88")){
+        if (Config.custom_branch_name.equals("H88")){
 
             if (Config.getConfigInitFlag(this)==0) {
                 Config.setLocationMode(this, CUSTOM_MOD);
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 731571fa..03baabd5 100644
--- 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{
             WakeLockUtil.ScreenOnWakeLockTemperary(_context);
             play_waning_notify(_context);
+            VibrateUtil.getInstance(_context).VibrateOnOnce(true);
             try {
               Thread.sleep(2000);
             } catch (InterruptedException e) {
@@ -367,6 +368,7 @@ public class ContextProxy {
           }else{
             WakeLockUtil.ScreenOnWakeLockTemperary(_context);
             play_waning_notify(_context);
+            VibrateUtil.getInstance(_context).VibrateOnOnce(true);
             try {
               Thread.sleep(2000);
             } catch (InterruptedException e) {
diff --git a/app/version_code.properties b/app/version_code.properties
index 10329905..c0353214 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Jul 28 07:10:49 CST 2020
-VERSION_CODE=461
+#Tue Jul 28 10:30:36 CST 2020
+VERSION_CODE=462
diff --git a/local.properties b/local.properties
index f1749057..0f01e021 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Jul 22 00:25:44 CST 2020
-sdk.dir=D\:\\Android\\Sdk
+#Tue Jul 28 09:11:20 CST 2020
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk