From: snickersun <scy@incartech.cn>
Date: Fri, 25 Sep 2020 14:24:23 +0000 (+0800)
Subject: release V634
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=4d0f08f051ba714fd6375121f73413ddb069a9e1;p=protocol_srv.git

release V634
解决编译问题，以及release版本。
---

diff --git a/app/release/ICSer_V632_2009241851_release.apk b/app/release/ICSer_V634_2009252122_release.apk
similarity index 78%
rename from app/release/ICSer_V632_2009241851_release.apk
rename to app/release/ICSer_V634_2009252122_release.apk
index a1438977..7fba9e58 100644
Binary files a/app/release/ICSer_V632_2009241851_release.apk and b/app/release/ICSer_V634_2009252122_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 76586984..b3591400 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":632,"versionName":"2009241851","enabled":true,"outputFile":"ICSer_V632_2009241851_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V632_2009241851_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":634,"versionName":"2009252122","enabled":true,"outputFile":"ICSer_V634_2009252122_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V634_2009252122_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 285e7686..8b42937d 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -734,7 +734,7 @@ public void updateCellInfo() {
     }
   //如果没有动，且超时。则跳过定位
     boolean NoMoveTimeout=checkNoMoveTimeout();
-    // 不强制定位 且 WorkingMod 不是紧急模式，且 没有移动过
+    // 不强制定位 且 （WorkingMod 不是紧急模式 或者 强制进行移动检测），且 没有移动过
     if ( ( forceLocation != 1 ) &&
             ((( mod == ICLocation.NORMAL_MOD ) ||  ( mod == ICLocation.LOWPOWER_MOD ) || (mod == ICLocation.CUSTOM_MOD8_WIFI ) ) || Config.forceMoveCheck==true)  &&
             (NoMoveTimeout) && (skipMoveCheck ==false  )){
diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 122fa2c7..8a232ae3 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -150,7 +150,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
         case PRECISE_CALL_STATE_ACTIVE://接电话
         {
           if (ICAudioManager.needMute == false){
-            if (Config.custom_branch_name.equals("AK"))
+            if (Config.custom_name.equals("AK"))
               ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量
           }
         }
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 6974d437..fca7a5c1 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -1568,7 +1568,7 @@ public class protocol_ic {
             String type=list[3];
             connection.send(AP68(index,type));
             ICLogger.i("收到服务器消息："+(type.equals("1")?"绑定成功 ":"未激活或者解绑"));
-            if (Config.custom_branch_name.equals("YQ")||Config.custom_branch_name.equals("YQ_EN")) {//AK-YQ
+            if (Config.custom_name.equals("YQ")||Config.custom_name.equals("YQ_EN")) {//AK-YQ
                 if (type.equals("1")) {
                     WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);
 //                    runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2);
diff --git a/app/version_code.properties b/app/version_code.properties
index 50853942..057c765c 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 24 18:51:22 CST 2020
-VERSION_CODE=632
+#Fri Sep 25 21:22:18 CST 2020
+VERSION_CODE=634