From 133045fadd97141f24e686b8da59237ba4ec2fe1 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Mon, 22 Jun 2026 18:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96401=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=83=A8=E5=88=86=E4=B8=AD=E8=8B=B1=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ckkj/water/MyApplication.java    | 18 ++++++++++++++
 .../water/device/DeviceControlActivity.java   |  2 +-
 .../ckkj/water/network/NetWorkManager.java    | 24 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/MyApplication.java b/app/src/main/java/com/ckkj/water/MyApplication.java
index 15b6141..9561ca7 100644
--- a/app/src/main/java/com/ckkj/water/MyApplication.java
+++ b/app/src/main/java/com/ckkj/water/MyApplication.java
@@ -17,6 +17,7 @@ import com.ckkj.water.login.entity.LoginEntity;
 import com.ckkj.water.network.NetWorkManager;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.LanguageManager;
+import com.ckkj.water.utils.manager.ThemeManager;
 import com.ckkj.water.utils.manager.WaterUserInfoManager;
 
 import java.util.List;
@@ -71,6 +72,9 @@ public class MyApplication extends Application {
         // 恢复应用语言设置
         applyStoredLocale();
 
+        // 检查并设置默认主题色（如果之前没有设置过，默认设为白色主题）
+        applyDefaultTheme();
+
         boolean isUserAgreed = SharePreUtil.getBoolean(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.PRIVACY_POLICY_AGREED);
         if(isUserAgreed){
             initializeUmengSDK();
@@ -190,4 +194,18 @@ public class MyApplication extends Application {
     private void applyStoredLocale() {
         LanguageManager.applyStoredLocale();
     }
+
+    /**
+     * 检查并设置默认主题色
+     * 如果之前没有设置过主题（默认为 MODE_FOLLOW_SYSTEM），则设置为白色主题（MODE_LIGHT）
+     */
+    private void applyDefaultTheme() {
+        int currentTheme = ThemeManager.getCurrentTheme(context);
+        if (currentTheme == ThemeManager.MODE_FOLLOW_SYSTEM) {
+            ThemeManager.setCurrentTheme(context, ThemeManager.MODE_LIGHT);
+            ThemeManager.applyTheme(ThemeManager.MODE_LIGHT);
+        } else {
+            ThemeManager.applyTheme(currentTheme);
+        }
+    }
 }
diff --git a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
index e971d85..027060b 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
@@ -153,7 +153,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
             case R.id.linear_bt:
                 showDialogtext(null, false, false, true,
                         getString(R.string.tip_text),
-                        getString(R.string.device_binding_conflict_message),
+                        getString(R.string.reset_device_provision),
                         getString(R.string.cancel_text),
                         getString(R.string.confirm_text),
                         new BaseFragment.OnDialogClick() {
diff --git a/app/src/main/java/com/ckkj/water/network/NetWorkManager.java b/app/src/main/java/com/ckkj/water/network/NetWorkManager.java
index 4c5107d..8eebab0 100644
--- a/app/src/main/java/com/ckkj/water/network/NetWorkManager.java
+++ b/app/src/main/java/com/ckkj/water/network/NetWorkManager.java
@@ -93,7 +93,6 @@ public class NetWorkManager {
             okhttp3.Request request = chain.request();
             String requestUrl = request.url().toString();
             String requestMethod = request.method();
-
             okhttp3.Response response = chain.proceed(request);
 
             int httpCode = response.code();
@@ -103,6 +102,29 @@ public class NetWorkManager {
                         + " | 请求URL=" + requestUrl);
             }
 
+            try {
+                String responseBody = response.peekBody(1024 * 1024).string();
+                if (responseBody != null && !responseBody.trim().isEmpty()) {
+                    JSONObject jsonObject = new JSONObject(responseBody);
+                    String businessCode = jsonObject.optString("code");
+                    if ("401".equals(businessCode)) {
+                        Log.e("TEST", "业务401拦截 -> method=" + requestMethod
+                                + " | url=" + requestUrl
+                                + " | body=" + jsonObject.toString());
+                    } else if ("406".equals(businessCode)) {
+                        Log.e("TEST", "业务406拦截 -> method=" + requestMethod
+                                + " | url=" + requestUrl
+                                + " | body=" + jsonObject.toString());
+                    } else if ("499".equals(businessCode)) {
+                        Log.e("TEST", "业务499拦截 -> method=" + requestMethod
+                                + " | url=" + requestUrl
+                                + " | body=" + jsonObject.toString());
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("TEST", "响应体解析失败: " + e.getMessage());
+            }
+
             return response;
         }
     }