From 4bf74875ab8f18ffc5af4443de383248bdfb8b09 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 7 Dec 2025 02:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=B8=8E=E4=BB=8B=E7=BB=8D=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/README.md | 34 ++++++ winboll/build.gradle | 2 +- winboll/build.properties | 4 +- .../java/cc/winboll/studio/winboll/App.java | 2 +- .../winboll/studio/winboll/MainActivity.java | 39 +++++-- .../winboll/activities/AboutActivity.java | 103 ------------------ .../src/main/res/layout/activity_about.xml | 11 -- 7 files changed, 69 insertions(+), 126 deletions(-) create mode 100644 winboll/README.md delete mode 100644 winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java delete mode 100644 winboll/src/main/res/layout/activity_about.xml diff --git a/winboll/README.md b/winboll/README.md new file mode 100644 index 0000000..2de1c76 --- /dev/null +++ b/winboll/README.md @@ -0,0 +1,34 @@ +# WinBoLL + +#### 介绍 +WinBoLL 网站浏览器。 + +#### 软件架构 +适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。 +也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。 + + +#### Gradle 编译说明 +调试版编译命令 ：gradle assembleBetaDebug +阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh winboll + +#### 使用说明 + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 : ZhanGSKen(ZhanGSKen) +4. 新建 Pull Request + + +#### 特技 + +1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md +2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) +3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 +4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 +5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) +6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) + +#### 参考文档 diff --git a/winboll/build.gradle b/winboll/build.gradle index 6561ae4..548cc8b 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -86,7 +86,7 @@ dependencies { //api 'cc.winboll.studio:libappbase:15.12.2' // WinBoLL备用库 jitpack.io 地址 - api 'com.github.ZhanGSKen:AES:aes-v15.12.0' + api 'com.github.ZhanGSKen:AES:aes-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 a602de9..861bb08 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Dec 06 10:44:48 GMT 2025 +#Sat Dec 06 18:16:28 GMT 2025 stageCount=6 libraryProject= baseVersion=15.11 publishVersion=15.11.5 -buildCount=30 +buildCount=39 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 9bfaab0..024a65b 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/App.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/App.java @@ -59,7 +59,7 @@ public class App extends GlobalApplication { public void onCreate() { super.onCreate(); setIsDebugging(BuildConfig.DEBUG); - //setIsDebugging(false); + setIsDebugging(false); WinBoLLActivityManager.init(this); 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 b957911..f83140f 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -9,16 +9,18 @@ import android.view.View; import android.widget.AdapterView; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.models.APPInfo; import cc.winboll.studio.libaes.models.DrawerMenuBean; import cc.winboll.studio.libaes.unittests.TestAButtonFragment; import cc.winboll.studio.libaes.unittests.TestViewPageFragment; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.winboll.R; -import cc.winboll.studio.winboll.activities.AboutActivity; import cc.winboll.studio.winboll.activities.SettingsActivity; import cc.winboll.studio.winboll.fragments.BrowserFragment; import java.util.ArrayList; +import android.content.Intent; +import cc.winboll.studio.libaes.activitys.AboutActivity; public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity { @@ -98,7 +100,7 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi @Override public boolean onOptionsItemSelected(MenuItem item) { int nItemId = item.getItemId(); - if(item.getItemId() == R.id.item_home) { + if(nItemId == R.id.item_home) { // 关键：获取BrowserFragment的Handler if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) { // 创建消息（Java 7 显式创建Message） @@ -107,15 +109,36 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi // 发送消息（可携带数据，如msg.obj = "额外参数";） mBrowserFragment.getBrowserHandler().sendMessage(msg); } - }if (item.getItemId() == R.id.item_settings) { + } else if (nItemId == R.id.item_settings) { WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class); - } else if (nItemId == R.id.item_about) { - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), AboutActivity.class); - return true; - } + } else if (nItemId == cc.winboll.studio.libaes.R.id.item_about) { + Intent intent = new Intent(getApplicationContext(), AboutActivity.class); + APPInfo appInfo = genDefaultAPPInfo(); + intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo); + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); + } else { + return super.onOptionsItemSelected(item); + } - return super.onOptionsItemSelected(item); + return true; } + APPInfo genDefaultAPPInfo() { + String szBranchName = "winboll"; + APPInfo appInfo = new APPInfo(); + appInfo.setAppName("WinBoLL"); + appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); + appInfo.setAppDescription("WinBoLL 网站浏览器。"); + appInfo.setAppGitName("WinBoLL"); + appInfo.setAppGitOwner("Studio"); + appInfo.setAppGitAPPBranch(szBranchName); + appInfo.setAppGitAPPSubProjectFolder(szBranchName); + appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=WinBoLL"); + appInfo.setAppAPKName("WinBoLL"); + appInfo.setAppAPKFolderName("WinBoLL"); + //appInfo.setIsAddDebugTools(false); + //appInfo.setIsAddDebugTools(BuildConfig.DEBUG); + return appInfo; + } } diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java deleted file mode 100644 index 69182bc..0000000 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java +++ /dev/null @@ -1,103 +0,0 @@ -package cc.winboll.studio.winboll.activities; - -/** - * @Author ZhanGSKen&豆包大模型 - * @Date 2025/09/29 13:30 - * @Describe 应用介绍窗口 - */ -import android.content.Context; -import android.os.Bundle; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.winboll.BuildConfig; -import cc.winboll.studio.winboll.R; - -import android.app.Activity; -import android.content.Context; -import android.os.Bundle; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; -import cc.winboll.studio.libaes.models.APPInfo; -import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; -import cc.winboll.studio.libaes.views.AboutView; - -public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { - - public static final String TAG = "AboutActivity"; - - Context mContext; - Toolbar mToolbar; - - @Override - public Activity getActivity() { - return this; - } - - @Override - public String getTag() { - return TAG; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mContext = this; - setContentView(R.layout.activity_about); - - mToolbar = findViewById(R.id.toolbar); - setSupportActionBar(mToolbar); - mToolbar.setSubtitle(TAG); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - AboutView aboutView = CreateAboutView(); - // 在 Activity 的 onCreate 或其他生命周期方法中调用 -// LinearLayout layout = new LinearLayout(this); -// layout.setOrientation(LinearLayout.VERTICAL); -// // 创建布局参数（宽度和高度） -// ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( -// ViewGroup.LayoutParams.MATCH_PARENT, -// ViewGroup.LayoutParams.MATCH_PARENT -// ); -// addContentView(aboutView, params); - - LinearLayout layout = findViewById(R.id.aboutviewroot_ll); - // 创建布局参数（宽度和高度） - ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT - ); - layout.addView(aboutView, params); - - WinBoLLActivityManager.getInstance().add(this); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - WinBoLLActivityManager.getInstance().registeRemove(this); - } - - - - public AboutView CreateAboutView() { - String szBranchName = "winboll"; - APPInfo appInfo = new APPInfo(); - appInfo.setAppName("WinBoLL"); - appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); - appInfo.setAppDescription("WinBoLL Description"); - appInfo.setAppGitName("APPBase"); - appInfo.setAppGitOwner("Studio"); - appInfo.setAppGitAPPBranch(szBranchName); - appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=3&extra=page%3D1"); - appInfo.setAppAPKName("WinBoLL"); - appInfo.setAppAPKFolderName("WinBoLL"); - //appInfo.setIsAddDebugTools(false); - //appInfo.setIsAddDebugTools(BuildConfig.DEBUG); - return new AboutView(mContext, appInfo); - } -} diff --git a/winboll/src/main/res/layout/activity_about.xml b/winboll/src/main/res/layout/activity_about.xml deleted file mode 100644 index b79821b..0000000 --- a/winboll/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -