From 6a6a6ad0517b512cd578ec35ea6671d7d7e0f957 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 14:37:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=90=8E=E9=80=80=E6=8C=89=E9=92=AE=E5=93=8D?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- .../java/cc/winboll/studio/aes/WinBollActivity.java | 10 ++++++++++ libaes/build.properties | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index e14ab66..4df6252 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 02:04:47 HKT 2025 +#Mon Mar 31 06:36:43 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.3 -buildCount=0 +buildCount=1 baseBetaVersion=15.2.4 diff --git a/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java b/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java index a57c782..a15318d 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java @@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity; import cc.winboll.studio.libaes.beans.AESThemeBean; import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import android.view.MenuItem; /** * @Author ZhanGSKen@AliYun.Com @@ -47,4 +48,13 @@ public class WinBollActivity extends AppCompatActivity implements IWinBollActivi //setTheme(AESThemeBean.getThemeStyle(getThemeType())); setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(item.getItemId() == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } } diff --git a/libaes/build.properties b/libaes/build.properties index 60a20e9..4df6252 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 02:04:35 HKT 2025 +#Mon Mar 31 06:36:43 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.3 -buildCount=0 +buildCount=1 baseBetaVersion=15.2.4 From 2f22b6602b5c797d021dc0c8dbf99e5e4236f2eb Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 19:39:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E4=BB=8B=E7=BB=8D=E9=A1=B5=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- libaes/build.gradle | 4 ++-- libaes/build.properties | 4 ++-- .../main/java/cc/winboll/studio/libaes/winboll/AboutView.java | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 4df6252..4ec04e0 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 06:36:43 GMT 2025 +#Mon Mar 31 11:38:07 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.3 -buildCount=1 +buildCount=2 baseBetaVersion=15.2.4 diff --git a/libaes/build.gradle b/libaes/build.gradle index 11d6484..b244eb7 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -51,6 +51,6 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' - api 'cc.winboll.studio:libappbase:15.2.0' - api 'cc.winboll.studio:libapputils:15.2.0' + api 'cc.winboll.studio:libapputils:15.2.1' + api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/libaes/build.properties b/libaes/build.properties index 4df6252..4ec04e0 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 06:36:43 GMT 2025 +#Mon Mar 31 11:38:07 GMT 2025 stageCount=4 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.3 -buildCount=1 +buildCount=2 baseBetaVersion=15.2.4 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java index 3628113..df61a6b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java @@ -282,6 +282,7 @@ public class AboutView extends LinearLayout { //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); GlobalApplication.setIsDebuging(true); + GlobalApplication.saveDebugStatus(); GlobalApplication.getWinBollActivityManager().finishAll(); context.startActivity(intent); @@ -293,6 +294,7 @@ public class AboutView extends LinearLayout { if (intent != null) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); GlobalApplication.setIsDebuging(false); + GlobalApplication.saveDebugStatus(); GlobalApplication.getWinBollActivityManager().finishAll(); context.startActivity(intent); From d65dc665a022e92788ae0a9961b1b361b8a50c0f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 19:41:08 +0800 Subject: [PATCH 3/4] APK 15.2.4 release Publish. --- aes/build.properties | 10 +++++----- libaes/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index 4ec04e0..c9094d5 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 11:38:07 GMT 2025 -stageCount=4 +#Mon Mar 31 19:41:08 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.3 -buildCount=2 -baseBetaVersion=15.2.4 +publishVersion=15.2.4 +buildCount=0 +baseBetaVersion=15.2.5 diff --git a/libaes/build.properties b/libaes/build.properties index 4ec04e0..c9094d5 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 11:38:07 GMT 2025 -stageCount=4 +#Mon Mar 31 19:41:08 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.3 -buildCount=2 -baseBetaVersion=15.2.4 +publishVersion=15.2.4 +buildCount=0 +baseBetaVersion=15.2.5 From 7fd10086eb324728da099ffb46bf8fb298c219bc Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 19:41:27 +0800 Subject: [PATCH 4/4] Library Release 15.2.4 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index c9094d5..d6ef5e0 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 19:41:08 HKT 2025 +#Mon Mar 31 19:41:19 HKT 2025 stageCount=5 libraryProject=libaes baseVersion=15.2