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

This commit is contained in:
ZhanGSKen 2025-05-13 11:52:11 +08:00
commit 5c7437b19c
5 changed files with 15 additions and 16 deletions

View File

@ -29,7 +29,7 @@ android {
// versionName
// build.gradle stageCount=0
// Gradle编译环境下合起来的 versionName "${versionName}.0"
versionName "15.6"
versionName "15.8"
if(true) {
versionName = genVersionName("${versionName}")
}

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon May 12 18:10:35 HKT 2025
stageCount=4
#Tue May 13 11:22:39 HKT 2025
stageCount=1
libraryProject=libaes
baseVersion=15.6
publishVersion=15.6.3
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.6.4
baseBetaVersion=15.8.1

View File

@ -21,9 +21,8 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
//api 'cc.winboll.studio:libaes:15.6.0'
api 'cc.winboll.studio:libapputils:15.3.4'
api 'cc.winboll.studio:libappbase:15.7.6'
api 'cc.winboll.studio:libapputils:15.8.1'
api 'cc.winboll.studio:libappbase:15.8.0'
//
api 'com.github.getActivity:ToastUtils:10.5'

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon May 12 18:10:35 HKT 2025
stageCount=4
#Tue May 13 11:22:23 HKT 2025
stageCount=1
libraryProject=libaes
baseVersion=15.6
publishVersion=15.6.3
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.6.4
baseBetaVersion=15.8.1

View File

@ -176,8 +176,8 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
getString(i);
}
} else if (R.id.item_log == item.getItemId()) {
GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
// } else if (R.id.item_log == item.getItemId()) {
// GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
} else if (R.id.item_about == item.getItemId()) {
LogUtils.d(TAG, "onAbout");
} else if (android.R.id.home == item.getItemId()) {