From 77f6001a31f2d59c532601c54bcb61aa4955d8db Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Tue, 9 Jun 2026 10:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../water/device/AddDeviceActivity_copy.java  |  22 +++++++++++-------
 .../water/device/DeviceControlActivity.java   |   2 +-
 .../ckkj/water/device/SelectWifiActivity.java |   4 ++--
 .../adapter/DeviceTimeSelectAdapter.java      |   2 +-
 .../water/device/adapter/WifiListAdapter.java |  10 ++++++++
 .../com/ckkj/water/guide/GuideActivity.java   |   3 ---
 .../com/ckkj/water/mine/AppThemActivity.java  |   5 ++++
 .../res/drawable-night/icon_mine_settings.png | Bin 0 -> 2786 bytes
 .../res/drawable-night/img_back_black.png     | Bin 0 -> 1257 bytes
 .../main/res/drawable/icon_mine_settings.png  | Bin 0 -> 2546 bytes
 app/src/main/res/drawable/img_back_black.png  | Bin 0 -> 1311 bytes
 .../drawable/shape_f7f7f7_line_button_bg.xml  |   2 +-
 .../main/res/layout/device_control_layout.xml |   3 ++-
 .../main/res/layout/device_work_time_item.xml |   2 +-
 .../include_activity_back_gray_layout.xml     |   2 +-
 .../include_activity_back_whitebg_layout.xml  |   4 ++--
 .../main/res/mipmap-xhdpi/icon_white_wifi.png | Bin 0 -> 601 bytes
 .../res/mipmap-xxhdpi/icon_white_wifi.png     | Bin 0 -> 1404 bytes
 .../res/mipmap-xxxhdpi/icon_white_wifi.png    | Bin 0 -> 595 bytes
 app/src/main/res/values-night/colors.xml      |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 21 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/icon_mine_settings.png
 create mode 100644 app/src/main/res/drawable-night/img_back_black.png
 create mode 100644 app/src/main/res/drawable/icon_mine_settings.png
 create mode 100644 app/src/main/res/drawable/img_back_black.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/icon_white_wifi.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_white_wifi.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_white_wifi.png

diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
index 4a11f85..074f181 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
@@ -171,6 +171,7 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
                 super.onScanResult(callbackType, result);
                 //Mac地址
                 String deviceAddress = result.getDevice().getAddress();
+
                 // 去重：已存在的设备不再添加
                 if (discoveredMacSet.contains(deviceAddress)) {
                     return;
@@ -181,7 +182,6 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
                 //设备名字
                 String deviceName = result.getScanRecord() != null ?
                         result.getScanRecord().getDeviceName() : "无名称";
-
                 bean.setDeviceName(deviceName);
                 bean.setMacAddress(deviceAddress);
                 mDeviceList.add(bean);
@@ -214,7 +214,7 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
                 ToastUtil.showShort(mContext, "扫描失败，错误码: " + errorCode);
             }
         };
