<winboll>APK 15.20.1 release Publish.

- winboll/build.gradle: 移除重复的 okhttp:3.14.9 和 gson:2.8.5 依赖
- libwinboll/build.gradle: 新增 compileOptions 强制 Java 7 编译
- AndroidManifest.xml: 移除重复的 GET_PACKAGE_SIZE 权限声明

libwinboll/build.gradle

@@ -12,6 +12,10 @@ android {
         minSdkVersion 26
         targetSdkVersion 30
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -31,8 +35,8 @@ dependencies {
 	api 'com.jcraft:jsch:0.1.54'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.2'
-    api 'cc.winboll.studio:libappbase:15.15.11'
-
+	api 'cc.winboll.studio:libaes:15.20.3'
+    api 'cc.winboll.studio:libappbase:15.20.9'
+	
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

libwinboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 09 19:01:46 GMT 2026
-stageCount=27
+#Wed May 13 10:28:36 HKT 2026
+stageCount=2
 libraryProject=libwinboll
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=29
-baseBetaVersion=15.11.27
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=0
+baseBetaVersion=15.20.2

winboll/build.gradle

@@ -31,7 +31,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
+        versionName "15.20"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -51,7 +51,6 @@ android {
 
 dependencies {
 	api project(':libwinboll')
-    
     api 'com.google.code.gson:gson:2.10.1'
 	
 	// 下拉控件
@@ -68,8 +67,6 @@ dependencies {
     api 'io.github.medyo:android-about-page:2.0.0'
 	// 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
-	// OkHttp网络请求
-     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
      // FastJSON解析
      implementation 'com.alibaba:fastjson:1.2.76'
     
@@ -87,7 +84,6 @@ dependencies {
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
     api 'com.github.bumptech.glide:glide:4.9.0'
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 
@@ -108,13 +104,5 @@ dependencies {
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
 	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.2'
-    api 'cc.winboll.studio:libappbase:15.15.11'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
-	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat May 09 19:01:46 GMT 2026
-stageCount=27
+#Wed May 13 10:28:36 HKT 2026
+stageCount=2
 libraryProject=libwinboll
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=29
-baseBetaVersion=15.11.27
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=0
+baseBetaVersion=15.20.2

winboll/src/main/AndroidManifest.xml

@@ -15,14 +15,13 @@
     <uses-permission android:name="android.permission.REORDER_TASKS"/>
 
     <!-- 计算应用存储空间 -->
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+    <uses-permission
+        android:name="android.permission.GET_PACKAGE_SIZE"/>
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission"/>
 
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java

@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
@@ -36,19 +37,17 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
         super.onCreate(savedInstanceState);
-        // ------------------- 新增：初始化MainActivity的Handler（关键） -------------------
         initMainHandler();
-
         if (mBrowserFragment == null) {
-			LogUtils.d(TAG, "The code in this line is not fix yet.");
-//            String externalUrl = extractExternalUrl(getIntent());
-//            if (externalUrl != null) {
-//                mBrowserFragment = BrowserFragment.newInstance(externalUrl);
-//            } else {
-//                mBrowserFragment = new BrowserFragment();
-//            }
-//            addFragment(mBrowserFragment);
+            String externalUrl = extractExternalUrl(getIntent());
+            if (externalUrl != null) {
+                mBrowserFragment = BrowserFragment.newInstance(externalUrl);
+            } else {
+                mBrowserFragment = BrowserFragment.newInstance();
+            }
+            addFragment(mBrowserFragment);
         }
         showFragment(mBrowserFragment);
     }
@@ -171,36 +170,35 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-		if (nItemId == R.id.item_home) {
-			// 发送MSG_HOMEPAGE消息给BrowserFragment
-			if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
-				Message msg = Message.obtain();
-				msg.what = BrowserFragment.MSG_HOMEPAGE;
-				mBrowserFragment.getBrowserHandler().sendMessage(msg);
-			}
-		} else if (nItemId == R.id.item_settings) {
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
-        } else if (nItemId == R.id.item_about) {
-			Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
-
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
-        } else if (nItemId == R.id.item_mytermux) {
-			Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
-			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			startActivity(intent);
-        } else if (nItemId == R.id.item_termux_env_test) {
-			Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
-
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
-        } else if (nItemId == R.id.item_library_activity) {
-			Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
-
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
         } else {
-			return super.onOptionsItemSelected(item);
-		}
-
+            int nItemId = item.getItemId();
+            if (nItemId == R.id.item_home) {
+                if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+                    Message msg = Message.obtain();
+                    msg.what = BrowserFragment.MSG_HOMEPAGE;
+                    mBrowserFragment.getBrowserHandler().sendMessage(msg);
+                }
+            } else if (nItemId == R.id.item_settings) {
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
+            } else if (nItemId == R.id.item_about) {
+                Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_mytermux) {
+                Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            } else if (nItemId == R.id.item_termux_env_test) {
+                Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_library_activity) {
+                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else {
+                return super.onOptionsItemSelected(item);
+            }
+        }
         return true;
     }
 

winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java

@@ -5,8 +5,8 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.theme.WinBoLLThemeUtil;
 
 /**
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
@@ -29,16 +29,11 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I
     }
 
     AESThemeBean.ThemeType getThemeType() {
-        /*SharedPreferences sharedPreferences = getSharedPreferences(
-         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
-         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
-         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        return WinBoLLThemeUtil.getThemeStyleType(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        setTheme(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     @Override

winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeBean.java

@@ -0,0 +1,49 @@
+package cc.winboll.studio.winboll.theme;
+
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.winboll.R;
+
+public class WinBoLLThemeBean {
+
+    public static final String TAG = "WinBoLLThemeBean";
+
+    public static int getDefaultThemeStyleID() {
+        return R.style.MyAppTheme;
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        int themeStyleID = getDefaultThemeStyleID();
+        if (AESThemeBean.ThemeType.DEPTH == themeType) {
+            themeStyleID = R.style.MyDepthAppTheme;
+        } else if (AESThemeBean.ThemeType.SKY == themeType) {
+            themeStyleID = R.style.MySkyAppTheme;
+        } else if (AESThemeBean.ThemeType.GOLDEN == themeType) {
+            themeStyleID = R.style.MyGoldenAppTheme;
+        } else if (AESThemeBean.ThemeType.BEARING == themeType) {
+            themeStyleID = R.style.MyBearingAppTheme;
+        } else if (AESThemeBean.ThemeType.MEMOR == themeType) {
+            themeStyleID = R.style.MyMemorAppTheme;
+        } else if (AESThemeBean.ThemeType.TAO == themeType) {
+            themeStyleID = R.style.MyTaoAppTheme;
+        }
+        return themeStyleID;
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
+        if (R.style.MyDepthAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.DEPTH;
+        } else if (R.style.MySkyAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.SKY;
+        } else if (R.style.MyGoldenAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.GOLDEN;
+        } else if (R.style.MyBearingAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.BEARING;
+        } else if (R.style.MyMemorAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.MEMOR;
+        } else if (R.style.MyTaoAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.TAO;
+        }
+        return themeStyle;
+    }
+}

winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeUtil.java

@@ -0,0 +1,36 @@
+package cc.winboll.studio.winboll.theme;
+
+import android.content.Context;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+
+public class WinBoLLThemeUtil {
+
+    public static final String TAG = "WinBoLLThemeUtil";
+
+    public static int getThemeTypeID(Context context) {
+        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
+        int themeTypeID;
+        if (bean == null) {
+            themeTypeID = WinBoLLThemeBean.getDefaultThemeStyleID();
+        } else {
+            int aesStyleID = bean.getCurrentThemeTypeID();
+            AESThemeBean.ThemeType themeType = WinBoLLThemeBean.getThemeStyleType(aesStyleID);
+            themeTypeID = WinBoLLThemeBean.getThemeStyleID(themeType);
+        }
+        return themeTypeID;
+    }
+
+    public static void saveThemeStyleID(Context context, int nThemeTypeID) {
+        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
+        AESThemeBean.saveBean(context, bean);
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        return WinBoLLThemeBean.getThemeStyleType(nThemeStyleID);
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        return WinBoLLThemeBean.getThemeStyleID(themeType);
+    }
+}

winboll/src/main/res/values/colors.xml

@@ -4,4 +4,10 @@
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
     <color name="pattern_lock_black">#000000</color>
+
+    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="toolbarTextColor">#FF000000</color>
+    <color name="toolbarBackgroundColor">#FF00B322</color>
+    <color name="debugTextColor">#FF808080</color>
 </resources>

winboll/src/main/res/values/styles.xml

@@ -1,5 +1,57 @@
 <resources>
-	<style name="MyAppTheme" parent="AESTheme">
+    <style name="MyAppTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyDepthAppTheme" parent="DepthAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MySkyAppTheme" parent="SkyAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyGoldenAppTheme" parent="GoldenAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyBearingAppTheme" parent="BearingAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyMemorAppTheme" parent="MemorAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyTaoAppTheme" parent="TaoAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyAESAToolbar" parent="AESAToolbar" />
+
+    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
-	
 </resources>