From 7abe0967799a5c655d531408e96c25e2e8c2a333 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 11:11:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 ++-- .../studio/apputils/WinBollActivityBase.java | 3 +-- libapputils/build.gradle | 23 +------------------ libapputils/build.properties | 4 ++-- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index 4fad09f..fbf5fd6 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 12:14:55 HKT 2025 +#Sun Apr 27 03:10:03 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=15.2 publishVersion=15.2.1 -buildCount=0 +buildCount=3 baseBetaVersion=15.2.2 diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java b/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java index 1e2e8cf..ff6e426 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java @@ -8,12 +8,11 @@ package cc.winboll.studio.apputils; import android.app.Activity; import android.os.Bundle; import android.os.PersistableBundle; -import android.support.v7.app.AppCompatActivity; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; -public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { +public class WinBollActivityBase extends Activity implements IWinBollActivity { public static final String TAG = "WinBollActivityBase"; diff --git a/libapputils/build.gradle b/libapputils/build.gradle index 2cfc4fb..733822b 100644 --- a/libapputils/build.gradle +++ b/libapputils/build.gradle @@ -21,28 +21,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - // Android 类库 - //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" - exclude group: "com.android.support:animated-vector-drawable:28.0.0" - } - // 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 - api 'com.android.support:support-v4:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-media-compat - api 'com.android.support:support-media-compat:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-utils - api 'com.android.support:support-core-utils:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-core-ui - api 'com.android.support:support-core-ui:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/support-fragment - api 'com.android.support:support-fragment:28.0.0' - // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 - api 'com.android.support:recyclerview-v7:28.0.0' - - api 'cc.winboll.studio:libappbase:15.2.0' + api 'cc.winboll.studio:libappbase:15.4.8' // 二维码类库 api 'com.google.zxing:core:3.4.1' diff --git a/libapputils/build.properties b/libapputils/build.properties index 231733d..fbf5fd6 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 12:14:39 HKT 2025 +#Sun Apr 27 03:10:03 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=15.2 publishVersion=15.2.1 -buildCount=0 +buildCount=3 baseBetaVersion=15.2.2 From e572486b05d68575f7b9fcd5c9bdde228f69bb11 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 11:17:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.gradle | 2 +- apputils/build.properties | 12 ++++++------ libapputils/build.properties | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apputils/build.gradle b/apputils/build.gradle index ce30b57..2d076ce 100644 --- a/apputils/build.gradle +++ b/apputils/build.gradle @@ -29,7 +29,7 @@ android { // versionName 更新后需要手动设置 // 项目模块目录的 build.gradle 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.2" + versionName "15.3" if(true) { versionName = genVersionName("${versionName}") } diff --git a/apputils/build.properties b/apputils/build.properties index fbf5fd6..b56c26f 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 03:10:03 GMT 2025 -stageCount=2 +#Sun Apr 27 03:16:53 GMT 2025 +stageCount=0 libraryProject=libapputils -baseVersion=15.2 -publishVersion=15.2.1 -buildCount=3 -baseBetaVersion=15.2.2 +baseVersion=15.3 +publishVersion=15.3.0 +buildCount=1 +baseBetaVersion=15.3.1 diff --git a/libapputils/build.properties b/libapputils/build.properties index fbf5fd6..b56c26f 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 03:10:03 GMT 2025 -stageCount=2 +#Sun Apr 27 03:16:53 GMT 2025 +stageCount=0 libraryProject=libapputils -baseVersion=15.2 -publishVersion=15.2.1 -buildCount=3 -baseBetaVersion=15.2.2 +baseVersion=15.3 +publishVersion=15.3.0 +buildCount=1 +baseBetaVersion=15.3.1 From 9eec7060b98607c53f46ab1cd3b7db55a6f72975 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 11:19:49 +0800 Subject: [PATCH 3/7] APK 15.3.0 release Publish. --- apputils/build.properties | 6 +++--- libapputils/build.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index b56c26f..7147bf5 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 03:16:53 GMT 2025 -stageCount=0 +#Sun Apr 27 11:19:49 HKT 2025 +stageCount=1 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.0 -buildCount=1 +buildCount=0 baseBetaVersion=15.3.1 diff --git a/libapputils/build.properties b/libapputils/build.properties index b56c26f..7147bf5 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 03:16:53 GMT 2025 -stageCount=0 +#Sun Apr 27 11:19:49 HKT 2025 +stageCount=1 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.0 -buildCount=1 +buildCount=0 baseBetaVersion=15.3.1 From b68d8a58e367161efe6e2ec84f369521adefd34c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 11:20:08 +0800 Subject: [PATCH 4/7] Library Release 15.3.0 --- apputils/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apputils/build.properties b/apputils/build.properties index 7147bf5..4686765 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 11:19:49 HKT 2025 +#Sun Apr 27 11:20:04 HKT 2025 stageCount=1 libraryProject=libapputils baseVersion=15.3 From 18b078c644fa5f535a4dd7a1d6c3c894cdf947ec Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 13:41:49 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=8EAppCompatActivity=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E4=B8=80=E6=A0=B7=EF=BC=8C=E7=B1=BB=E7=BB=A7=E6=89=BF?= =?UTF-8?q?=E5=B1=82=E6=95=B0=E4=B8=8D=E8=83=BD=E6=98=AF=E4=B8=A4=E5=B1=82?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 ++-- libapputils/build.properties | 4 ++-- libapputils/src/main/res/values/styles.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index 4686765..0f6fcf5 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 11:20:04 HKT 2025 +#Sun Apr 27 05:39:12 GMT 2025 stageCount=1 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.0 -buildCount=0 +buildCount=1 baseBetaVersion=15.3.1 diff --git a/libapputils/build.properties b/libapputils/build.properties index 7147bf5..0f6fcf5 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 11:19:49 HKT 2025 +#Sun Apr 27 05:39:12 GMT 2025 stageCount=1 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.0 -buildCount=0 +buildCount=1 baseBetaVersion=15.3.1 diff --git a/libapputils/src/main/res/values/styles.xml b/libapputils/src/main/res/values/styles.xml index 1267e30..3d01eb2 100644 --- a/libapputils/src/main/res/values/styles.xml +++ b/libapputils/src/main/res/values/styles.xml @@ -1,5 +1,5 @@ - From ef9c0f08aedbc891beb16431edf068901fb3cf48 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 13:42:46 +0800 Subject: [PATCH 6/7] APK 15.3.1 release Publish. --- apputils/build.properties | 10 +++++----- libapputils/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index 0f6fcf5..94aa017 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 05:39:12 GMT 2025 -stageCount=1 +#Sun Apr 27 13:42:46 HKT 2025 +stageCount=2 libraryProject=libapputils baseVersion=15.3 -publishVersion=15.3.0 -buildCount=1 -baseBetaVersion=15.3.1 +publishVersion=15.3.1 +buildCount=0 +baseBetaVersion=15.3.2 diff --git a/libapputils/build.properties b/libapputils/build.properties index 0f6fcf5..94aa017 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 05:39:12 GMT 2025 -stageCount=1 +#Sun Apr 27 13:42:46 HKT 2025 +stageCount=2 libraryProject=libapputils baseVersion=15.3 -publishVersion=15.3.0 -buildCount=1 -baseBetaVersion=15.3.1 +publishVersion=15.3.1 +buildCount=0 +baseBetaVersion=15.3.2 From 559d41e46c8222917038658c5dab5e6e3f5b9765 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 27 Apr 2025 13:42:58 +0800 Subject: [PATCH 7/7] Library Release 15.3.1 --- apputils/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apputils/build.properties b/apputils/build.properties index 94aa017..a1f57a0 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Apr 27 13:42:46 HKT 2025 +#Sun Apr 27 13:42:52 HKT 2025 stageCount=2 libraryProject=libapputils baseVersion=15.3