From edf9d07e589e9e8611c412babd0e4247c126249d Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 6 Dec 2025 15:02:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=BA=90=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/winboll/studio/winboll/MainActivity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 8f1d985..b957911 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -77,9 +77,6 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi @Override public boolean onCreateOptionsMenu(Menu 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); } @@ -112,8 +109,6 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi } }if (item.getItemId() == R.id.item_settings) { 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) { WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), AboutActivity.class); return true; From 382f8c3412a421419e2fdcec19526937a1c0eff1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 6 Dec 2025 15:03:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95WinBoLL=E5=BA=93=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.gradle | 5 ++++- winboll/build.properties | 4 ++-- winboll/src/main/java/cc/winboll/studio/winboll/App.java | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winboll/build.gradle b/winboll/build.gradle index e2bf3f3..079bf41 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -82,7 +82,10 @@ dependencies { //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' 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.1' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/winboll/build.properties b/winboll/build.properties index b17d64c..9eb0c07 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Dec 05 12:58:53 GMT 2025 +#Sat Dec 06 07:01:39 GMT 2025 stageCount=6 libraryProject= baseVersion=15.11 publishVersion=15.11.5 -buildCount=20 +buildCount=24 baseBetaVersion=15.11.6 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/App.java b/winboll/src/main/java/cc/winboll/studio/winboll/App.java index 59bcea2..9bfaab0 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/App.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/App.java @@ -59,6 +59,7 @@ public class App extends GlobalApplication { public void onCreate() { super.onCreate(); setIsDebugging(BuildConfig.DEBUG); + //setIsDebugging(false); WinBoLLActivityManager.init(this); From 00142a0b05cc11dca16ecf8caf3c9825e596ddc3 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 6 Dec 2025 15:17:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?jitpack.io=20=E5=BA=93=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.gradle | 4 ++-- winboll/build.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/winboll/build.gradle b/winboll/build.gradle index 079bf41..c56b2cc 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -83,9 +83,9 @@ dependencies { api 'cc.winboll.studio:libaes:15.11.8' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.12.2' + //api 'cc.winboll.studio:libappbase:15.12.2' // 备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.1' + api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/winboll/build.properties b/winboll/build.properties index 9eb0c07..c60c562 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Dec 06 07:01:39 GMT 2025 +#Sat Dec 06 07:15:29 GMT 2025 stageCount=6 libraryProject= baseVersion=15.11 publishVersion=15.11.5 -buildCount=24 +buildCount=25 baseBetaVersion=15.11.6 From 0180b3225cb0304bebc742c08fba06788b8d0867 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 6 Dec 2025 15:19:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=B1=BB=E5=BA=93=E5=A4=96=E6=94=BE=E7=BC=96=E8=AF=91=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .winboll/winboll_app_build.gradle | 43 +++++++++++++++++++------------ 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/.winboll/winboll_app_build.gradle b/.winboll/winboll_app_build.gradle index 54b28ba..9c932b8 100644 --- a/.winboll/winboll_app_build.gradle +++ b/.winboll/winboll_app_build.gradle @@ -4,8 +4,9 @@ android { def winbollProps = new Properties() def winbollPropsFile = rootProject.file("${winbollFilePath}") - assert(winbollPropsFile.exists()) - winbollProps.load(new FileInputStream(winbollPropsFile)) + if(winbollPropsFile.exists()) { + winbollProps.load(new FileInputStream(winbollPropsFile)) + } // 读取秘钥配置文件 // @@ -14,28 +15,36 @@ android { //println 'Test keystore path' //println 'KeyProsFile :' + Boolean.toString(keyPropsFile.exists()) //assert(false) - assert(keyPropsFile.exists()) - keyProps.load(new FileInputStream(keyPropsFile)) + if(keyPropsFile.exists()) { + keyProps.load(new FileInputStream(keyPropsFile)) + } // 配置签名 signingConfigs { - winboll { - assert(keyProps['keyAlias'] != null && keyProps['keyPassword'] != null && keyProps['storeFile'] != null && keyProps['storePassword'] != null) - keyAlias keyProps['keyAlias'] - keyPassword keyProps['keyPassword'] - storeFile keyProps['storeFile'] ? file(keyProps['storeFile']) : null - storePassword keyProps['storePassword'] - } + if(keyPropsFile.exists()) { + winboll { + assert(keyProps['keyAlias'] != null && keyProps['keyPassword'] != null && keyProps['storeFile'] != null && keyProps['storePassword'] != null) + keyAlias keyProps['keyAlias'] + keyPassword keyProps['keyPassword'] + storeFile keyProps['storeFile'] ? file(keyProps['storeFile']) : null + storePassword keyProps['storePassword'] + } + } } buildTypes { debug { - signingConfig signingConfigs.winboll + if(keyPropsFile.exists()) { + signingConfig signingConfigs.winboll + } } release { - signingConfig signingConfigs.winboll - minifyEnabled true // 开启混淆（核心开关） - shrinkResources true // 可选：移除无用资源（进一步减小体积） - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), // 官方默认规则（优化版） + if(keyPropsFile.exists()) { + signingConfig signingConfigs.winboll + } + + minifyEnabled true // 开启混淆（核心开关） + shrinkResources true // 可选：移除无用资源（进一步减小体积） + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), // 官方默认规则（优化版） 'proguard-rules.pro' // 自定义规则文件 } @@ -298,7 +307,7 @@ android { // 如果配置了APK额外输出路径，就复制一份拷贝到额外路径。 // - if(winbollProps['ExtraAPKOutputPath'] != null ) { + if(winbollProps != null && winbollProps['ExtraAPKOutputPath'] != null ) { File apkFile = new File(winbollProps['ExtraAPKOutputPath']) File outCommonDir = apkFile.getParentFile(); String commandAPKName = apkFile.getName();