From 8311026790b3765bce188ee27019d71003a2dc3f Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Sun, 17 May 2026 15:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8FUI=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/planningMode.xml | 10 ++
app/src/main/AndroidManifest.xml | 5 +
.../com/ckkj/water/base/BaseActivity.java | 10 ++
.../ckkj/water/device/AddDeviceActivity.java | 5 +-
.../water/device/DeviceControlActivity.java | 2 +-
.../ckkj/water/device/SelectWifiActivity.java | 5 +-
.../com/ckkj/water/guide/LaunchActivity.java | 1 +
.../ckkj/water/history/HistoryFragment.java | 5 +-
.../water/main/activity/MainActivity.java | 19 ++--
.../com/ckkj/water/mine/AppThemActivity.java | 95 +++++++++++++++++
.../ckkj/water/mine/MineCenterFragment.java | 10 +-
.../ckkj/water/plan/WaterPlanFragment.java | 5 +-
.../water/utils/manager/ThemeManager.java | 44 ++++++++
.../main/res/color/nav_bottom_text_select.xml | 2 +-
.../res/drawable/shape_white_coeners_8.xml | 2 +-
app/src/main/res/layout/add_device_layout.xml | 6 +-
.../res/layout/app_theme_change_layout.xml | 99 ++++++++++++++++++
.../main/res/layout/device_control_layout.xml | 8 +-
app/src/main/res/layout/device_reset_wifi.xml | 12 ++-
.../main/res/layout/device_work_time_item.xml | 2 +-
.../res/layout/history_fragment_layout.xml | 5 +-
...clude_activity_back_transparent_layout.xml | 62 +++++++++++
.../include_activity_back_whitebg_layout.xml | 4 +-
.../res/layout/index_device_list_item.xml | 2 +-
.../main/res/layout/main_activity_layout.xml | 2 +-
.../main/res/layout/mine_fragment_layout.xml | 15 +--
.../layout/tab_history_fragment_layout.xml | 4 +-
.../res/layout/tab_history_item_layout.xml | 2 +-
.../main/res/layout/water_plan_fragment.xml | 2 +-
.../main/res/layout/water_plan_list_item.xml | 2 +-
.../main/res/mipmap-xhdpi/img_theme_bg.png | Bin 0 -> 525403 bytes
.../main/res/mipmap-xhdpi/img_theme_light.png | Bin 0 -> 8585 bytes
.../main/res/mipmap-xhdpi/img_theme_night.png | Bin 0 -> 3258 bytes
app/src/main/res/values-night/colors.xml | 8 ++
app/src/main/res/values-night/themes.xml | 19 +---
app/src/main/res/values/colors.xml | 4 +
app/src/main/res/values/styles.xml | 5 +-
.../compile-file-map.properties | 2 +-
38 files changed, 413 insertions(+), 72 deletions(-)
create mode 100644 .idea/planningMode.xml
create mode 100644 app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
create mode 100644 app/src/main/java/com/ckkj/water/utils/manager/ThemeManager.java
create mode 100644 app/src/main/res/layout/app_theme_change_layout.xml
create mode 100644 app/src/main/res/layout/include_activity_back_transparent_layout.xml
create mode 100644 app/src/main/res/mipmap-xhdpi/img_theme_bg.png
create mode 100644 app/src/main/res/mipmap-xhdpi/img_theme_light.png
create mode 100644 app/src/main/res/mipmap-xhdpi/img_theme_night.png
create mode 100644 app/src/main/res/values-night/colors.xml
diff --git a/.idea/planningMode.xml b/.idea/planningMode.xml
new file mode 100644
index 0000000..6dc24c8
--- /dev/null
+++ b/.idea/planningMode.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f6e055d..0fcc852 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -222,6 +222,11 @@
android:name="com.ckkj.water.mine.ResetPsdActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize"/>
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/ckkj/water/base/BaseActivity.java b/app/src/main/java/com/ckkj/water/base/BaseActivity.java
index 5ae8ba3..4c06be5 100644
--- a/app/src/main/java/com/ckkj/water/base/BaseActivity.java
+++ b/app/src/main/java/com/ckkj/water/base/BaseActivity.java
@@ -38,9 +38,11 @@ import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.app.ActivityCompat;
import androidx.viewbinding.ViewBinding;
+import com.ckkj.water.utils.manager.ThemeManager;
import com.esafirm.imagepicker.features.ImagePicker;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.XXPermissions;
@@ -104,6 +106,7 @@ public abstract class BaseActivity
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
+ applyTheme();
super.onCreate(savedInstanceState);
try {
EventBus.getDefault().register(this);
@@ -134,6 +137,13 @@ public abstract class BaseActivity
initData(savedInstanceState);
}
+ /**
+ * 所有Activity主题一致
+ */
+ protected void applyTheme() {
+ int nightMode = ThemeManager.getCurrentTheme(this);
+ AppCompatDelegate.setDefaultNightMode(nightMode);
+ }
/**
* 初始化窗口
diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
index f7acb61..bd2031a 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
@@ -22,6 +22,7 @@ import com.ckkj.water.device.mvp.DeviceContract;
import com.ckkj.water.device.mvp.DeviceImpl;
import com.ckkj.water.device.mvp.DevicePresenter;
import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
import com.maning.mlkitscanner.scan.MNScanManager;
@@ -49,8 +50,8 @@ public class AddDeviceActivity extends BaseActivity
+ implements MineContract.MineView {
+
+ @Override
+ public void initData(Bundle savedInstanceState) {
+ super.initData(savedInstanceState);
+
+ ImmersionBar.with(this)
+ .statusBarColor(R.color.transparent) // 设置状态栏颜色
+ .statusBarDarkFont(true) // 设置状态栏字体为黑色
+ .titleBar(viewBinding.rlTitle)
+ .init();
+ viewBinding.includedTitle.tvTitle.setText(R.string.register_title);
+ initListener();
+ int currentTheme = ThemeManager.getCurrentTheme(mContext);
+ if(currentTheme == ThemeManager.MODE_LIGHT){
+ viewBinding.checkNight.setChecked(false);
+ viewBinding.checkLight.setChecked(true);
+ }else{
+ viewBinding.checkNight.setChecked(true);
+ viewBinding.checkLight.setChecked(false);
+ }
+ }
+
+ private void initListener() {
+ setClick(viewBinding.includedTitle.imgBack);
+ setClick(viewBinding.linearLight);
+ setClick(viewBinding.linearNight);
+ }
+
+ private void setClick(View view) {
+ view.setOnClickListener(this::onClick);
+ }
+
+ public void onClick(View v){
+ switch (v.getId()){
+ case R.id.linear_light:
+ switchTheme(ThemeManager.MODE_LIGHT);
+ viewBinding.checkNight.setChecked(false);
+ viewBinding.checkLight.setChecked(true);
+ break;
+ case R.id.linear_night:
+ switchTheme(ThemeManager.MODE_DARK);
+ viewBinding.checkNight.setChecked(true);
+ viewBinding.checkLight.setChecked(false);
+ break;
+ }
+ }
+
+ private void switchTheme(int themeMode) {
+ ThemeManager.setCurrentTheme(this, themeMode);
+ ThemeManager.applyTheme(themeMode);
+ recreate(); // 需要重新创建Activity使主题生效
+ }
+
+ @Override
+ public MinePresenter createPresenter() {
+ return new MinePresenter(new MineImpl());
+ }
+
+ @Override
+ public int getLayoutResId(Bundle savedInstanceState) {
+ return 0;
+ }
+
+ @Override
+ public void showError(String message) {
+
+ }
+
+ @Override
+ public void logOut(BaseBean bean) {
+
+ }
+}
diff --git a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
index 9dd8a62..a710dc3 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
@@ -16,6 +16,7 @@ import com.ckkj.water.mine.mvp.MineContract;
import com.ckkj.water.mine.mvp.MineImpl;
import com.ckkj.water.mine.mvp.MinePresenter;
import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.show.ToastUtil;
import com.gyf.immersionbar.ImmersionBar;
import com.lxj.xpopup.XPopup;
@@ -33,8 +34,8 @@ public class MineCenterFragment extends BaseFragment
-