From: snickersun <snickersun@qq.com>
Date: Tue, 15 Sep 2020 23:35:23 +0000 (+0800)
Subject: release V617
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=3b2cd7ae99fbe9da10161ee0611974550b5e1c1a;p=protocol_srv.git

release V617
H88A 和H88 做成相同配置
修改Log为最多存2个备份每个日志减少20M，主要为了减少上传数据量。
---

diff --git a/app/app.iml b/app/app.iml
index e442bebb..df83372d 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -18,8 +18,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false"/>
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug"/>
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res"/>
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value=""/>
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>
       </configuration>
     </facet>
@@ -101,15 +101,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>
-    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\mail.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\activation.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\additionnal.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>
diff --git a/app/release/ICSer_V617_2009160733_release.apk b/app/release/ICSer_V617_2009160733_release.apk
new file mode 100644
index 00000000..c9fd7a83
Binary files /dev/null and b/app/release/ICSer_V617_2009160733_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index b93dc5b6..a07cd8e2 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":616,"versionName":"2009151746","enabled":true,"outputFile":"ICSer_V616_2009151746_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V616_2009151746_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":617,"versionName":"2009160733","enabled":true,"outputFile":"ICSer_V617_2009160733_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V617_2009160733_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 8647020c..4d6968e6 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -401,7 +401,7 @@ public class Config {
     }
     custom_branch_name=Util.getSystemProperties("persist.sys.customname");
     ICLogger.i("get CUSTOMNAME "+custom_branch_name);
-    if ((custom_branch_name.equals("H88")) ){
+    if (custom_branch_name.equals("H88")||custom_branch_name.equals("H88A") ){
       noPushTxtNotifyDialog=true;
       noSMSNotifyDialog=false;
       noVoiceNotifyDialog=false;
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
index bffab824..43f33bd6 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
@@ -106,7 +106,7 @@ public class ICLogger {
 //        logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式
         logConfigurator.setFilePattern("%d %m%n ");// 设置文件输出模式
 //        02-29 16:28:38.195 4629-4658/com.enqualcomm.support E/com.enqualcomm.support.utils.ICLogger:
-        logConfigurator.setMaxBackupSize(3); // 设置最大备份数量
+        logConfigurator.setMaxBackupSize(2); // 设置最大备份数量
         logConfigurator.setMaxFileSize(1024 * 1024 * 20);// 设置最大文件大小  20MB
         logConfigurator.setImmediateFlush(true);// 设置是否立即刷新
         logConfigurator.setUseFileAppender(true); // 设置用户文件输出器
diff --git a/app/version_code.properties b/app/version_code.properties
index 268cb2d5..fdaed858 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Sep 15 17:46:15 CST 2020
-VERSION_CODE=616
+#Wed Sep 16 07:33:12 CST 2020
+VERSION_CODE=617