6.8.6

kongzue · Aug 29, 2022 · 123f39f · 123f39f
1 parent fff7c11
commit 123f39f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 30
         versionCode 121
-        versionName "6.8.4"
+        versionName "6.8.6"
     }
     buildTypes {
         release {

diff --git a/baseframework/build.gradle b/baseframework/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 30
         versionCode 124
-        versionName "6.8.5"
+        versionName "6.8.6"
     }
 
     buildTypes {

diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
@@ -146,23 +146,34 @@ public static void exitApp() {
         android.os.Process.killProcess(android.os.Process.myPid());
     }
 
+    private static String androidId;
+
+    public static void setAndroidId(String androidId) {
+        BaseFrameworkSettings.androidId = androidId;
+    }
+
     public static String getAndroidId() {
         if (PRIVACY_ALLOWED) {
-            String androidId = "";
-            androidId = BaseApp.Settings("device").getString("androidId");
             if (!isNull(androidId)) {
                 return androidId;
             }
             try {
-                androidId = android.provider.Settings.Secure.getString(BaseApp.getPrivateInstance().getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
+                androidId = BaseApp.Settings.getString("device","androidId",
+                        android.provider.Settings.Secure.getString(BaseApp.getPrivateInstance().getContentResolver(), android.provider.Settings.Secure.ANDROID_ID)
+                );
             } catch (Exception e) {
+                return createDeviceId();
             }
-            if (isNull(androidId)) {
+            if (!isNull(androidId)) {
+                BaseApp.Settings("device").set("androidId", androidId);
+                return androidId;
+            }else{
                 return createDeviceId();
             }
-            BaseApp.Settings("device").set("androidId", androidId);
-            return androidId;
         } else {
+            if (!isNull(androidId)) {
+                return androidId;
+            }
             return createDeviceId();
         }
     }