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

Merge branch 'winboll' into merge

Browse Source
This commit is contained in:
ZhangShaojian
2025-12-06 15:22:51 +08:00
parent 34a6322f3d 0180b3225c
commit d505277f15
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winboll/build.gradle
View File

@@ -82,7 +82,10 @@ dependencies {
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
api 'cc.winboll.studio:libaes:15.11.8' api 'cc.winboll.studio:libaes:15.11.8'
api 'cc.winboll.studio:libappbase:15.11.6' // WinBoLL库 nexus.winboll.cc 地址
//api 'cc.winboll.studio:libappbase:15.12.2'
// 备用库 jitpack.io 地址
api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2'
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
} }

4
winboll/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Fri Dec 05 12:58:53 GMT 2025 #Sat Dec 06 07:15:29 GMT 2025
stageCount=6 stageCount=6
libraryProject= libraryProject=
baseVersion=15.11 baseVersion=15.11
publishVersion=15.11.5 publishVersion=15.11.5
buildCount=20 buildCount=25
baseBetaVersion=15.11.6 baseBetaVersion=15.11.6

1
winboll/src/main/java/cc/winboll/studio/winboll/App.java
View File

@@ -59,6 +59,7 @@ public class App extends GlobalApplication {
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
setIsDebugging(BuildConfig.DEBUG); setIsDebugging(BuildConfig.DEBUG);
//setIsDebugging(false);
WinBoLLActivityManager.init(this); WinBoLLActivityManager.init(this);

5
winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
View File

@@ -77,9 +77,6 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.toolbar_main, menu); getMenuInflater().inflate(R.menu.toolbar_main, menu);
// if (App.isDebugging()) {
// getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu);
// }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@@ -112,8 +109,6 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
} }
}if (item.getItemId() == R.id.item_settings) { }if (item.getItemId() == R.id.item_settings) {
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
} else if (item.getItemId() == R.id.item_log) {
WinBoLLActivityManager.getInstance().startLogActivity(getApplicationContext());
} else if (nItemId == R.id.item_about) { } else if (nItemId == R.id.item_about) {
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), AboutActivity.class); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), AboutActivity.class);
return true; return true;