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-05-13 11:52:11 +08:00
commit 5c7437b19c
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aes/build.gradle
View File

@ -29,7 +29,7 @@ android {
// versionName 更新后需要手动设置 // versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0 // 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.6" versionName "15.8"
if(true) { if(true) {
versionName = genVersionName("${versionName}") versionName = genVersionName("${versionName}")
} }

10
aes/build.properties
View File

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

5
libaes/build.gradle
View File

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

10
libaes/build.properties
View File

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

4
libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java
View File

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