-        scanner.startScan(filters, settings, mScanCallback);
+        scanner.startScan(null, settings, mScanCallback);
     }
 
     /**
@@ -244,13 +244,17 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
             return;
         }
 
-        // 检查蓝牙是否开启
-        if (!bluetoothAdapter.isEnabled()) {
-            Log.e("TEST", "initBluetooth: 蓝牙未开启，请求开启");
-            Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-            startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
-        } else {
-            bluetoothReady = true;
+        try {
+            // 检查蓝牙是否开启
+            if (!bluetoothAdapter.isEnabled()) {
+                Log.e("TEST", "initBluetooth: 蓝牙未开启，请求开启");
+                Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+                startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
+            } else {
+                bluetoothReady = true;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
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 27ebd65..626180d 100644
--- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java
@@ -90,7 +90,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
                 .titleBar(viewBinding.rlTitle)
                 .init();
         viewBinding.includedTitle.imgSetting.setVisibility(View.VISIBLE);
-        viewBinding.includedTitle.imgSetting.setImageDrawable(getDrawable(R.mipmap.device_ctrl_setting));
+//        viewBinding.includedTitle.imgSetting.setImageDrawable(getDrawable(R.mipmap.device_ctrl_setting));
         mAdapter = new DeviceTimeSelectAdapter(mContext,R.layout.device_work_time_item,mTimeList);
         viewBinding.rvTimeList.setAdapter(mAdapter);
         viewBinding.rvTimeList.addItemDecoration(new GridSpacingItemDecoration(4, 10, true));
diff --git a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
index 9151a1e..1effd80 100644
--- a/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/SelectWifiActivity.java
@@ -120,7 +120,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
     }
 
     private void initWifiList() {
-        wifiListAdapter = new WifiListAdapter();
+        wifiListAdapter = new WifiListAdapter(mContext);
         viewBinding.rvWifiList.setAdapter(wifiListAdapter);
         wifiListAdapter.setOnWifiItemClickListener(wifiName -> {
             mWifiName = wifiName;
@@ -239,7 +239,7 @@ public class SelectWifiActivity extends BaseActivity<DeviceResetWifiBinding, Dev
             public void onFailed(int errorCode, String message) {
                 isBleConnecting = false;
                 if (errorCode != 0) {
-                    isBleConnected = espProvisionManager != null && espProvisionManager.isConnected();
+                    isBleConnected = espProvisionManager != null && espProvisionManager .isConnected();
                 }
                 Log.i("TEST","errorCode == " + errorCode + " message == " + message);
                 ToastUtil.showShort(mContext, message);
diff --git a/app/src/main/java/com/ckkj/water/device/adapter/DeviceTimeSelectAdapter.java b/app/src/main/java/com/ckkj/water/device/adapter/DeviceTimeSelectAdapter.java
index 9ab656f..77d12d9 100644
--- a/app/src/main/java/com/ckkj/water/device/adapter/DeviceTimeSelectAdapter.java
+++ b/app/src/main/java/com/ckkj/water/device/adapter/DeviceTimeSelectAdapter.java
@@ -41,7 +41,7 @@ public class DeviceTimeSelectAdapter extends BaseQuickAdapter<String, BaseViewHo
             helper.setTextColor(R.id.tv_itme,mContext.getResources().getColor(R.color.white));
         }else{
             relTextBg.setBackground(mContext.getResources().getDrawable(R.drawable.shape_f7f7f7_line_button_bg));
-            helper.setTextColor(R.id.tv_itme,mContext.getResources().getColor(R.color.color_838080));
+            helper.setTextColor(R.id.tv_itme,mContext.getResources().getColor(R.color.textPrimaryColor));
         }
     }
 
diff --git a/app/src/main/java/com/ckkj/water/device/adapter/WifiListAdapter.java b/app/src/main/java/com/ckkj/water/device/adapter/WifiListAdapter.java
index 07966f9..0f61731 100644
--- a/app/src/main/java/com/ckkj/water/device/adapter/WifiListAdapter.java
+++ b/app/src/main/java/com/ckkj/water/device/adapter/WifiListAdapter.java
@@ -1,5 +1,6 @@
 package com.ckkj.water.device.adapter;
 
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +11,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.ckkj.water.R;
+import com.ckkj.water.base.BaseActivity;
+import com.ckkj.water.utils.manager.ThemeManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +21,10 @@ public class WifiListAdapter extends RecyclerView.Adapter<WifiListAdapter.WifiVi
 
     private List<String> wifiList = new ArrayList<>();
     private OnWifiItemClickListener listener;
+    private Context mContext;
+    public WifiListAdapter(BaseActivity mContext) {
+        this.mContext = mContext;
+    }
 
     public interface OnWifiItemClickListener {
         void onWifiItemClick(String wifiName);
@@ -49,6 +56,9 @@ public class WifiListAdapter extends RecyclerView.Adapter<WifiListAdapter.WifiVi
                 listener.onWifiItemClick(wifiName);
             }
         });
+        holder.ivWifiIcon.setImageResource(ThemeManager.isAppThemeLight(mContext) ?
+                R.mipmap.icon_wifi :
+                R.mipmap.icon_white_wifi );
     }
 
     @Override
diff --git a/app/src/main/java/com/ckkj/water/guide/GuideActivity.java b/app/src/main/java/com/ckkj/water/guide/GuideActivity.java
index 581da1b..bb0d453 100644
--- a/app/src/main/java/com/ckkj/water/guide/GuideActivity.java
+++ b/app/src/main/java/com/ckkj/water/guide/GuideActivity.java
@@ -42,9 +42,6 @@ public class GuideActivity extends BaseActivity<GuideActivityLayoutBinding, Logi
     private List<Drawable> mImgUrls = new ArrayList<>();
     private List<ImageView> mPointList = new ArrayList<>();
     private boolean mHasEnterAppFlag = false;
-    private String desc[] = {"探索你的个性特征",
-            "一键生成，智能排盘工具",
-            "贴心提供每日生活指南"};
 
     private int[] guideDrawableIds = {
             R.mipmap.img_guide_1,
diff --git a/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java b/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
index d657bb5..ea23917 100644
--- a/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
@@ -57,6 +57,11 @@ public class AppThemActivity extends BaseActivity<AppThemeChangeLayoutBinding, M
 
     public void onClick(View v){
         switch (v.getId()){
+
+            case R.id.img_back:
+                finish();
+                break;
+
             case R.id.linear_light:
             case R.id.img_light:
                 switchTheme(ThemeManager.MODE_LIGHT);
diff --git a/app/src/main/res/drawable-night/icon_mine_settings.png b/app/src/main/res/drawable-night/icon_mine_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..749d36761f49fdf7976c5e0fc10737a5edf68211
GIT binary patch
literal 2786
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-night/img_back_black.png b/app/src/main/res/drawable-night/img_back_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d8bfe648872607a8664fa6fdc847360eb7fe77
GIT binary patch
literal 1257
zcmV<F1Qz>=P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000D@Nkl<ZcmeF4
zjaAz)6h=)a=m;=D%LFYOv>U(#g$W81zy{C>XeXc>&<)B4?FRI_vBPn5h-1snlk}t<
zKU;}q%egm_|73X6)K^pjRX|kyO;ZI_0g(wrF22@)Dj+g}$i>$hPz6LL5V`mwYrymK
z^P%Ea@khb%Tcc~mp|y|V1PJnbL4H)6D&8s>0DrE;V>e$(o1rKH9o&beY1ZJIjTfKa
zD<48OX6@%~F#-gYU;cwI0$G!-1Moj?oxAXiA_NHjCvh7CU)ff}ht=3%<X(W_)7IaM
z<*r}8ve*x<1$6Ll1F${?EEBYdTLClR1M(Xqi*PAmCj5(ogM(TFLVtZT;a>{=O=#I6
z%ekrng8x+zLfU*S)&T#iF@Cub(80e9<QD}#+v-9<uJDZoP~7s7Gkj=dT?2B5pS1uF
z@Us;#6aIw`HO-H9fc;uz*96Uke<t{*$N8^8?|+t+fCb>+^}l=y>1+gegwGEk3jto?
zXCXlFueG5eXSjd0+_BpH<eD9A*UOM}4G?^;>u|IDWrIg1fPW(RzeeVdmMvKU9enO)
zO@)&b{9PNLq<~W3BPTflCBaWlzzq1@!D5G-e47vSek4%?1pcjJ-CM1{ePhzVXNSvl
zO#Y<uL>D0NbQht|4jrea!U1}=@cFV)1(Xgys(=a~{7syP^eX%oK4bGHNbu?WT5OvS
z^nREMsPOyf+q9X09(-y*Tl)C%w4<Hz>y4h%L_meV-SgfB2tLR8bPo^t<#T46^>O}o
z^zEFz3s5m%6d@;B?%|7z$zf>7CFM1IE-ka2Zo{GmOl^ABJ6!kh`Bhm6m<keMJk!PY
zxep5gKLaT85Oqk?6;M>%MJxnd1b)RLB<x*)Zj95WhxBT|n|ld+7XU>`pfBbe2|W42
zs@%nb0*2YllyIpNI+qg61fZu%fWrS_DuALp386b?cQwIWKqrAN;%B4-!j*(50)VcX
zK%dRxB}5ZYB|sq3J>j<Kc3gT*h*|?$1x-`3gd_wsdUX<xm7IF<PKz|`n0bzXbXJj!
z0H{gA>OO$dArj7Yvc~fST0Ea2DFI-cDdE&w0^2+%k`us}DM><-0!osQtbh#(T+-&F
zDY0sf)Fja>W6E--d6O0ZiC%LQBth$VNLfPi0tArr1mK@2%~X>~16^X0m5_x1aH}Q&
z-<^bP1bCH@l>m<tvJ<e71pZ7t{f}5()W}i*#AfajfX|MZDXWVXc?#%od61B`06gR_
zA$tM2OK>3|X9;cu^dxXohx-bAG$q&}o9~!i34pft3Ea%#j5$~W>#+)V0suExf-c^f
zb&Yo^U;zp5ScgTp6#%>$HNos2f@=XA629|(WUwC@nRQ+^_X5B}O;CJRn(mOA>>PgV
z%&}002?7=>G2&_@fxf7_B-|)p$a8H$->fJB5E5J@&^w#Ao58;_3GF(+xvo*~ixU79
zNdWSZ(oA`D3MohWoJXnjvE5Ll0PqU-lY-{vO4B<9w>+6;8pR4Qr94nr6)*tDVpbJk
zL3yBzDqsMP#jGm8g7QEaRloooi&<5`4$AwU{SN>D|NjcK$q)bl00v1!K~w_()xfmS
TFg*?J00000NkvXXu0mjfH;6a_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_mine_settings.png b/app/src/main/res/drawable/icon_mine_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eb53dbdcc331baf656e3d11dbb4fed6876c0447
GIT binary patch
literal 2546
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
IM6N<$f++~6$p8QV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_back_black.png b/app/src/main/res/drawable/img_back_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d153381289ad59f8f45367c4eff655e5283ba8c
GIT binary patch
literal 1311
zcmV+)1>pLLP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000EkNkl<ZcmeF4
zjaAz)6os8kkZz!`K*I!u4Pb*XL16;S1Y`r)plm=lAYCBG8#EIny*D`E(-RX*j-T`-
z<@jM&mMrJ{BFTSA$3=d5C6EPp#a|RzKo;PcfamIS3&;XI6YyMpZUI?<X9Aw9PqGCV
zyw1+fo~G038|HuO`8|>+(ms+C0LZiPc>D^`^U-KD!+cWDOQgRUypSd~B_#lC-{BX9
zDGt93Bv8)bwF9IkBcK6)a)cwYnyVvuPPRG;0U&x+f3lCk-+@KmAG-yCKhX;S{5gRB
z0?SVDk&ly2Ugmd>s0GyUpB(7?aVX<dBw7JI;IB8E&9f6theA;b=mDPyAF8Tab3r1a
z6VMZWxmv9j65#iBL?r-cwf7isUHW|TAp8d|NJcaQ2p`}|gv;awK6f+<0b1b;3t)Ap
z56$pNLv;(#4qvr^7~rcF&=dY04mHJ(b_n}WsOy6Iz{eTx4d9C&=O2RJOj9MGFZ`;i
z#4a&3A%C^3MnH`4DMp2WSmCP>0QisCQI|7ZUe!DgvD?A>`Iv%k0f5izI=3Ht+kJuX
zF9Cnqy@;Qj!3wD1&mFJ?1^?Lo2Pq&G_>>czfRx||C!h!X3MW|{aD(sj3B4IXv;f@2
zn(*;J?3hcRPxu^gE0k9^c^5$VqtWOUF>|1&8b05zR{_QtK9`v+e6IpBeBv+sd`U0E
ze}~V%;$0Bn8}#={cRK{X4^aVxKOT=W{5^fl#RTl(qfUdco$QWwY`5+)zleYgzuoZQ
z0sx<fntVLm`jfxiZkIU2ReO@vj{S4Z-~!O+|HPm>`>e9t65%7FhEEcM3jo9mR%8<>
zvqTWS*i*_j`*+H`g9~u@^jE3Cr^vwt0H*ClGL98uUy>sPpE0-qv;bQH1;&jhV~op{
zQJ*ZG>K<GGj$-bxXV!grDiQ`4fE(j%0ZxwsrXXQ(0r>P6_2Ymgmu-U*aHs6vww#vy
zClv7YTZRO-0w)RBav7@xF#&+cmXIY7L?c86u->{QaA4*?Z6mstATEH!Az^`|qZ=+e
zL{t*I2q1JE9X)3Wo^DA}03%EAEFen=KtSpeyo~__-;BCDI!BuIWeb$y!2F20x+xd|
zBnJt*J78FLk#LKXHGZD}#q~@<2_Uwf66VqpxX*neI01Y!DM<)YKuQvV74V+~Ueacg
zP3*cO+}N4e6q3#xv;e|rbVp7Sa7XSnWC_6ws3q*4jKi|E1PGWRf|Z~`0KgY$2~kQ=
zBOq1@sszL+L7jk8NWgt&@t>*Zejf^z0{BMyj0q^e`<Z$i9T_ZpopcJQk;NcEwE%k1
zE<wEj?GmC8pjkpR0vZy|x7)4DZ$@|-n4=O<OISm|CBjJpE?bD+)QL_&UkMO!fy2`)
zZbu@b6hLq|I&y9aI8pn~ZAe740tl~%1hEses0B17VEF~nb;|#VPghc1^06hXR;z2|
z?expJo6W{$0LSL-CyN$fzwyvYKms2KJ|<xSVZWvJJt+Z%T1#kqJif&GwskCi@<>hq
z2?Fv0-OM)xTSSTZHDZc%eu0Ep#3D%nq>FB5jd&(>%wG@{)1@O>0n(t`>dOM!$Oxrp
z0YaeLs>uS{$Oxrp0YaeLs>uS{$Oxrp0Y^X&z4{*j00960Or;v}00006Nkl<Z0|28s
Vg5Tenh))0j002ovPDHLkV1mB7K?DE*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/shape_f7f7f7_line_button_bg.xml b/app/src/main/res/drawable/shape_f7f7f7_line_button_bg.xml
index ecf8fae..0ef8eff 100644
--- a/app/src/main/res/drawable/shape_f7f7f7_line_button_bg.xml
+++ b/app/src/main/res/drawable/shape_f7f7f7_line_button_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="5dp"/>
-    <solid android:color="@color/white"/>
+    <solid android:color="@color/deviceControlItemColor"/>
     <stroke android:color="@color/color_ebebeb" android:width="@dimen/dp_0_5"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/device_control_layout.xml b/app/src/main/res/layout/device_control_layout.xml
index a09bec1..e4641f2 100644
--- a/app/src/main/res/layout/device_control_layout.xml
+++ b/app/src/main/res/layout/device_control_layout.xml
@@ -183,10 +183,11 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
                 android:paddingVertical="@dimen/dp_6"
                 android:orientation="horizontal"
                 android:background="@drawable/shape_f9f9f9_corner_5"
-                android:layout_marginHorizontal="@dimen/dp_20">
+                android:layout_marginHorizontal="@dimen/dp_10">
                 <TextView
                     android:id="@+id/tv_work_duartion"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/device_work_time_item.xml b/app/src/main/res/layout/device_work_time_item.xml
index 15b1b51..6eaf02a 100644
--- a/app/src/main/res/layout/device_work_time_item.xml
+++ b/app/src/main/res/layout/device_work_time_item.xml
@@ -17,7 +17,7 @@
             android:layout_centerVertical="true"
             android:layout_centerHorizontal="true"
             android:textSize="14sp"
-            android:textColor="@color/color_838080"
+            android:textColor="@color/textPrimaryColor"
             android:text="30min"/>
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_activity_back_gray_layout.xml b/app/src/main/res/layout/include_activity_back_gray_layout.xml
index fccc52e..73816e2 100644
--- a/app/src/main/res/layout/include_activity_back_gray_layout.xml
+++ b/app/src/main/res/layout/include_activity_back_gray_layout.xml
@@ -55,7 +55,7 @@
             android:layout_height="@dimen/dp_20"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:src="@mipmap/icon_mine_settings"
+            android:src="@drawable/icon_mine_settings"
             android:layout_marginRight="@dimen/dp_20"
             android:visibility="gone"/>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/include_activity_back_whitebg_layout.xml b/app/src/main/res/layout/include_activity_back_whitebg_layout.xml
index a41879c..58eff1b 100644
--- a/app/src/main/res/layout/include_activity_back_whitebg_layout.xml
+++ b/app/src/main/res/layout/include_activity_back_whitebg_layout.xml
@@ -12,7 +12,7 @@
             android:layout_width="22dp"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:src="@mipmap/img_back_black"
+            android:src="@drawable/img_back_black"
             android:layout_marginLeft="@dimen/dp_10"/>
         <TextView
             android:id="@+id/tv_title"
@@ -55,7 +55,7 @@
             android:layout_height="@dimen/dp_20"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:src="@mipmap/icon_mine_settings"
+            android:src="@drawable/icon_mine_settings"
             android:layout_marginRight="@dimen/dp_20"
             android:visibility="gone"/>
     </RelativeLayout>
diff --git a/app/src/main/res/mipmap-xhdpi/icon_white_wifi.png b/app/src/main/res/mipmap-xhdpi/icon_white_wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b47b09163933194f3481ce08eef6c402fa6d17
GIT binary patch
literal 601
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s8v}eoT!HleAqBS2D4GLwv{gxv
zUoZm;2akY=gp9m`in_kBxxKTyw|{VSd~$krad~xpb9?{f>GKyaU%h_w_TBprA3uHm
z^6mSNpTB<p`TK7fO&5O#21Z#=7sn6@$+rg+%Nqk2*dA=xzA11q$8441;$usWmG1rj
zzrELLPJs2#4f*rf%gg^SyC?ngqFdm){pyFe9k@R$?u_xN_nab|#Lp<&GVhF1<n~zJ
zq@8qT@!O(DmdxoQM{K%o@3_!2vnwX}@WhL=-_9s9O(_)>Hs%)pvM}Y)dWGcE%@<tw
z?grYtP=1{0uI2u~<vOdMl=r01T$^&XZkte5GuzF2QqjkIS0@O}=V3W#%A@jz)p$v|
z!bPDIS9vNO`AkKmHR8DC15yr5`EvLAzl1$WS-JrSg6{l&mF00&=Hy-n=ZSrf{G}y-
zu}gA@Y`&v)?&dlN$*a5Cq_3nsdB(alQ(LYiFs!}P@>Ertl2fFbu$|ZJBLA5hz7`+V
e3<}H3o8!|9+#c`Uq_!Fu+zg(selF{r5}E+CZ((=<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/icon_white_wifi.png b/app/src/main/res/mipmap-xxhdpi/icon_white_wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6b4be572c05da6fd341fc68896147179b4c4eb
GIT binary patch
literal 1404
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Qn79IbLR^8||D#|u1pfc$VOp{s
zm>SlW1o;IsFfuW-u(ES-a`W)=3kZscib+UHNz2H|D<~?fsA_0xY3u0f=^L7unOj)e
z*g7~mySTb}czXHx`UQoAhDSt3MaRU(#U~}FW@KgO<`oo`l$MoOR902jHa0c4w0Cy*
z^iP^RW$N^qv*#~dv~<O))oZqF+rDeh-hKNI96WsN_{mde&Yrt)>GG9p*Kgjsedq4I
z`wt#Idi><+v*#~fzIy%U?fVZOKYjl4?fZ|PzkdJu`|n8A<8#2|T;l2C7!q+fIYEMT
zae_!sQ=o%Z!b8E}jr=FpzMZov>Fps+VXw=~Jx^LKB|S~uuBch<FTEHQvSEXralriP
zBFR&Xti{(vb@Q&7aaBsoV~OUUWvba9n^ae>y3^7t_(>yj*EE5M8EcPw9gx|&N;SKa
zVRiab&xeMsfd*Wme>eRM{%w8x)~VaKcB!3l;oiE_FUEp*(+Y>M-5ZQ<9*>IU5|XJg
z+GY0ertgV;aZ?sI-Idt(VW-C_tHV=RZ(fi&qnb2fgM_E=Zcbsb;vbX34uqc3+j{6}
z7T<a?7mage35P=_a+ZI4!=qeQbMo+Nro5+4`aVBj8k`g>=KEuKS|!0)c-any;9CV!
z9!Y2Sh<s@|edg4uu6ajQJ{^1)f3;6la6?41&#R5j-$ZBkbb4pxBqb$<ELhwp!99s5
z|ANy3%cEQon|FUZvo*Er3<u-P3CB2##n!V`Cq7*ydAD`m9FJ9Je_gxg`B;PJ$()@Z
zpIc0cQG2fF;n=6FG<~6na;ta2^G!Z}Nxcuh%<42hUiR8pIF--;Pm)Njce>B4_F3`2
z?{*lS$dL?sAy%1v!qfYt)(qD$<(XR=RyYN1Ea!FkxkoDe$pZntyymt$tE?6^b>3Ve
z{${a{_m`r$Bdf)p91lHu=?JUYW;TNj&vzzooa$*Km?3bkq=VB$O3S3sBXV09htT{!
ziOR?m6O>qPgnU^tLu38U%3SM)sScYB*;}7+q&mLlu{Y~FllZB9>A90ZB9ceq+5FEM
zib$$l<TYP0MX6ck_d~YOfRqUds&^KcbnztdwzGb-u|2gYevR0z16|3B4HP+_`NnUn
wxp;&luWPc|>S@#0FTRuUxCWHI3{rpvs@To!d2y!CfEkCu)78&qol`;+09G!R8vp<R

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_white_wifi.png b/app/src/main/res/mipmap-xxxhdpi/icon_white_wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..b71903d8c143104e759767a4a40f2f1612f81ee3
GIT binary patch
literal 595
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbUf%Jb8!S<<-nt<8_N`m}?
z83Ysz90C#w>ig%f-+%u8d)B~~90mr){hlt4Arg{r4>qn_WFWwL;r7dbg*=yk|BwG2
z6RWJD@S$L`Zx!Dv2(WE3%gt}L_AK9iXPHF7q#2(MSk9aLV7rO+^@`;dew#jTzQo0s
z*%Li8Y5S8qhlR^L&+YZuI8&m3Lq~4Zx`K5X8yhXsd1`O3c;J_mwYm71z(>#1=JzrW
z?7mQP&Rl#Amu-B7_(q@Ghr}%tW?C#?b5K2NjueacqGBcPZ5_ur`y&D@u5oV*dVHgS
z^_;r@4d=Q3%wk6lwd>qaFR9TG^iF!%tA1v(y@5Y>zD-i3&Yq%!s~1ea$Mycy1bwLw
zUUS0rB9#4}HE4PsGe4@w7`#wDc7xxomX*hL91#g#Df(v0oNSwi;gdcK2g|6<jQ+xS
zT;;jh(u0D!+p{;upO>_oVV$1xM)c<)E8ZQ#Z+rAvtXZF*n838m$*8a5K-{C67ox>i
zemrRUd!+Jllj^HIg$D&6?Rm99sRZZ<!$)7(UT?X;>fYMX?{wt9O2%Twc;%VlN0s(H
zKD7T7>-`Bot~{t&_~B&XKJMc}e%Fh29+w<5Jp8gJ+1BrR;hMuQrzCfM{#s*H(`X@Y
r^FaDY#dYp|E}MT(5Df)`|9ALz#Q7O?1aO@IMl*w_tDnm{r-UW|WlAUK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d24783a..b12127f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -8,4 +8,5 @@
     <color name="textPrimaryColor">#E0E0E0</color>
     <color name="color_subtitle">#E0E0E0</color>
     <color name="text_hint_theme_color">#303030</color>
+    <color name="deviceControlItemColor">#878787</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cd3b99f..cd8b091 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
     <color name="text_hint_theme_color">#838080</color>
     <color name="color_subtitle">#666666</color>
     <color name="color_gray_theme">#F9F9F9</color>
+    <color name="deviceControlItemColor">#FFFFFF</color>