From e71e5a852d6aabccdb0804df352e1335db5855ea Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:48:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=9F=BA=E7=B1=BB=E4=B8=BA=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84AppCompatActivity=E7=89=B9=E6=80=A7?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- .../java/cc/winboll/studio/appbase/MainActivity.java | 1 - .../winboll/studio/appbase}/WinBollActivityBase.java | 11 +++++------ .../studio/appbase/activities/New2Activity.java | 2 +- .../studio/appbase/activities/NewActivity.java | 2 +- libappbase/build.gradle | 5 +++-- libappbase/build.properties | 4 ++-- 7 files changed, 14 insertions(+), 15 deletions(-) rename {libappbase/src/main/java/cc/winboll/studio/libappbase/winboll => appbase/src/main/java/cc/winboll/studio/appbase}/WinBollActivityBase.java (83%) diff --git a/appbase/build.properties b/appbase/build.properties index 260550b..cca1578 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 14:53:30 HKT 2025 +#Fri Mar 28 07:42:10 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.1 -buildCount=0 +buildCount=10 baseBetaVersion=15.1.2 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 ae2bee2..70879b0 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -22,7 +22,6 @@ import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class MainActivity extends WinBollActivityBase implements IWinBollActivity { diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java similarity index 83% rename from libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java rename to appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java index 1268360..7b06865 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java @@ -1,18 +1,17 @@ -package cc.winboll.studio.libappbase.winboll; +package cc.winboll.studio.appbase; /** * @Author ZhanGSKen@AliYun.Com - * @Date 2025/03/28 13:35:28 - * @Describe WinBoll应用窗口基类 + * @Date 2025/03/28 15:34:16 + * @Describe 应用活动窗口基类 */ import android.app.Activity; -import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; -import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.R; +import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java index fbb9b72..d27d5af 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -12,9 +12,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; +import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class New2Activity extends WinBollActivityBase implements IWinBollActivity { diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java index 9bc8286..3df29e6 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java @@ -11,9 +11,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; +import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class NewActivity extends WinBollActivityBase implements IWinBollActivity { diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 3970a30..2071132 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -26,10 +26,11 @@ dependencies { // 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", 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' // 保留原有依赖（可选） + //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 diff --git a/libappbase/build.properties b/libappbase/build.properties index 4f21673..cca1578 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 14:53:11 HKT 2025 +#Fri Mar 28 07:42:10 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.1 -buildCount=0 +buildCount=10 baseBetaVersion=15.1.2 From e35a6b9a7fe6ade569a9a071618406b4ca7da284 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:50:14 +0800 Subject: [PATCH 2/3] APK 15.1.2 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index cca1578..fa4417b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 07:42:10 GMT 2025 -stageCount=2 +#Fri Mar 28 15:50:14 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.1 -buildCount=10 -baseBetaVersion=15.1.2 +publishVersion=15.1.2 +buildCount=0 +baseBetaVersion=15.1.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index cca1578..fa4417b 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 07:42:10 GMT 2025 -stageCount=2 +#Fri Mar 28 15:50:14 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.1 -buildCount=10 -baseBetaVersion=15.1.2 +publishVersion=15.1.2 +buildCount=0 +baseBetaVersion=15.1.3 From 2f6e297babc034896062c44530147c779edbd946 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:50:29 +0800 Subject: [PATCH 3/3] Library Release 15.1.2 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index fa4417b..07e959b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 15:50:14 HKT 2025 +#Fri Mar 28 15:50:23 HKT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.1