release 433

L05 收到SOS时不执行拨打电话（其他进程已经在负责拨打SOS）

diff --git a/app/release/ICSer_V432_2007011520_release.apk b/app/release/ICSer_V433_2007021842_release.apk
similarity index 79%
rename from app/release/ICSer_V432_2007011520_release.apk
rename to app/release/ICSer_V433_2007021842_release.apk
index 020c4ee..aefbb9a 100644 (file)
Binary files a/app/release/ICSer_V432_2007011520_release.apk and b/app/release/ICSer_V433_2007021842_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 1e27d38..5c73f0b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -52,6 +52,7 @@ public class Config {
   public static boolean noSMSNotifyDialog=false;\r
   public static boolean noPushTxtNotifyDialog=false;\r
   public static boolean noVoiceNotifyDialog=false;\r
+  public static boolean SOSNoNeedDial=false;\r
 \r
   static  {\r
   \r
@@ -361,6 +362,7 @@ public class Config {
         noPushTxtNotifyDialog=true;\r
         noSMSNotifyDialog=true;\r
         noVoiceNotifyDialog=true;\r
+        if (c43_branch_name.equals("l05")) SOSNoNeedDial=true;\r
     }\r
     String c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");\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 0255662..87dbed2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -197,14 +197,16 @@ public class CoreService extends Service {
                     //设置5分钟后结束紧急定位模式\r
                    setEmegencyLocationSTOPAlarm(5);\r
 \r
-                //50ms后开始拨打电话\r
-                Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
-                    public void call(Long param1Long) {\r
-                        trigger_SOS_Call();\r
-                    }\r
-                });\r
 \r
+                   if(Config.SOSNoNeedDial==false) {\r
+                       //50ms后开始拨打电话\r
+                       Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+                           public void call(Long param1Long) {\r
+                               trigger_SOS_Call();\r
+                           }\r
+                       });\r
 \r
+                   }\r
                 }\r
         }\r
     };\r

diff --git a/app/version_code.properties b/app/version_code.properties
index cc507bf..0dee1f5 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jul 01 15:20:32 CST 2020\r
-VERSION_CODE=432\r
+#Thu Jul 02 18:42:10 CST 2020\r
+VERSION_CODE=433\r