From: snickersun <scy@incartech.cn>
Date: Fri, 3 Jul 2020 09:45:16 +0000 (+0800)
Subject: release 433
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d2b8f0e514b0e5a7aadc6f5fd3b23e321b471b5b;p=protocol_srv.git

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 020c4eef..aefbb9a2 100644
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 1e27d38c..5c73f0be 100644
--- 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;
   public static boolean noPushTxtNotifyDialog=false;
   public static boolean noVoiceNotifyDialog=false;
+  public static boolean SOSNoNeedDial=false;
 
   static  {
   
@@ -361,6 +362,7 @@ public class Config {
         noPushTxtNotifyDialog=true;
         noSMSNotifyDialog=true;
         noVoiceNotifyDialog=true;
+        if (c43_branch_name.equals("l05")) SOSNoNeedDial=true;
     }
     String c41_branch_name=Util.getSystemProperties("persist.sys.c41.branch");
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 0255662f..87dbed20 100644
--- 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分钟后结束紧急定位模式
                    setEmegencyLocationSTOPAlarm(5);
 
-                //50ms后开始拨打电话
-                Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
-                    public void call(Long param1Long) {
-                        trigger_SOS_Call();
-                    }
-                });
 
+                   if(Config.SOSNoNeedDial==false) {
+                       //50ms后开始拨打电话
+                       Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+                           public void call(Long param1Long) {
+                               trigger_SOS_Call();
+                           }
+                       });
 
+                   }
                 }
         }
     };
diff --git a/app/version_code.properties b/app/version_code.properties
index cc507bf6..0dee1f52 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jul 01 15:20:32 CST 2020
-VERSION_CODE=432
+#Thu Jul 02 18:42:10 CST 2020
+VERSION_CODE=433