From: SnickerSun <scy@incartech.cn>
Date: Fri, 3 Sep 2021 11:48:05 +0000 (+0800)
Subject: release ICProtocol8.1_V924
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f3f5aa86d094fdc20f58664390462a8999747349;p=protocol_srv.git

release ICProtocol8.1_V924
修复SOSON 配置反问题
修改上传日志路径为 /sdcard/Android/V20
---

diff --git a/app/release/ICProtocol8.1_V921_2108311109_release.apk b/app/release/ICProtocol8.1_V924_2109031945_release.apk
similarity index 78%
rename from app/release/ICProtocol8.1_V921_2108311109_release.apk
rename to app/release/ICProtocol8.1_V924_2109031945_release.apk
index 777328d2..68d3835a 100644
Binary files a/app/release/ICProtocol8.1_V921_2108311109_release.apk and b/app/release/ICProtocol8.1_V924_2109031945_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index a1540110..116475c7 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":922,"versionName":"2109030832","enabled":true,"outputFile":"ICProtocol8.1_V922_2109030832_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V922_2109030832_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":924,"versionName":"2109031945","enabled":true,"outputFile":"ICProtocol8.1_V924_2109031945_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V924_2109031945_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocolSrv/CoreService.java b/app/src/main/java/com/ic/protocolSrv/CoreService.java
index 2465a3ac..5ca28473 100644
--- a/app/src/main/java/com/ic/protocolSrv/CoreService.java
+++ b/app/src/main/java/com/ic/protocolSrv/CoreService.java
@@ -256,8 +256,8 @@ public class CoreService extends Service {
                 if (query != null) {
                     if (query.moveToNext()) {
                         String value = query.getString(0);
-                        ICLogger.d("sos on value ==> " + value);
-                        disableSos = "1".equals(value);
+                         disableSos = "0".equals(value);
+                        ICLogger.d("sos on value ==> " + value+" "+disableSos);
                     }
                     query.close();
                 }
diff --git a/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java b/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
index 5f6abbb7..9a8e6047 100644
--- a/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
+++ b/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
@@ -371,7 +371,7 @@ public class ICSmsManager extends BroadcastReceiver {
         }
 
         if (sms.equals(ENCRYPED_HEADER + "#logctl#=upload,all")) {
-            sms = ENCRYPED_HEADER + "#logctl#=upload,SDLog:Android/ic";
+            sms = ENCRYPED_HEADER + "#logctl#=upload,SDLog:Android/V20";
         }
         //$HX,SSER,OK,91.201.4.79,5018,C,589883
         if (sms.startsWith(ENCRYPED_HEADER + "$HX,SSER,OK,")) {
diff --git a/app/src/main/java/com/ic/protocolSrv/toolActivity.java b/app/src/main/java/com/ic/protocolSrv/toolActivity.java
index 1ac03061..fb71d5eb 100644
--- a/app/src/main/java/com/ic/protocolSrv/toolActivity.java
+++ b/app/src/main/java/com/ic/protocolSrv/toolActivity.java
@@ -113,7 +113,7 @@ public class toolActivity extends Activity {
             @Override
             public void onClick(View view) {
                 Intent intent=new Intent();
-                intent.putExtra("smsCmd","#logctl#=upload,SDLogInfo:Android/ic");
+                intent.putExtra("smsCmd","#logctl#=upload,SDLogInfo:Android/V20");
                 CoreService.getInstance().runtime.getContextProxy().sendBroadcast("com.ic.protocolSrv.SMSCMD",intent);
             }
         });
diff --git a/app/src/main/java/com/ic/protocolSrv/utils/StorageUtils.java b/app/src/main/java/com/ic/protocolSrv/utils/StorageUtils.java
index 8be52954..19a0e673 100644
--- a/app/src/main/java/com/ic/protocolSrv/utils/StorageUtils.java
+++ b/app/src/main/java/com/ic/protocolSrv/utils/StorageUtils.java
@@ -42,14 +42,14 @@ public final class StorageUtils {
 	public static String getExternalStorageLogDir() {
 
 		if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-			File dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/ic/icprotocol");
+			File dir = new File(Environment.getExternalStorageDirectory().getPath(), "Android/V20/ic/icprotocol");
 			String path = dir.getPath();
 			if (!dir.exists()) {
 				dir.mkdirs();
 			}
 			return path;
 		}
-		return "/storage/emulated/0/Android/ic/icprotocol";
+		return "/storage/emulated/0/Android/V20/ic/icprotocol";
 	}
 	/**
 	 * Returns application cache directory. Cache directory will be created on SD card
diff --git a/app/version_code.properties b/app/version_code.properties
index ff47f1b7..921a888e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Sep 03 08:32:22 CST 2021
-VERSION_CODE=922
+#Fri Sep 03 19:45:52 CST 2021
+VERSION_CODE=924
diff --git a/local.properties b/local.properties
index 65b856e1..7a802755 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.
-#Thu Sep 02 23:13:13 CST 2021
-sdk.dir=D\:\\Android\\Sdk
+#Fri Sep 03 11:56:39 CST 2021
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk