From 3dba7b1e45f4a472adf77520868e704e865177bc Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 5 Dec 2025 19:59:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=B4=BB=E5=8A=A8=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.properties | 4 +- winboll/src/main/AndroidManifest.xml | 10 ++-- .../java/cc/winboll/studio/winboll/App.java | 3 +- .../winboll/studio/winboll/MainActivity.java | 8 +-- .../winboll/activities/SettingsActivity.java | 50 +++++++++++++++++++ .../src/main/res/layout/activity_settings.xml | 15 ++++++ winboll/src/main/res/menu/toolbar_main.xml | 3 ++ winboll/src/main/res/values/dimens.xml | 10 ++++ winboll/src/main/res/values/styles.xml | 9 +--- 9 files changed, 95 insertions(+), 17 deletions(-) create mode 100644 winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java create mode 100644 winboll/src/main/res/layout/activity_settings.xml create mode 100644 winboll/src/main/res/values/dimens.xml diff --git a/winboll/build.properties b/winboll/build.properties index f7d8c57..a6a3330 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Dec 04 21:06:15 HKT 2025 +#Fri Dec 05 11:57:23 GMT 2025 stageCount=6 libraryProject= baseVersion=15.11 publishVersion=15.11.5 -buildCount=0 +buildCount=17 baseBetaVersion=15.11.6 diff --git a/winboll/src/main/AndroidManifest.xml b/winboll/src/main/AndroidManifest.xml index cf3fc15..f20bf3a 100644 --- a/winboll/src/main/AndroidManifest.xml +++ b/winboll/src/main/AndroidManifest.xml @@ -20,8 +20,8 @@ android:theme="@style/MyAppTheme" android:resizeableActivity="true" android:name=".App" - android:usesCleartextTraffic="true" - android:networkSecurityConfig="@xml/network_security_config"> + android:usesCleartextTraffic="true" + android:networkSecurityConfig="@xml/network_security_config"> - + + + - + \ No newline at end of file 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 cae1bde..59bcea2 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/App.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/App.java @@ -40,6 +40,7 @@ import java.util.Arrays; import java.util.Date; import java.util.LinkedHashMap; import java.util.concurrent.atomic.AtomicBoolean; +import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; public class App extends GlobalApplication { @@ -59,7 +60,7 @@ public class App extends GlobalApplication { super.onCreate(); setIsDebugging(BuildConfig.DEBUG); - //WinBoLLActivityManager.init(this); + WinBoLLActivityManager.init(this); // 初始化 Toast 框架 ToastUtils.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 ce71759..b322e42 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -15,9 +15,9 @@ 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.fragments.MainFragment; -import java.util.ArrayList; +import cc.winboll.studio.winboll.activities.SettingsActivity; import cc.winboll.studio.winboll.fragments.BrowserFragment; +import java.util.ArrayList; public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActivity { @@ -100,7 +100,9 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi @Override public boolean onOptionsItemSelected(MenuItem item) { int nItemId = item.getItemId(); - if (item.getItemId() == R.id.item_log) { + 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); diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java new file mode 100644 index 0000000..19a2908 --- /dev/null +++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/SettingsActivity.java @@ -0,0 +1,50 @@ +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.libaes.interfaces.IWinBoLLActivity; +import cc.winboll.studio.libaes.utils.AESThemeUtil; +import cc.winboll.studio.winboll.R; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/12/05 18:48 + * @Describe Settings Activity + */ +public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivity { + + public static final String TAG = "SettingsActivity"; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + AESThemeUtil.applyAppTheme(this); + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_settings); + + // 设置工具栏 + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setSubtitle(TAG); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); // 点击导航栏返回按钮，触发 finish() + } + }); + + } + +} diff --git a/winboll/src/main/res/layout/activity_settings.xml b/winboll/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000..b800c60 --- /dev/null +++ b/winboll/src/main/res/layout/activity_settings.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/winboll/src/main/res/menu/toolbar_main.xml b/winboll/src/main/res/menu/toolbar_main.xml index 30db296..94e56bf 100644 --- a/winboll/src/main/res/menu/toolbar_main.xml +++ b/winboll/src/main/res/menu/toolbar_main.xml @@ -4,4 +4,7 @@ + diff --git a/winboll/src/main/res/values/dimens.xml b/winboll/src/main/res/values/dimens.xml new file mode 100644 index 0000000..9781ee2 --- /dev/null +++ b/winboll/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + + diff --git a/winboll/src/main/res/values/styles.xml b/winboll/src/main/res/values/styles.xml index df38db8..e62a453 100644 --- a/winboll/src/main/res/values/styles.xml +++ b/winboll/src/main/res/values/styles.xml @@ -1,10 +1,5 @@ - - - +