diff --git a/aes/build.properties b/aes/build.properties index e14ab66..d6ef5e0 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 -stageCount=4 +#Mon Mar 31 19:41:19 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.3 +publishVersion=15.2.4 buildCount=0 -baseBetaVersion=15.2.4 +baseBetaVersion=15.2.5 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.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 60a20e9..c9094d5 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 -stageCount=4 +#Mon Mar 31 19:41:08 HKT 2025 +stageCount=5 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.3 +publishVersion=15.2.4 buildCount=0 -baseBetaVersion=15.2.4 +baseBetaVersion=15.2.5 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);