release V620

修正getSystemProperties 中默认字符串值无法正确返回的问题。

diff --git a/app/release/ICSer_V619_2009172055_release.apk b/app/release/ICSer_V620_2009172123_release.apk
similarity index 78%
rename from app/release/ICSer_V619_2009172055_release.apk
rename to app/release/ICSer_V620_2009172123_release.apk
index f20d21c..52095ae 100644 (file)
Binary files a/app/release/ICSer_V619_2009172055_release.apk and b/app/release/ICSer_V620_2009172123_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index d7c21e7..fb22db3 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":619,"versionName":"2009172055","enabled":true,"outputFile":"ICSer_V619_2009172055_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V619_2009172055_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":620,"versionName":"2009172123","enabled":true,"outputFile":"ICSer_V620_2009172123_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V620_2009172123_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index 5e00ff8..288ac9f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -246,6 +246,9 @@ public class Util {
       clazz = Class.forName("android.os.SystemProperties");\r
       Method get=clazz.getMethod("get", new Class[] { String.class });\r
       str = (String)get.invoke(clazz, new Object[] { prop });\r
+      if(str==null || (str!=null && str.trim().isEmpty())){\r
+        str=defaultValue;\r
+      }\r
     } catch (Exception e) {\r
       e.printStackTrace();\r
     }\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 7eeed6c..35d8aca 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 20:55:50 CST 2020\r
-VERSION_CODE=619\r
+#Thu Sep 17 21:23:55 CST 2020\r
+VERSION_CODE=620\r