Merge remote-tracking branch 'origin/appbase' into contacts

androiddemo/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -46,11 +46,11 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-
     // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        exclude group: "com.android.support", module: "support-vector-drawable"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
     api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
@@ -66,6 +66,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:23:51 GMT 2025
+#Sat Mar 29 04:34:14 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=11
+buildCount=15
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -60,13 +60,14 @@ dependencies {
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
     api 'com.google.android.material:material:1.4.0'
     //api 'androidx.viewpager:viewpager:1.0.0'
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libaes:15.2.1'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:19:57 GMT 2025
+#Sat Mar 29 04:28:00 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=8
+buildCount=11
 baseBetaVersion=15.0.1

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 08:43:44 HKT 2025
+#Sat Mar 29 11:28:02 HKT 2025
-stageCount=1
+stageCount=3
 libraryProject=libappbase
 baseVersion=15.2
-publishVersion=15.2.0
+publishVersion=15.2.2
 buildCount=0
-baseBetaVersion=15.2.1
+baseBetaVersion=15.2.3

appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java

@@ -86,6 +86,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
 	public void onSwitchDebugMode(View view) {
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
+        GlobalApplication.saveDebugStatus();
     }
    
     public void onPreviewGlobalCrashActivity(View view) {

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 08:43:25 HKT 2025
+#Sat Mar 29 11:27:54 HKT 2025
-stageCount=1
+stageCount=3
 libraryProject=libappbase
 baseVersion=15.2
-publishVersion=15.2.0
+publishVersion=15.2.2
 buildCount=0
-baseBetaVersion=15.2.1
+baseBetaVersion=15.2.3

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -25,9 +25,12 @@ public class GlobalApplication extends Application {
     MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
     public static void setIsDebuging(boolean isDebuging) {
+        GlobalApplication.isDebuging = isDebuging;
+    }
+    
+    public static void saveDebugStatus() {
         if (_GlobalApplication != null) {
-            GlobalApplication.isDebuging = isDebuging;
+            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(GlobalApplication.isDebuging));
-            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
         }
     }
 
@@ -69,6 +72,7 @@ public class GlobalApplication extends Application {
         APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
         if (appBaseModel == null) {
             setIsDebuging(false);
+            saveDebugStatus();
         } else {
             setIsDebuging(appBaseModel.isDebuging());
         }

libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java

@@ -220,7 +220,17 @@ public class LogUtils {
     }
 
     static boolean isLoggable(String tag, LOG_LEVEL logLevel) {
-        return _IsInited && mapTAGList.get(tag) && isInTheLevel(logLevel);
+        if (!_IsInited) {
+            return false;
+        } 
+        if (mapTAGList.get(tag) == null
+            || !mapTAGList.get(tag)) {
+            return false;
+        } 
+        if (!isInTheLevel(logLevel)) {
+            return false;
+        }
+        return true;
     }
 
     static boolean isInTheLevel(LOG_LEVEL logLevel) {