From fb9dd93162514e1714fb595f0e8fb0616b15c1fa Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 13 Jan 2026 12:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E8=B0=83=E6=95=B4=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E4=B8=8E=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.gradle | 8 +- winboll/build.properties | 4 +- .../winboll/studio/winboll/MainActivity.java | 11 ++- .../winboll/activities/AboutActivity.java | 80 +++++++++++++++++++ .../winboll/activities/WinBoLLActivity.java | 12 ++- .../src/main/res/layout/activity_about.xml | 23 ++++++ winboll/src/main/res/menu/toolbar_main.xml | 4 +- winboll/src/main/res/values/strings.xml | 1 + 8 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java create mode 100644 winboll/src/main/res/layout/activity_about.xml diff --git a/winboll/build.gradle b/winboll/build.gradle index 820fc34..aab15c5 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -90,12 +90,12 @@ dependencies { //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.12.13' - api 'cc.winboll.studio:libappbase:15.14.2' + api 'cc.winboll.studio:libaes:15.15.2' + api 'cc.winboll.studio:libappbase:15.15.4' // WinBoLL备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:AES:aes-v15.12.9' - //api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1' + //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' + //api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4' api fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/winboll/build.properties b/winboll/build.properties index f6c4c0f..2557da4 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 13 03:11:40 HKT 2026 +#Tue Jan 13 04:16:26 GMT 2026 stageCount=10 libraryProject= baseVersion=15.11 publishVersion=15.11.9 -buildCount=0 +buildCount=4 baseBetaVersion=15.11.10 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 935b86f..8f36bf1 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -8,13 +8,13 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; -import cc.winboll.studio.libaes.activitys.AboutActivity; import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libaes.models.APPInfo; import cc.winboll.studio.libaes.models.DrawerMenuBean; 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.activities.WXPayActivity; import cc.winboll.studio.winboll.fragments.BrowserFragment; @@ -24,7 +24,7 @@ public class MainActivity extends DrawerFragmentActivity { public static final String TAG = "MainActivity"; - + BrowserFragment mBrowserFragment; // ------------------- 新增：Handler 消息定义（接收URL历史更新消息） ------------------- @@ -45,6 +45,8 @@ public class MainActivity extends DrawerFragmentActivity { } showFragment(mBrowserFragment); } + + public static void sendMessage(Message msg) { _mMainHandler.sendMessage(msg); @@ -149,12 +151,9 @@ public class MainActivity extends DrawerFragmentActivity { } } else if (nItemId == R.id.item_settings) { WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class); - } else if (nItemId == R.id.item_wxpayactivity) { - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), WXPayActivity.class); - } else if (nItemId == cc.winboll.studio.libaes.R.id.item_about) { + } else if (nItemId == 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); 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 new file mode 100644 index 0000000..d5b76c8 --- /dev/null +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/AboutActivity.java @@ -0,0 +1,80 @@ +package cc.winboll.studio.winboll.activities; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.models.APPInfo; +import cc.winboll.studio.libappbase.views.AboutView; +import cc.winboll.studio.winboll.R; + +/** + * @Author 豆包&ZhanGSKen + * @Date 2026/01/13 11:54 + * @Describe 应用介绍窗口 + */ +public class AboutActivity extends WinBoLLActivity { + + public static final String TAG = "AboutActivity"; + private Toolbar mToolbar; + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_about); + + // 设置工具栏 + initToolbar(); + + AboutView aboutView = findViewById(R.id.aboutview); + aboutView.setAPPInfo(genDefaultAppInfo()); + } + + private void initToolbar() { + LogUtils.d(TAG, "initToolbar() 开始初始化"); + mToolbar = findViewById(R.id.toolbar); + if (mToolbar == null) { + LogUtils.e(TAG, "initToolbar() | Toolbar未找到"); + return; + } + setSupportActionBar(mToolbar); + mToolbar.setSubtitle(getTag()); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + mToolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + LogUtils.d(TAG, "导航栏 点击返回按钮"); + finish(); + } + }); + LogUtils.d(TAG, "initToolbar() 配置完成"); + } + + private APPInfo genDefaultAppInfo() { + LogUtils.d(TAG, "genDefaultAppInfo() 调用"); + String branchName = "winboll"; + APPInfo appInfo = new APPInfo(); + appInfo.setAppName(getString(R.string.app_name)); + appInfo.setAppIcon(R.drawable.ic_winboll); + appInfo.setAppDescription(getString(R.string.app_description)); + appInfo.setAppGitName("WinBoLL"); + appInfo.setAppGitOwner("Studio"); + appInfo.setAppGitAPPBranch(branchName); + appInfo.setAppGitAPPSubProjectFolder(branchName); + appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=WinBoLL"); + appInfo.setAppAPKName("WinBoLL"); + appInfo.setAppAPKFolderName("WinBoLL"); + LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成"); + return appInfo; + } +} diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLActivity.java index 8f47d37..d976e87 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/WinBoLLActivity.java @@ -9,12 +9,20 @@ import android.app.Activity; import android.os.Bundle; import android.view.MenuItem; import androidx.appcompat.app.AppCompatActivity; -import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; -public class WinBoLLActivity extends AppCompatActivity { +public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { public static final String TAG = "WinBoLLActivity"; + @Override + public Activity getActivity() { + return this; + } + @Override + public String getTag() { + return TAG; + } @Override protected void onResume() { super.onResume(); diff --git a/winboll/src/main/res/layout/activity_about.xml b/winboll/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..2313b58 --- /dev/null +++ b/winboll/src/main/res/layout/activity_about.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/winboll/src/main/res/menu/toolbar_main.xml b/winboll/src/main/res/menu/toolbar_main.xml index 9054e7f..bda3b26 100644 --- a/winboll/src/main/res/menu/toolbar_main.xml +++ b/winboll/src/main/res/menu/toolbar_main.xml @@ -8,6 +8,6 @@ android:id="@+id/item_settings" android:title="Settings"/> + android:id="@+id/item_about" + android:title="About"/> diff --git a/winboll/src/main/res/values/strings.xml b/winboll/src/main/res/values/strings.xml index c967735..daf6947 100644 --- a/winboll/src/main/res/values/strings.xml +++ b/winboll/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ WinBoLL + WinBoLL 网站浏览器。 筋斗云 金抖云 WinBoLL