Studio/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/aes' into appbase

Browse Source
This commit is contained in:
ZhanGSKen
2025-03-31 19:47:11 +08:00
parent c7677764a3 7fd10086eb
commit f13caa90ff
5 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
aes/build.properties
View File

@@ -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

10
aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java
View File

@@ -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);
}
}

4
libaes/build.gradle
View File

@@ -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'
}

8
libaes/build.properties
View File

@@ -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

2
libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java
View File

@@ -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);