From f2d8902b4cfd75c198656c888d1dc59563e6a7a7 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 14:29:03 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 8 ++++---- androiddemo/build.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index e498523..0aaf2e6 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -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 diff --git a/androiddemo/build.properties b/androiddemo/build.properties index b67201a..f6428e1 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 07:23:51 GMT 2025 +#Fri Mar 28 06:28:08 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=11 +buildCount=13 baseBetaVersion=15.0.1 From 3e1531d356728afc133cdf7e1d9a6ee2acf3138f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:19:35 +0800 Subject: [PATCH 2/8] BugFix --- appbase/build.properties | 4 ++-- .../java/cc/winboll/studio/appbase/MainActivity.java | 1 + libappbase/build.properties | 4 ++-- .../winboll/studio/libappbase/GlobalApplication.java | 8 ++++++-- .../java/cc/winboll/studio/libappbase/LogUtils.java | 12 +++++++++++- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index ad1af13..f29a281 100644 --- a/appbase/build.properties +++ b/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 03:16:41 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.1 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index b25b6ac..c99a20d 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/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) { diff --git a/libappbase/build.properties b/libappbase/build.properties index cfd7c17..f29a281 100644 --- a/libappbase/build.properties +++ b/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 03:16:41 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.1 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java index 240c13f..9cff4a1 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java +++ b/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(isDebuging)); + APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(GlobalApplication.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()); } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java index a49ea55..e3524d5 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java +++ b/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) { From 07959be09102576bcde4b5904f5fd4066cf3c578 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:20:21 +0800 Subject: [PATCH 3/8] APK 15.2.1 release Publish. --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index ad1af13..435ff5e 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:44 HKT 2025 -stageCount=1 +#Sat Mar 29 11:20:21 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.0 +publishVersion=15.2.1 buildCount=0 -baseBetaVersion=15.2.1 +baseBetaVersion=15.2.2 diff --git a/libappbase/build.properties b/libappbase/build.properties index cfd7c17..435ff5e 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:25 HKT 2025 -stageCount=1 +#Sat Mar 29 11:20:21 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.0 +publishVersion=15.2.1 buildCount=0 -baseBetaVersion=15.2.1 +baseBetaVersion=15.2.2 From 721a4034dd2f87fae95ba5cb210bb06778b844d1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:20:41 +0800 Subject: [PATCH 4/8] Library Release 15.2.1 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 435ff5e..c6c141d 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:21 HKT 2025 +#Sat Mar 29 11:20:34 HKT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.2 From 9b882d14ab3fc785f7712f626a9d31d81e634ec5 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:27:54 +0800 Subject: [PATCH 5/8] APK 15.2.2 release Publish. --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 07b06d7..e5371fa 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:34 HKT 2025 -stageCount=2 +#Sat Mar 29 11:27:54 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.1 +publishVersion=15.2.2 buildCount=0 -baseBetaVersion=15.2.2 \ No newline at end of file +baseBetaVersion=15.2.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index 488af65..e5371fa 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:21 HKT 2025 -stageCount=2 +#Sat Mar 29 11:27:54 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.1 +publishVersion=15.2.2 buildCount=0 -baseBetaVersion=15.2.2 \ No newline at end of file +baseBetaVersion=15.2.3 From b0e53d169108eceb7535e80c1794472c4496c643 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:28:08 +0800 Subject: [PATCH 6/8] Library Release 15.2.2 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index e5371fa..8a2d4b2 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:27:54 HKT 2025 +#Sat Mar 29 11:28:02 HKT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.2 From ec107dfebf387c8912c14eb884dd76ae339530d2 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 12:29:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E7=B1=BB=E5=BA=93=E5=BC=95=E7=94=A8=E6=AC=A1=E5=BA=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidxdemo/build.gradle | 7 ++++--- androidxdemo/build.properties | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle index 4b7522e..bafc5cf 100644 --- a/androidxdemo/build.gradle +++ b/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:libapputils:15.0.11' + api 'cc.winboll.studio:libaes:15.2.1' + api 'cc.winboll.studio:libapputils:15.2.1' + api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties index de51361..887dea4 100644 --- a/androidxdemo/build.properties +++ b/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 From 2870ca911c0386cf25452efd6b73bfd9e643b675 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 12:37:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 6 +++--- androiddemo/build.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index 0aaf2e6..1ac4156 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "cc.winboll.studio.androiddemo" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 29 versionCode 1 // versionName 更新后需要手动设置 @@ -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.0.11' + api 'cc.winboll.studio:libapputils:15.2.1' + api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index f6428e1..ab0ea42 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 06:28:08 GMT 2025 +#Sat Mar 29 04:34:14 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=13 +buildCount=15 baseBetaVersion=15.0.1