From 8eb83634d0e9032433d3f4950ace8d0b9623106d Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 7 Jan 2025 09:15:04 +0800
Subject: [PATCH] =?UTF-8?q?version:2.0.0=20fix:=20update:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=85=B3=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   5 +-
 .../os/activity/FlashlightActivity.java       |  14 +-
 .../vscool/os/activity/NetworkActivity.java   |   4 +-
 .../activity/alarm/add/AlarmAddActivity.java  |  96 ++-
 .../alarm/edit/AlarmEditActivity.java         | 109 +--
 .../callwechat/CallWechatActivity.java        |   2 +-
 .../activity/contact/AddContactActivity.java  |   6 +-
 .../activity/contact/AddContactViewModel.java |   6 +-
 .../activity/contact/EditContactActivity.java |   6 +-
 .../contact/EditContactViewModel.java         |   6 +-
 .../activity/dailyapp/DailyAppActivity.java   |   6 +-
 .../vscool/os/activity/dock/DockActivity.java |   7 +-
 .../os/activity/phone/PhoneActivity.java      |   5 +
 .../os/activity/setting/SettingActivity.java  | 207 ++++--
 .../com/vscool/os/adapter/ContactAdapter.java |   5 +-
 .../vscool/os/adapter/DailyAppAdapter.java    |  16 +-
 .../os/adapter/DockAppSelectedAdapter.java    |   8 +-
 .../os/adapter/WechatContactAdapter.java      |   2 +-
 .../com/vscool/os/alarm/AlarmAdapter.java     | 264 ++++---
 .../java/com/vscool/os/alarm/AlarmUtils.java  |   8 +-
 .../com/vscool/os/base/BaseApplication.java   |   2 +-
 .../os/fragment/app/AppListFragment.java      |   2 +-
 .../fragment/phone/dialer/DialerFragment.java |   6 +-
 .../phone/dialer/DialerViewModel.java         |   7 +-
 .../fragment/settings/SettingsFragment.java   |  75 +-
 .../vscool/os/manager/AppStatusManager.java   |   7 +
 .../vscool/os/manager/DesktopIconManager.java |  22 +
 .../java/com/vscool/os/view/ToggleButton.java |  12 +-
 .../main/res/drawable-hdpi/default_avatar.png | Bin 6572 -> 6374 bytes
 app/src/main/res/drawable-hdpi/icon_add.png   | Bin 2455 -> 2818 bytes
 app/src/main/res/drawable-hdpi/icon_menu.png  | Bin 689 -> 1208 bytes
 app/src/main/res/drawable-hdpi/icon_more.png  | Bin 716 -> 417 bytes
 .../main/res/drawable-hdpi/icon_selected.png  | Bin 2194 -> 1234 bytes
 .../main/res/drawable-hdpi/icon_turn_off.png  | Bin 0 -> 21758 bytes
 .../main/res/drawable-hdpi/icon_turn_on.png   | Bin 0 -> 11784 bytes
 .../res/drawable-hdpi/icon_unselected.png     | Bin 2163 -> 1135 bytes
 .../drawable-hdpi/icon_wechat_call_phone.png  | Bin 3131 -> 4612 bytes
 .../drawable-hdpi/icon_wechat_call_video.png  | Bin 2955 -> 6381 bytes
 .../drawable-hdpi/icon_wechat_call_voice.png  | Bin 3119 -> 5166 bytes
 .../res/drawable/add_alarm_background.xml     |   2 +-
 app/src/main/res/drawable/add_contact_bg.xml  |   2 +-
 .../add_contact_confirm_background.xml        |   2 +-
 .../main/res/drawable/alarm_background.xml    |   2 +-
 .../res/drawable/background_weather_rain.xml  |   2 +-
 .../res/drawable/contact_add_contact_bg.xml   |  10 +-
 app/src/main/res/drawable/contact_bg1.xml     |   3 +-
 .../res/drawable/control_background_item.xml  |   2 +-
 .../main/res/drawable/default_button_bg.xml   |   2 +-
 app/src/main/res/drawable/edit_background.xml |   2 +-
 .../main/res/drawable/general_setting_bg.xml  |  15 +-
 app/src/main/res/drawable/join_background.xml |   2 +-
 .../res/drawable/notice_voice_background.xml  |   2 +-
 app/src/main/res/drawable/ok_background.xml   |   2 +-
 .../main/res/drawable/qrcode_background.xml   |   2 +-
 app/src/main/res/drawable/refresh_bg.xml      |   3 +-
 .../res/drawable/tv_add_alarm_background.xml  |   8 +-
 app/src/main/res/drawable/tv_bg_noti.xml      |   2 +-
 .../main/res/drawable/update_background.xml   |   2 +-
 .../res/drawable/view_clock_button_bg.xml     |   2 +-
 .../layout-sw700dp/activity_add_contact.xml   | 404 -----------
 .../main/res/layout-sw700dp/activity_main.xml | 285 --------
 .../res/layout-sw700dp/activity_setting.xml   | 646 ------------------
 .../res/layout-sw700dp/activity_sim_card.xml  |  78 ---
 .../res/layout-sw700dp/activity_touch.xml     | 244 -------
 .../res/layout-sw700dp/fragment_applist.xml   |  71 --
 .../layout-sw700dp/fragment_contact_home.xml  | 208 ------
 .../main/res/layout-sw700dp/fragment_home.xml | 396 -----------
 .../res/layout-sw700dp/fragment_settings.xml  | 479 -------------
 .../main/res/layout-sw700dp/item_actions.xml  | 111 ---
 .../layout-sw700dp/item_contact_wechat.xml    |  93 ---
 .../main/res/layout-sw700dp/item_dock_app.xml |  69 --
 .../main/res/layout/activity_alarm_add.xml    | 120 ++--
 .../main/res/layout/activity_alarm_edit.xml   | 173 +++--
 .../main/res/layout/activity_alarm_list.xml   |  46 +-
 ...d_contact.xml => activity_contact_add.xml} |  43 +-
 ..._contact.xml => activity_contact_edit.xml} |  47 +-
 .../main/res/layout/activity_contact_list.xml |   7 +-
 app/src/main/res/layout/activity_dailyapp.xml |  17 +-
 app/src/main/res/layout/activity_dock.xml     |  16 +-
 .../main/res/layout/activity_flashlight.xml   |  40 +-
 app/src/main/res/layout/activity_network.xml  |  41 +-
 app/src/main/res/layout/activity_phone.xml    |   4 +-
 app/src/main/res/layout/activity_setting.xml  | 391 +++++------
 .../main/res/layout/activity_wechat_call.xml  |  22 +-
 .../main/res/layout/dialog_edit_contact.xml   |  21 +-
 app/src/main/res/layout/fragment_contact.xml  |  13 +-
 ...ent_dialer_new.xml => fragment_dialer.xml} |   9 +-
 app/src/main/res/layout/item_alarm_clock.xml  | 100 +--
 app/src/main/res/layout/item_alarm_port.xml   | 180 -----
 app/src/main/res/layout/item_contact.xml      |   8 +-
 .../main/res/layout/item_contact_wechat.xml   |   1 -
 app/src/main/res/layout/item_daily_app.xml    |   2 +-
 .../main/res/layout/item_dock_app_select.xml  |   3 +-
 app/src/main/res/layout/popup_type.xml        |  40 ++
 app/src/main/res/values/colors.xml            |   8 +-
 95 files changed, 1152 insertions(+), 4268 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/icon_turn_off.png
 create mode 100644 app/src/main/res/drawable-hdpi/icon_turn_on.png
 delete mode 100644 app/src/main/res/layout-sw700dp/activity_add_contact.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/activity_main.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/activity_setting.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/activity_sim_card.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/activity_touch.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/fragment_applist.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/fragment_contact_home.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/fragment_home.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/fragment_settings.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/item_actions.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/item_contact_wechat.xml
 delete mode 100644 app/src/main/res/layout-sw700dp/item_dock_app.xml
 rename app/src/main/res/layout/{activity_add_contact.xml => activity_contact_add.xml} (93%)
 rename app/src/main/res/layout/{activity_edit_contact.xml => activity_contact_edit.xml} (92%)
 rename app/src/main/res/layout/{fragment_dialer_new.xml => fragment_dialer.xml} (99%)
 delete mode 100644 app/src/main/res/layout/item_alarm_port.xml
 create mode 100644 app/src/main/res/layout/popup_type.xml

diff --git a/app/build.gradle b/app/build.gradle
index bc02692..bb346c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,9 @@ android {
         applicationId "com.vscool.os"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0.0"
+        
+        versionCode 201
+        versionName "2.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java b/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java
index 7591351..f478726 100644
--- a/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/FlashlightActivity.java
@@ -31,9 +31,9 @@ public class FlashlightActivity extends BaseDataBindingActivity {
             super.onChange(selfChange);
             Log.e("mFlashLightObserver", "onChange: " + Settings.System.getInt(getContentResolver(), Settings.Secure.FLASHLIGHT_ENABLED, 0));
             if (isFlashlightEnabled()) {
-                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_open));
+                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_on));
             } else {
-                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_close));
+                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_off));
             }
         }
     };
@@ -60,12 +60,12 @@ public class FlashlightActivity extends BaseDataBindingActivity {
         cameraManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
         if (isFlashlightAvailable()) {
             if (isFlashlightEnabled()) {
-                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_open));
+                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_on));
             } else {
-                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_close));
+                mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_off));
             }
         } else {
-            mBinding.tvFlashlightStatu.setText("手电筒不可用");
+//            mBinding.tvFlashlightStatu.setText("手电筒不可用");
         }
         mBinding.clTrun.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -78,7 +78,7 @@ public class FlashlightActivity extends BaseDataBindingActivity {
                         } catch (CameraAccessException e) {
                             e.printStackTrace();
                         }
-                        mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_close));
+                        mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_off));
                         Settings.Secure.putInt(getContentResolver(), Settings.Secure.FLASHLIGHT_ENABLED, 0);
                     } else {
                         try {
@@ -87,7 +87,7 @@ public class FlashlightActivity extends BaseDataBindingActivity {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-                        mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_open));
+                        mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_on));
                         Settings.Secure.putInt(getContentResolver(), Settings.Secure.FLASHLIGHT_ENABLED, 1);
                     }
                 } else {
diff --git a/app/src/main/java/com/vscool/os/activity/NetworkActivity.java b/app/src/main/java/com/vscool/os/activity/NetworkActivity.java
index a6b23f7..2c715ce 100644
--- a/app/src/main/java/com/vscool/os/activity/NetworkActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/NetworkActivity.java
@@ -76,9 +76,9 @@ public class NetworkActivity extends BaseDataBindingActivity implements NetworkU
 
     private void setDataStatus() {
         if (getDataEnabled()) {
-            mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_open));
+            mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_on));
         } else {
-            mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_flash_light_close));
+            mBinding.ivStatu.setImageDrawable(getDrawable(R.drawable.icon_turn_off));
         }
     }
 
diff --git a/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java
index fff75d8..6669d80 100644
--- a/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/alarm/add/AlarmAddActivity.java
@@ -1,11 +1,14 @@
 package com.vscool.os.activity.alarm.add;
 
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
@@ -79,35 +82,6 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
     @Override
     public void initView() {
         initTimePicker();
-
-        mViewDataBinding.rb1.setChecked(true);
-        mViewDataBinding.rb1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-                if (isChecked) {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
-                    mViewDataBinding.rb1.setTextColor(colorStateList);
-                    mDayType = 1;
-                } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
-                    mViewDataBinding.rb1.setTextColor(colorStateList);
-                }
-            }
-        });
-        mViewDataBinding.rb2.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-                if (isChecked) {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
-                    mViewDataBinding.rb2.setTextColor(colorStateList);
-                    mDayType = 2;
-                } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
-                    mViewDataBinding.rb2.setTextColor(colorStateList);
-                }
-            }
-        });
-
     }
 
     @Override
@@ -115,7 +89,6 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
 
     }
 
-
     private void checkContent() {
         pvTime.returnData();
 //        if (TextUtils.isEmpty(mViewDataBinding.etActivation.getText())) {
@@ -240,7 +213,11 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
                 .setDate(selectedDate)
                 .setRangDate(startDate, selectedDate)
                 .setDecorView(mViewDataBinding.clContent)//非dialog模式下,设置ViewGroup, pickerView将会添加到这个ViewGroup中
-                .setOutSideColor(0x00000000)
+//                .setOutSideColor(getResources().getColor(R.color.default_color))
+                .setBgColor(getResources().getColor(R.color.default_color))
+                .setTextColorOut(getResources().getColor(R.color.black))
+                .setTextColorCenter(getResources().getColor(R.color.black))
+                .setDividerColor(getResources().getColor(R.color.black))
                 .setOutSideCancelable(false)
                 .build();
         pvTime.setKeyBackCancelable(false);//系统返回键监听屏蔽掉
@@ -258,6 +235,7 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
         return format.format(date);
     }
 
+    private PopupWindow mTypePopupWindow;
 
     public class Click {
         public void exit(View view) {
@@ -271,5 +249,57 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
         public void submit(View view) {
             checkContent();
         }
+
+        public void setType(View view) {
+            if (mTypePopupWindow == null) {
+                mTypePopupWindow = new PopupWindow();
+                View inflate = LayoutInflater.from(AlarmAddActivity.this).inflate(R.layout.popup_type, null);
+                TextView tv_once = inflate.findViewById(R.id.tv_once);
+                tv_once.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mDayType = 1;
+                        mTypePopupWindow.dismiss();
+                    }
+                });
+                TextView tv_loop = inflate.findViewById(R.id.tv_loop);
+                tv_loop.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mDayType = 2;
+                        mTypePopupWindow.dismiss();
+                    }
+                });
+                //设置view布局
+                mTypePopupWindow.setContentView(inflate);
+                mTypePopupWindow.setWidth(LinearLayout.LayoutParams.WRAP_CONTENT);
+                mTypePopupWindow.setHeight(LinearLayout.LayoutParams.WRAP_CONTENT);
+                //设置动画的方法
+//                mTypePopupWindow.setAnimationStyle(R.style.BottomDialog);
+                //设置PopUpWindow的焦点，设置为true之后，PopupWindow内容区域，才可以响应点击事件
+                mTypePopupWindow.setTouchable(true);
+                //设置背景透明
+                mTypePopupWindow.setBackgroundDrawable(new ColorDrawable(0x00000000));
+                //点击空白处的时候让PopupWindow消失
+                mTypePopupWindow.setOutsideTouchable(true);
+                // true时，点击返回键先消失 mTypePopupWindow
+                // 但是设置为true时setOutsideTouchable，setTouchable方法就失效了（点击外部不消失，内容区域也不响应事件）
+                // false时PopupWindow不处理返回键，默认是false
+                mTypePopupWindow.setFocusable(false);
+
+                //设置dismiss事件
+                mTypePopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+
+                    }
+                });
+            }
+            boolean showing = mTypePopupWindow.isShowing();
+            if (!showing) {
+                //show，并且可以设置位置
+                mTypePopupWindow.showAsDropDown(mViewDataBinding.tvType);
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java
index b413dbc..a7739f0 100644
--- a/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/alarm/edit/AlarmEditActivity.java
@@ -1,12 +1,15 @@
 package com.vscool.os.activity.alarm.edit;
 
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
@@ -92,33 +95,6 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
     @Override
     public void initView() {
         initTimePicker();
-
-        mViewDataBinding.rb1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (b) {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
-                    mViewDataBinding.rb1.setTextColor(colorStateList);
-                    mDayType = 1;
-                } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
-                    mViewDataBinding.rb1.setTextColor(colorStateList);
-                }
-            }
-        });
-        mViewDataBinding.rb2.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (b) {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
-                    mViewDataBinding.rb2.setTextColor(colorStateList);
-                    mDayType = 2;
-                } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
-                    mViewDataBinding.rb2.setTextColor(colorStateList);
-                }
-            }
-        });
     }
 
     @Override
@@ -145,21 +121,12 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
         switch (mDayType) {
             default:
             case AlarmUtils.ONCE:
-                mViewDataBinding.rb1.setChecked(true);
-//                tvType.setText("只响一次");
+                mViewDataBinding.tvType.setText("一次");
                 break;
             case AlarmUtils.LOOP:
-                mViewDataBinding.rb2.setChecked(true);
-//                tvType.setText("每天");
+                mViewDataBinding.tvType.setText("每天");
                 break;
-//            case AlarmUtils.WORKING_DAY:
-//                rb3.setChecked(true);
-//                tvType.setText("周一至周五");
-//                break;
-//            case AlarmUtils.OFF_DAY:
-//                rb4.setChecked(true);
-//                tvType.setText("周六至周日");
-//                break;
+
         }
         String time = mAlarmClockData.getTime();
         Calendar date = getTime(time);
@@ -373,7 +340,11 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
                 .setDate(selectedDate)
                 .setRangDate(startDate, selectedDate)
                 .setDecorView(mViewDataBinding.clContent)//非dialog模式下,设置ViewGroup, pickerView将会添加到这个ViewGroup中
-                .setOutSideColor(0x00000000)
+//                .setOutSideColor(0x00000000)
+                .setBgColor(getResources().getColor(R.color.default_color))
+                .setTextColorOut(getResources().getColor(R.color.black))
+                .setTextColorCenter(getResources().getColor(R.color.black))
+                .setDividerColor(getResources().getColor(R.color.black))
                 .setOutSideCancelable(false)
                 .build();
         pvTime.setKeyBackCancelable(false);//系统返回键监听屏蔽掉
@@ -410,6 +381,8 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
         }
     }
 
+    private PopupWindow mTypePopupWindow;
+
     public class Click {
         public void exit(View view) {
             finish();
@@ -422,6 +395,58 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
         public void submit(View view) {
             checkContent();
         }
+
+        public void setType(View view) {
+            if (mTypePopupWindow == null) {
+                mTypePopupWindow = new PopupWindow();
+                View inflate = LayoutInflater.from(AlarmEditActivity.this).inflate(R.layout.popup_type, null);
+                TextView tv_once = inflate.findViewById(R.id.tv_once);
+                tv_once.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mDayType = 1;
+                        mTypePopupWindow.dismiss();
+                    }
+                });
+                TextView tv_loop = inflate.findViewById(R.id.tv_loop);
+                tv_loop.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mDayType = 2;
+                        mTypePopupWindow.dismiss();
+                    }
+                });
+                //设置view布局
+                mTypePopupWindow.setContentView(inflate);
+                mTypePopupWindow.setWidth(LinearLayout.LayoutParams.WRAP_CONTENT);
+                mTypePopupWindow.setHeight(LinearLayout.LayoutParams.WRAP_CONTENT);
+                //设置动画的方法
+//                mTypePopupWindow.setAnimationStyle(R.style.BottomDialog);
+                //设置PopUpWindow的焦点，设置为true之后，PopupWindow内容区域，才可以响应点击事件
+                mTypePopupWindow.setTouchable(true);
+                //设置背景透明
+                mTypePopupWindow.setBackgroundDrawable(new ColorDrawable(0x00000000));
+                //点击空白处的时候让PopupWindow消失
+                mTypePopupWindow.setOutsideTouchable(true);
+                // true时，点击返回键先消失 mTypePopupWindow
+                // 但是设置为true时setOutsideTouchable，setTouchable方法就失效了（点击外部不消失，内容区域也不响应事件）
+                // false时PopupWindow不处理返回键，默认是false
+                mTypePopupWindow.setFocusable(false);
+
+                //设置dismiss事件
+                mTypePopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+
+                    }
+                });
+            }
+            boolean showing = mTypePopupWindow.isShowing();
+            if (!showing) {
+                //show，并且可以设置位置
+                mTypePopupWindow.showAsDropDown(mViewDataBinding.tvType);
+            }
+        }
     }
 
 }
diff --git a/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java
index 368b393..4057e93 100644
--- a/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/callwechat/CallWechatActivity.java
@@ -70,7 +70,7 @@ public class CallWechatActivity extends BaseMvvmActivity<CallWechatViewModel, Ac
     private boolean checkSettings() {
         boolean accessibility = AccessibilityUtils.isAccessibilitySettingsOn(this);
         if (!accessibility) {
-            Toast.makeText(this, "请在无障碍服务中打开 - 关爱守护快捷服务", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, "请在无障碍服务中打开 - 亲情桌面快捷服务", Toast.LENGTH_LONG).show();
             startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS));
         }
         return accessibility;
diff --git a/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java b/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java
index 1a3f089..8055953 100644
--- a/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/contact/AddContactActivity.java
@@ -31,7 +31,7 @@ import com.vscool.os.base.mvvm.BaseMvvmActivity;
 import com.vscool.os.bean.Contact;
 import com.vscool.os.config.CommonConfig;
 import com.vscool.os.custom.GlideEngine;
-import com.vscool.os.databinding.ActivityAddContactBinding;
+import com.vscool.os.databinding.ActivityContactAddBinding;
 import com.vscool.os.db.ContactCacheUtils;
 import com.vscool.os.utils.ContactsUtils;
 import com.vscool.os.utils.LocalContactUtils;
@@ -45,7 +45,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
-public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, ActivityAddContactBinding> {
+public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, ActivityContactAddBinding> {
     private static final String TAG = "AddContactActivity";
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
@@ -64,7 +64,7 @@ public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, Ac
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_add_contact;
+        return R.layout.activity_contact_add;
     }
 
     @Override
diff --git a/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java b/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java
index 14cfcb9..51aba4c 100644
--- a/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java
+++ b/app/src/main/java/com/vscool/os/activity/contact/AddContactViewModel.java
@@ -13,7 +13,7 @@ import com.vscool.os.R;
 import com.vscool.os.base.mvvm.BaseViewModel;
 import com.vscool.os.bean.BaseResponse;
 import com.vscool.os.bean.Contact;
-import com.vscool.os.databinding.ActivityAddContactBinding;
+import com.vscool.os.databinding.ActivityContactAddBinding;
 import com.vscool.os.network.NetInterfaceManager;
 import com.vscool.os.utils.FileUtil;
 import com.vscool.os.utils.Utils;
@@ -30,11 +30,11 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-public class AddContactViewModel extends BaseViewModel<ActivityAddContactBinding, ActivityEvent> {
+public class AddContactViewModel extends BaseViewModel<ActivityContactAddBinding, ActivityEvent> {
     private static final String TAG = "AddContactViewModel";
 
     @Override
-    public ActivityAddContactBinding getVDBinding() {
+    public ActivityContactAddBinding getVDBinding() {
         return binding;
     }
 
diff --git a/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java b/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java
index faddde3..620c56f 100644
--- a/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/contact/EditContactActivity.java
@@ -26,7 +26,7 @@ import com.vscool.os.base.mvvm.BaseMvvmActivity;
 import com.vscool.os.bean.BaseResponse;
 import com.vscool.os.bean.Contact;
 import com.vscool.os.custom.GlideEngine;
-import com.vscool.os.databinding.ActivityEditContactBinding;
+import com.vscool.os.databinding.ActivityContactEditBinding;
 import com.vscool.os.utils.FileUtil;
 import com.vscool.os.utils.ScreenUtil;
 import com.vscool.os.utils.Utils;
@@ -41,7 +41,7 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel, ActivityEditContactBinding> {
+public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel, ActivityContactEditBinding> {
     private static final String TAG = "EditContactActivity";
 
     private LoadingDialog mLoadingDialog;
@@ -55,7 +55,7 @@ public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel,
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_edit_contact;
+        return R.layout.activity_contact_edit;
     }
 
     @Override
diff --git a/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java b/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java
index 344c634..20c8048 100644
--- a/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java
+++ b/app/src/main/java/com/vscool/os/activity/contact/EditContactViewModel.java
@@ -8,7 +8,7 @@ import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.vscool.os.base.mvvm.BaseViewModel;
 import com.vscool.os.bean.BaseResponse;
-import com.vscool.os.databinding.ActivityEditContactBinding;
+import com.vscool.os.databinding.ActivityContactEditBinding;
 import com.vscool.os.network.NetInterfaceManager;
 
 import java.util.Map;
@@ -18,10 +18,10 @@ import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import okhttp3.MultipartBody;
 
-public class EditContactViewModel extends BaseViewModel<ActivityEditContactBinding, ActivityEvent> {
+public class EditContactViewModel extends BaseViewModel<ActivityContactEditBinding, ActivityEvent> {
 
     @Override
-    public ActivityEditContactBinding getVDBinding() {
+    public ActivityContactEditBinding getVDBinding() {
         return binding;
     }
 
diff --git a/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java
index 0246f7c..2354888 100644
--- a/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/dailyapp/DailyAppActivity.java
@@ -16,7 +16,7 @@ import com.vscool.os.view.GridSpaceItemDecoration;
 
 import java.util.List;
 
-public class DailyAppActivity extends BaseMvvmActivity<DailyAppViewModel, ActivityDailyappBinding> implements NotificationService.NotificationListener{
+public class DailyAppActivity extends BaseMvvmActivity<DailyAppViewModel, ActivityDailyappBinding> implements NotificationService.NotificationListener {
     private static final String TAG = "DailyAppActivity";
 
     private DailyAppAdapter mDailyAppAdapter;
@@ -27,8 +27,8 @@ public class DailyAppActivity extends BaseMvvmActivity<DailyAppViewModel, Activi
     }
 
     @Override
-    public boolean setfitWindow() {
-        return false;
+    public boolean setNightMode() {
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java b/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java
index 13f325b..0de34a1 100644
--- a/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/dock/DockActivity.java
@@ -32,11 +32,16 @@ public class DockActivity extends BaseMvvmActivity<DockViewModel, ActivityDockBi
 
     private DockAppSelectedAdapter mDockAppSelectedAdapter;
 
-    public static final List<String> INCLUDE_SYSTEM_APP =new ArrayList<String>(){{
+    public static final List<String> INCLUDE_SYSTEM_APP = new ArrayList<String>() {{
         this.add("com.android.mms");//信息
         this.add("com.mediatek.camera");
     }};
 
+    @Override
+    public boolean setNightMode() {
+        return true;
+    }
+
     @Override
     protected void initDataBinding() {
         mViewModel.setCtx(this);
diff --git a/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java b/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java
index 6ed6e90..93b63f5 100644
--- a/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/phone/PhoneActivity.java
@@ -32,6 +32,11 @@ public class PhoneActivity extends BaseMvvmActivity<PhoneViewModel, ActivityPhon
     private RecordFragment mRecordFragment;
     private ContactFragment mContactFragment;
 
+    @Override
+    public boolean setNightMode() {
+        return true;
+    }
+
     @Override
     public boolean setfitWindow() {
         return true;
diff --git a/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java b/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java
index 58de006..16a2e03 100644
--- a/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java
+++ b/app/src/main/java/com/vscool/os/activity/setting/SettingActivity.java
@@ -34,6 +34,7 @@ import com.vscool.os.service.WeAccessibilityService;
 import com.vscool.os.service.main.MainService;
 import com.vscool.os.utils.AccessibilityUtils;
 import com.vscool.os.utils.ApkUtils;
+import com.vscool.os.view.ToggleButton;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -50,6 +51,11 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             Manifest.permission.RECEIVE_SMS,
     };
 
+    @Override
+    public boolean setNightMode() {
+        return true;
+    }
+
     @Override
     public boolean setfitWindow() {
         return true;
@@ -70,7 +76,80 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
 
     @Override
     protected void initView() {
-        mViewDataBinding.setVersionName(BuildConfig.VERSION_NAME);
+        mViewDataBinding.tbFloat.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                if (on) {
+                    showFloatingWindow();
+                } else {
+                    hideFloatingWindow();
+                }
+            }
+        });
+        mViewDataBinding.tbSms.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                setVoiceBroadcast(on);
+            }
+        });
+        mViewDataBinding.tbAuto.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                setAutoAccept(on);
+            }
+        });
+        mViewDataBinding.tbDialer.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                Log.e(TAG, "setDialTone: dialTone = " + on);
+                mMMKV.encode(CommonConfig.DISABLE_DIAL_TONE_MODIFY, on);
+            }
+        });
+        mViewDataBinding.tbStatu.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                String statusbarStatus;
+                if (on) {
+                    statusbarStatus = CommonConfig.ACTION_SHOW_STATUS_BAR;
+                } else {
+                    statusbarStatus = CommonConfig.ACTION_HIDE_STATUS_BAR;
+                }
+                Intent statusIntent = new Intent(statusbarStatus);
+//            statusIntent.setPackage("com.android.settings");
+                sendBroadcast(statusIntent);
+
+                Log.e(TAG, "setStatusBar: statusBar = " + on);
+                Settings.System.putInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, on ? 1 : 0);
+            }
+        });
+        mViewDataBinding.tbHourly.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                Log.e(TAG, "setHourlyTimeSignal: hourly_time = " + on);
+                mMMKV.encode(CommonConfig.HOURLY_TIME_SIGNAL_KEY, on);
+            }
+        });
+        mViewDataBinding.tbVolume.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                Log.e(TAG, "disableVolumeKey: disableKey = " + on);
+                mMMKV.encode(CommonConfig.DISABLE_VOLUME_KEY, !on);
+            }
+        });
+        mViewDataBinding.tbContact.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                Log.e(TAG, "disableVolumeKey: contactModify = " + on);
+                mMMKV.encode(CommonConfig.DISABLE_CONTACT_MODIFY, !on);
+            }
+        });
+        mViewDataBinding.tbClock.setOnToggleChanged(new ToggleButton.OnToggleChanged() {
+            @Override
+            public void onToggle(boolean on) {
+                Log.e(TAG, "disableVolumeKey: clockModify = " + on);
+                mMMKV.encode(CommonConfig.DISABLE_CLOCK_MODIFY, !on);
+            }
+        });
     }
 
     @Override
@@ -112,28 +191,40 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
     private void setStatus() {
         boolean showFloatWindow = Settings.Global.getInt(getContentResolver(), CommonConfig.HOVER_HOME, CommonConfig.HOVER_HOME_STATUS) == 1;
         Log.e(TAG, "initView: showFloatWindow = " + showFloatWindow);
-        mViewDataBinding.setFloatWindowEnable(showFloatWindow);
+        mViewDataBinding.tbFloat.setToggleStatu(showFloatWindow);
 
         boolean voiceBroadcast = mMMKV.decodeBool(CommonConfig.VOICE_BROADCAST, false);
         Log.e(TAG, "initView: voiceBroadcast = " + voiceBroadcast);
-        mViewDataBinding.setVoiceBroadcast(voiceBroadcast);
+        mViewDataBinding.tbSms.setToggleStatu(voiceBroadcast);
 
         boolean autoAccept = mMMKV.decodeBool(CommonConfig.WECHAT_CALL_AUTO_ACCEPT, false);
         Log.e(TAG, "initView: autoAccept = " + autoAccept);
-        mViewDataBinding.setAutoAccept(autoAccept);
+        mViewDataBinding.tbAuto.setToggleStatu(autoAccept);
 
         boolean dialTone = mMMKV.decodeBool(CommonConfig.DISABLE_DIAL_TONE_MODIFY, true);
         Log.e(TAG, "initView: dialTone = " + dialTone);
-        mViewDataBinding.setDialTone(dialTone);
+        mViewDataBinding.tbDialer.setToggleStatu(dialTone);
 
         int code = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 0);
         boolean statusBar = code == 1;
-        Log.e(TAG, "setStatusBar: statusBar = " + statusBar);
-        mViewDataBinding.setStatusBar(statusBar);
+        Log.e(TAG, "initView: statusBar = " + statusBar);
+        mViewDataBinding.tbStatu.setToggleStatu(statusBar);
 
-        boolean hourly_time = mMMKV.decodeBool(CommonConfig.HOURLY_TIME_SIGNAL_KEY, false);
-        Log.e(TAG, "setHourlyTimeSignal: hourly_time = " + hourly_time);
-        mViewDataBinding.setHourlyTime(hourly_time);
+        boolean hourlyTime = mMMKV.decodeBool(CommonConfig.HOURLY_TIME_SIGNAL_KEY, false);
+        Log.e(TAG, "initView: hourlyTime = " + hourlyTime);
+        mViewDataBinding.tbHourly.setToggleStatu(hourlyTime);
+
+        boolean disableKey = mMMKV.decodeBool(CommonConfig.DISABLE_VOLUME_KEY, false);
+        Log.e(TAG, "initView: disableKey = " + disableKey);
+        mViewDataBinding.tbVolume.setToggleStatu(!disableKey);
+
+        boolean contactModify = mMMKV.decodeBool(CommonConfig.DISABLE_CONTACT_MODIFY, false);
+        Log.e(TAG, "initView: contactModify = " + contactModify);
+        mViewDataBinding.tbContact.setToggleStatu(!contactModify);
+
+        boolean clockModify = mMMKV.decodeBool(CommonConfig.DISABLE_CLOCK_MODIFY, false);
+        Log.e(TAG, "initView: clockModify = " + clockModify);
+        mViewDataBinding.tbClock.setToggleStatu(!clockModify);
     }
 
     private static final int REQUEST_CODE_DRAW_OVER_OTHER_APPS_PERMISSION = 200;
@@ -162,15 +253,14 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
     }
 
     private void showFloatingWindow() {
-        mViewDataBinding.setFloatWindowEnable(true);
+        mViewDataBinding.tbFloat.setToggleStatu(true);
         Settings.Global.putInt(getContentResolver(), CommonConfig.HOVER_HOME, 1);
         startService(new Intent(SettingActivity.this, MainService.class));
         sendBroadcast(new Intent(MainService.ACTION_FLOAT_WINDOW_ON));
     }
 
-
     private void hideFloatingWindow() {
-        mViewDataBinding.setFloatWindowEnable(false);
+        mViewDataBinding.tbFloat.setToggleStatu(false);
         Settings.Global.putInt(getContentResolver(), CommonConfig.HOVER_HOME, 0);
         startService(new Intent(SettingActivity.this, MainService.class));
         sendBroadcast(new Intent(MainService.ACTION_FLOAT_WINDOW_OFF));
@@ -218,6 +308,41 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
         }
     }
 
+    private void setVoiceBroadcast(boolean on) {
+        if (on) {
+            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(SettingActivity.this, Manifest.permission.READ_SMS)) {
+                ActivityCompat.requestPermissions(SettingActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
+                Toast.makeText(SettingActivity.this, "请授予读取短信权限", Toast.LENGTH_LONG).show();
+                return;
+            }
+            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(SettingActivity.this, Manifest.permission.RECEIVE_SMS)) {
+                ActivityCompat.requestPermissions(SettingActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
+                Toast.makeText(SettingActivity.this, "请授予接收短信权限", Toast.LENGTH_LONG).show();
+                return;
+            }
+        }
+        mMMKV.encode(CommonConfig.VOICE_BROADCAST, on);
+        mViewDataBinding.tbSms.setToggleStatu(on);
+    }
+
+    public void setAutoAccept(boolean on) {
+        if (AccessibilityUtils.isAccessibilitySettingsOn(SettingActivity.this)) {
+            mMMKV.encode(CommonConfig.WECHAT_CALL_AUTO_ACCEPT, on);
+            Intent intent = new Intent(WeAccessibilityService.SETTING_AUTOMATIC_ANSWER_ACTION);
+            intent.putExtra("auto_answer", on);
+            sendBroadcast(intent);
+        } else {
+            boolean floatWindowEnable = Settings.Global.getInt(getContentResolver(), CommonConfig.HOVER_HOME, CommonConfig.HOVER_HOME_STATUS) == 1;
+            if (floatWindowEnable) {
+                Toaster.showLong("因为系统限制，请先关闭 主页按钮 功能，开启自动接听后再打开");
+                mViewDataBinding.tbAuto.setToggleOff();
+            } else {
+                Toast.makeText(SettingActivity.this, "请在无障碍服务中打开 - 亲情桌面快捷服务", Toast.LENGTH_LONG).show();
+                startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS));
+            }
+        }
+    }
+
     public class BtnClick {
         public void openFloat(View view) {
             boolean floatWindowEnable = Settings.Global.getInt(getContentResolver(), CommonConfig.HOVER_HOME, CommonConfig.HOVER_HOME_STATUS) == 1;
@@ -241,22 +366,10 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             }
         }
 
-
         public void voiceBroadcast(View view) {
-            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(SettingActivity.this, Manifest.permission.READ_SMS)) {
-                ActivityCompat.requestPermissions(SettingActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
-                Toast.makeText(SettingActivity.this, "请授予读取短信权限", Toast.LENGTH_LONG).show();
-                return;
-            }
-            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(SettingActivity.this, Manifest.permission.RECEIVE_SMS)) {
-                ActivityCompat.requestPermissions(SettingActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
-                Toast.makeText(SettingActivity.this, "请授予接收短信权限", Toast.LENGTH_LONG).show();
-                return;
-            }
             boolean voiceBroadcast = mMMKV.decodeBool(CommonConfig.VOICE_BROADCAST, false);
             Log.e(TAG, "voiceBroadcast: voiceBroadcast = " + voiceBroadcast);
-            mViewDataBinding.setVoiceBroadcast(!voiceBroadcast);
-            mMMKV.encode(CommonConfig.VOICE_BROADCAST, !voiceBroadcast);
+            setVoiceBroadcast(!voiceBroadcast);
         }
 
         private String testText = "TTS（从文本到语音，Text To Speech），是将文本转化为语音，人机对话的一部分，让机器能够说话。\n" +
@@ -272,29 +385,14 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
         }
 
         public void autoAccept(View view) {
-            if (AccessibilityUtils.isAccessibilitySettingsOn(SettingActivity.this)) {
-                boolean autoAccept = mMMKV.decodeBool(CommonConfig.WECHAT_CALL_AUTO_ACCEPT, false);
-                Log.e(TAG, "autoAccept: autoAccept = " + autoAccept);
-                mViewDataBinding.setAutoAccept(!autoAccept);
-                mMMKV.encode(CommonConfig.WECHAT_CALL_AUTO_ACCEPT, !autoAccept);
-                Intent intent = new Intent(WeAccessibilityService.SETTING_AUTOMATIC_ANSWER_ACTION);
-                intent.putExtra("auto_answer", !autoAccept);
-                sendBroadcast(intent);
-            } else {
-                boolean floatWindowEnable = Settings.Global.getInt(getContentResolver(), CommonConfig.HOVER_HOME, CommonConfig.HOVER_HOME_STATUS) == 1;
-                if (floatWindowEnable) {
-                    Toaster.showLong("因为系统限制，请先关闭悬浮窗功能，开启自动接听后再打开悬浮窗");
-                } else {
-                    Toast.makeText(SettingActivity.this, "请在无障碍服务中打开 - 关爱守护快捷服务", Toast.LENGTH_LONG).show();
-                    startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS));
-                }
-            }
+            boolean autoAccept = mMMKV.decodeBool(CommonConfig.WECHAT_CALL_AUTO_ACCEPT, false);
+            Log.e(TAG, "autoAccept: autoAccept = " + autoAccept);
+            setAutoAccept(!autoAccept);
         }
 
         public void setDialTone(View view) {
             boolean dialTone = mMMKV.decodeBool(CommonConfig.DISABLE_DIAL_TONE_MODIFY, true);
             Log.e(TAG, "setDialTone: dialTone = " + dialTone);
-            mViewDataBinding.setDialTone(!dialTone);
             mMMKV.encode(CommonConfig.DISABLE_DIAL_TONE_MODIFY, !dialTone);
         }
 
@@ -302,9 +400,27 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             boolean hourly_time = mMMKV.decodeBool(CommonConfig.HOURLY_TIME_SIGNAL_KEY, false);
             Log.e(TAG, "setHourlyTimeSignal: hourly_time = " + hourly_time);
             mMMKV.encode(CommonConfig.HOURLY_TIME_SIGNAL_KEY, !hourly_time);
-            mViewDataBinding.setHourlyTime(!hourly_time);
         }
 
+        public void disableVolumeKey(View view) {
+            boolean disableKey = mMMKV.decodeBool(CommonConfig.DISABLE_VOLUME_KEY, false);
+            Log.e(TAG, "disableVolumeKey: disableKey = " + disableKey);
+            mMMKV.encode(CommonConfig.DISABLE_VOLUME_KEY, !disableKey);
+        }
+
+        public void disableContactModify(View view) {
+            boolean contactModify = mMMKV.decodeBool(CommonConfig.DISABLE_CONTACT_MODIFY, false);
+            Log.e(TAG, "disableVolumeKey: contactModify = " + contactModify);
+            mMMKV.encode(CommonConfig.DISABLE_CONTACT_MODIFY, !contactModify);
+        }
+
+        public void disableClockModify(View view) {
+            boolean clockModify = mMMKV.decodeBool(CommonConfig.DISABLE_CLOCK_MODIFY, false);
+            Log.e(TAG, "disableVolumeKey: clockModify = " + clockModify);
+            mMMKV.encode(CommonConfig.DISABLE_CLOCK_MODIFY, !clockModify);
+        }
+
+
         public void setStatusBar(View view) {
             int code = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 0);
             boolean statusBar = code == 1;
@@ -319,7 +435,6 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             sendBroadcast(statusIntent);
 
             Log.e(TAG, "setStatusBar: old statusBar = " + statusBar);
-            mViewDataBinding.setStatusBar(!statusBar);
             Settings.System.putInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, code == 1 ? 0 : 1);
         }
 
diff --git a/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java b/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java
index 7bf5cbe..e2d7b04 100644
--- a/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java
+++ b/app/src/main/java/com/vscool/os/adapter/ContactAdapter.java
@@ -125,13 +125,13 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
         contactHolder.tv_name.setText(contact.getName());
         if (DIALER_PACKAGE.equals(contact.getMobile())) {
             contactHolder.cl_contact.setVisibility(View.GONE);
-            contactHolder.iv_head2.setVisibility(View.VISIBLE);
+//            contactHolder.iv_head2.setVisibility(View.VISIBLE);
             contactHolder.tv_phone.setText("");
         } else if (DIALER_ADD_CONTACT.equals(contact.getMobile())) {
             Glide.with(contactHolder.iv_head).load(R.drawable.icon_contact_add).error(R.drawable.icon_contact_add).into(contactHolder.iv_head);
         } else {
             contactHolder.cl_contact.setVisibility(View.VISIBLE);
-            contactHolder.iv_head2.setVisibility(View.GONE);
+//            contactHolder.iv_head2.setVisibility(View.GONE);
             contactHolder.tv_phone.setText(contact.getMobile());
             GlideLoadUtils.getInstance().glideLoad(mContext, contact.getAvatar(), contactHolder.iv_head, R.drawable.default_avatar);
 //            Glide.with(contactHolder.iv_head).load(contact.getAvatar()).error(R.drawable.default_avatar).into(contactHolder.iv_head);
@@ -161,7 +161,6 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
         ConstraintLayout root;
         ConstraintLayout cl_contact;
         NiceImageView iv_head;
-        NiceImageView iv_head2;
         TextView tv_name;
         TextView tv_phone;
         ImageView iv_sim, iv_clear;
diff --git a/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java b/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java
index a3a6feb..74ba9f9 100644
--- a/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java
+++ b/app/src/main/java/com/vscool/os/adapter/DailyAppAdapter.java
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.hjq.toast.Toaster;
 import com.vscool.os.R;
 import com.vscool.os.activity.contact.ContactListActivity;
+import com.vscool.os.activity.phone.PhoneActivity;
 import com.vscool.os.activity.service.ServiceActivity;
 import com.vscool.os.bean.DailyAppBean;
 import com.vscool.os.config.CommonConfig;
@@ -50,7 +51,15 @@ public class DailyAppAdapter extends RecyclerView.Adapter<DailyAppAdapter.Holder
     public void onBindViewHolder(@NonNull Holder holder, int position) {
         DailyAppBean dailyAppBean = mDailyAppBeans.get(position);
         String packageName = dailyAppBean.getPackageName();
-        holder.iv_icon.setImageDrawable(dailyAppBean.getIcon(mContext));
+        switch (packageName) {
+            default:
+                holder.iv_icon.setImageDrawable(dailyAppBean.getIcon(mContext));
+                break;
+            case PackagesName.VSCOOL_DIALER:
+                holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.home_icon_dialer));
+                break;
+        }
+
         holder.tv_name.setText(dailyAppBean.getAppName());
         holder.root.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
@@ -69,6 +78,9 @@ public class DailyAppAdapter extends RecyclerView.Adapter<DailyAppAdapter.Holder
                     case PackagesName.VSCOOL_CONTACTS:
                         mContext.startActivity(new Intent(mContext, ContactListActivity.class));
                         break;
+                    case PackagesName.VSCOOL_DIALER:
+                        mContext.startActivity(new Intent(mContext, PhoneActivity.class));
+                        break;
                     default:
                         ApkUtils.openPackage(mContext, packageName, dailyAppBean.getClassName());
                         AppUsedTimeUtils.getInstance().setAppPackageName(packageName);
@@ -90,7 +102,7 @@ public class DailyAppAdapter extends RecyclerView.Adapter<DailyAppAdapter.Holder
 
 
     private void showDialog(DailyAppBean dailyAppBean) {
-        int appLockCtrl = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.APP_LOCK_CTRL, 0);
+        int appLockCtrl = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.APP_LOCK_CTRL, 1);
         if (appLockCtrl == 0) {
             Toaster.showLong("已禁止桌面编辑");
             return;
diff --git a/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java b/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java
index 624ecdb..e4ba41b 100644
--- a/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java
+++ b/app/src/main/java/com/vscool/os/adapter/DockAppSelectedAdapter.java
@@ -71,10 +71,10 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
         holder.tv_name.setText(dockApp.getAppName());
         if (mSelectedPkgList.contains(dockApp)) {
             holder.iv_select.setImageDrawable(mContext.getDrawable(R.drawable.icon_selected));
-            holder.root.setBackground(mContext.getDrawable(R.drawable.app_select_background));
+//            holder.root.setBackground(mContext.getDrawable(R.drawable.app_select_background));
         } else {
             holder.iv_select.setImageDrawable(mContext.getDrawable(R.drawable.icon_unselected));
-            holder.root.setBackground(mContext.getDrawable(R.drawable.app_unselect_background));
+//            holder.root.setBackground(mContext.getDrawable(R.drawable.app_unselect_background));
         }
 
         holder.iv_select.setOnClickListener(new View.OnClickListener() {
@@ -119,12 +119,12 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
                 } else {
                     mSelectedPkgList.add(dockApp);
                     iv_select.setImageDrawable(mContext.getDrawable(R.drawable.icon_selected));
-                    root.setBackground(mContext.getDrawable(R.drawable.app_select_background));
+//                    root.setBackground(mContext.getDrawable(R.drawable.app_select_background));
                 }
             } else {
                 mSelectedPkgList.remove(dockApp);
                 iv_select.setImageDrawable(mContext.getDrawable(R.drawable.icon_unselected));
-                root.setBackground(mContext.getDrawable(R.drawable.app_unselect_background));
+//                root.setBackground(mContext.getDrawable(R.drawable.app_unselect_background));
             }
             if (mSelectedPkgList.size() == 0) {
                 mMMKV.encode(DockActivity.DOCK_APP_KEY, "");
diff --git a/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java b/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java
index 4729f47..03c310d 100644
--- a/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java
+++ b/app/src/main/java/com/vscool/os/adapter/WechatContactAdapter.java
@@ -113,7 +113,7 @@ public class WechatContactAdapter extends RecyclerView.Adapter<WechatContactAdap
 
     private void checkAccessibility() {
         if (!AccessibilityUtils.isAccessibilitySettingsOn(mContext)) {
-            Toast.makeText(mContext, "请在无障碍服务中打开 - 关爱守护快捷服务", Toast.LENGTH_LONG).show();
+            Toast.makeText(mContext, "请在无障碍服务中打开 - 亲情桌面快捷服务", Toast.LENGTH_LONG).show();
             mContext.startActivity(new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS));
         } else {
             Log.e(TAG, "checkAccessibility: 无障碍服务已打开");
diff --git a/app/src/main/java/com/vscool/os/alarm/AlarmAdapter.java b/app/src/main/java/com/vscool/os/alarm/AlarmAdapter.java
index 2ea268d..cb26140 100644
--- a/app/src/main/java/com/vscool/os/alarm/AlarmAdapter.java
+++ b/app/src/main/java/com/vscool/os/alarm/AlarmAdapter.java
@@ -1,15 +1,10 @@
 package com.vscool.os.alarm;
 
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.media.AudioAttributes;
-import android.media.MediaPlayer;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -17,28 +12,15 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
 import com.vscool.os.R;
 import com.vscool.os.activity.alarm.edit.AlarmEditActivity;
-import com.vscool.os.utils.FFmpegUtils;
-import com.vscool.os.utils.ScreenUtils;
-import com.vscool.os.utils.Utils;
-import com.vscool.os.view.JzvdStdRound;
-import com.vscool.os.view.ToggleButton;
 
-import java.io.File;
-import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
-
 public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
 
     private FragmentActivity mContext;
@@ -62,7 +44,7 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
     @Override
     public holder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         mContext = (FragmentActivity) parent.getContext();
-        return new AlarmAdapter.holder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_alarm_port, parent, false));
+        return new AlarmAdapter.holder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_alarm_clock, parent, false));
     }
 
     @Override
@@ -80,12 +62,12 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
                     e.printStackTrace();
                 }
                 holder.tv_remind_type.setText("一次");
-                holder.tv_remind_type.setBackgroundResource(R.drawable.tv_times_bg_once);
+//                holder.tv_remind_type.setBackgroundResource(R.drawable.tv_times_bg_once);
                 break;
             case AlarmUtils.LOOP:
                 holder.tv_time.setText(alarmClockData.getTime());
                 holder.tv_remind_type.setText("每天");
-                holder.tv_remind_type.setBackgroundResource(R.drawable.tv_times_bg_loop);
+//                holder.tv_remind_type.setBackgroundResource(R.drawable.tv_times_bg_loop);
                 break;
             default:
         }
@@ -96,118 +78,119 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
             holder.tv_title.setText(title);
         }
         int is_onoff = alarmClockData.getIs_onoff();
-        holder.toggleButton2.setDisable(true);
-        if (is_onoff == 1) {
-            holder.tv_status.setText("已开启");
-            holder.toggleButton2.setToggleOn(false);
-        } else {
-            holder.tv_status.setText("已关闭");
-            holder.toggleButton2.setToggleOff(false);
-        }
-        String voice = alarmClockData.getVoice();
-        if (TextUtils.isEmpty(voice)) {
-            holder.cl_voice.setVisibility(View.GONE);
-        } else {
-            holder.cl_voice.setVisibility(View.VISIBLE);
-            MediaPlayer mMediaPlayer = new MediaPlayer();
-            mMediaPlayer.setAudioAttributes(
-                    new AudioAttributes.Builder()
-                            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-                            .build()
-            );
-            mMediaPlayer.setOnCompletionListener(mp -> Log.e("setOnCompletionListener", "onCompletion: "));
-            mMediaPlayer.setOnPreparedListener(mp -> Log.e("setOnPreparedListener", "onPrepared: "));
-            mMediaPlayer.setOnErrorListener((mp, what, extra) -> false);
-            //设置音频文件到MediaPlayer对象中
-            try {
-                mMediaPlayer.setDataSource(voice);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            //让MediaPlayer对象准备，用这个方法防止加载时耗时导致anr
-            mMediaPlayer.prepareAsync();
-            FFmpegUtils.getDurationInMilliseconds(voice, new Observer<Integer>() {
-                @Override
-                public void onSubscribe(@NonNull Disposable d) {
+//        holder.toggleButton2.setDisable(true);
+//        if (is_onoff == 1) {
+//            holder.tv_status.setText("已开启");
+//            holder.toggleButton2.setToggleOn(false);
+//        } else {
+//            holder.tv_status.setText("已关闭");
+//            holder.toggleButton2.setToggleOff(false);
+//        }
+//        String voice = alarmClockData.getVoice();
+//        if (TextUtils.isEmpty(voice)) {
+//            holder.cl_voice.setVisibility(View.GONE);
+//        } else {
+//            holder.cl_voice.setVisibility(View.VISIBLE);
+//            MediaPlayer mMediaPlayer = new MediaPlayer();
+//            mMediaPlayer.setAudioAttributes(
+//                    new AudioAttributes.Builder()
+//                            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+//                            .build()
+//            );
+//            mMediaPlayer.setOnCompletionListener(mp -> Log.e("setOnCompletionListener", "onCompletion: "));
+//            mMediaPlayer.setOnPreparedListener(mp -> Log.e("setOnPreparedListener", "onPrepared: "));
+//            mMediaPlayer.setOnErrorListener((mp, what, extra) -> false);
+//            //设置音频文件到MediaPlayer对象中
+//            try {
+//                mMediaPlayer.setDataSource(voice);
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//            //让MediaPlayer对象准备，用这个方法防止加载时耗时导致anr
+//            mMediaPlayer.prepareAsync();
+//            FFmpegUtils.getDurationInMilliseconds(voice, new Observer<Integer>() {
+//                @Override
+//                public void onSubscribe(@NonNull Disposable d) {
+//
+//                }
+//
+//                @Override
+//                public void onNext(@NonNull Integer integer) {
+//                    holder.tv_voice.setText(integer + "秒");
+//                }
+//
+//                @Override
+//                public void onError(@NonNull Throwable e) {
+//
+//                }
+//
+//                @Override
+//                public void onComplete() {
+//
+//                }
+//            });
+//            holder.cl_voice.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    mMediaPlayer.start();
+//                }
+//            });
+//        }
+//        String fileUrl = alarmClockData.getFile();
+//        if (TextUtils.isEmpty(fileUrl)) {
+//            holder.cl_vp.setVisibility(View.GONE);
+//        } else {
+//            holder.cl_vp.setVisibility(View.VISIBLE);
+//            if (isImgUrl(fileUrl)) {
+//                holder.imageView.setVisibility(View.VISIBLE);
+//                holder.jz_video.setVisibility(View.GONE);
+//                if (!mContext.isDestroyed()) {
+//                    RequestOptions options = new RequestOptions().transform(new RoundedCorners(ScreenUtils.dip2px(mContext, 16F)));
+//                    Glide.with(mContext).load(fileUrl).apply(options).into(holder.imageView);
+//                }
+//            } else {
+//                holder.imageView.setVisibility(View.GONE);
+//                holder.jz_video.setVisibility(View.VISIBLE);
+//                String fileName = Utils.getFileNamefromURL(fileUrl);
+//                File file = new File(Utils.getDownLoadPath(mContext) + fileName);
+//                String path;
+//                if (file.exists() && !file.isDirectory()) {
+//                    path = file.getAbsolutePath();
+//                } else {
+//                    path = fileUrl;
+//                }
+//                holder.jz_video.setUp(path, "");
+//                holder.jz_video.startButton.setImageDrawable(mContext.getDrawable(R.drawable.play));
+//                FFmpegUtils.loadVideoScreenshot(path, new Observer<Bitmap>() {
+//                    @Override
+//                    public void onSubscribe(@NonNull Disposable d) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onNext(@NonNull Bitmap bitmap) {
+//                        if (!mContext.isDestroyed()) {
+//                            RequestOptions options = new RequestOptions().transform(new RoundedCorners(ScreenUtils.dip2px(mContext, 16F)));
+//                            Glide.with(mContext).load(bitmap).apply(options).into(holder.jz_video.posterImageView);
+////                            Glide.with(mContext).load(bitmap).into(holder.imageView);
+//                        }
+//                        holder.jz_video.startButton.setImageDrawable(mContext.getDrawable(R.drawable.play));
+//                    }
+//
+//                    @Override
+//                    public void onError(@NonNull Throwable e) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onComplete() {
+//
+//                    }
+//                });
+//
+//            }
+//        }
 
-                }
-
-                @Override
-                public void onNext(@NonNull Integer integer) {
-                    holder.tv_voice.setText(integer + "秒");
-                }
-
-                @Override
-                public void onError(@NonNull Throwable e) {
-
-                }
-
-                @Override
-                public void onComplete() {
-
-                }
-            });
-            holder.cl_voice.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    mMediaPlayer.start();
-                }
-            });
-        }
-        String fileUrl = alarmClockData.getFile();
-        if (TextUtils.isEmpty(fileUrl)) {
-            holder.cl_vp.setVisibility(View.GONE);
-        } else {
-            holder.cl_vp.setVisibility(View.VISIBLE);
-            if (isImgUrl(fileUrl)) {
-                holder.imageView.setVisibility(View.VISIBLE);
-                holder.jz_video.setVisibility(View.GONE);
-                if (!mContext.isDestroyed()) {
-                    RequestOptions options = new RequestOptions().transform(new RoundedCorners(ScreenUtils.dip2px(mContext, 16F)));
-                    Glide.with(mContext).load(fileUrl).apply(options).into(holder.imageView);
-                }
-            } else {
-                holder.imageView.setVisibility(View.GONE);
-                holder.jz_video.setVisibility(View.VISIBLE);
-                String fileName = Utils.getFileNamefromURL(fileUrl);
-                File file = new File(Utils.getDownLoadPath(mContext) + fileName);
-                String path;
-                if (file.exists() && !file.isDirectory()) {
-                    path = file.getAbsolutePath();
-                } else {
-                    path = fileUrl;
-                }
-                holder.jz_video.setUp(path, "");
-                holder.jz_video.startButton.setImageDrawable(mContext.getDrawable(R.drawable.play));
-                FFmpegUtils.loadVideoScreenshot(path, new Observer<Bitmap>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(@NonNull Bitmap bitmap) {
-                        if (!mContext.isDestroyed()) {
-                            RequestOptions options = new RequestOptions().transform(new RoundedCorners(ScreenUtils.dip2px(mContext, 16F)));
-                            Glide.with(mContext).load(bitmap).apply(options).into(holder.jz_video.posterImageView);
-//                            Glide.with(mContext).load(bitmap).into(holder.imageView);
-                        }
-                        holder.jz_video.startButton.setImageDrawable(mContext.getDrawable(R.drawable.play));
-                    }
-
-                    @Override
-                    public void onError(@NonNull Throwable e) {
-
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-
-            }
-        }
         holder.root.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View view) {
@@ -241,26 +224,15 @@ public class AlarmAdapter extends RecyclerView.Adapter<AlarmAdapter.holder> {
     }
 
     class holder extends RecyclerView.ViewHolder {
-        TextView tv_time, tv_remind_type, tv_title, tv_voice, tv_status;
-        ConstraintLayout cl_voice, cl_vp, root;
-        JzvdStdRound jz_video;
-        ImageView imageView,iv_type;
-        ToggleButton toggleButton2;
+        ConstraintLayout root;
+        TextView tv_time, tv_remind_type, tv_title;
 
         public holder(@NonNull View itemView) {
             super(itemView);
+            root = itemView.findViewById(R.id.root);
             tv_time = itemView.findViewById(R.id.tv_time);
             tv_remind_type = itemView.findViewById(R.id.tv_remind_type);
             tv_title = itemView.findViewById(R.id.tv_title);
-            tv_voice = itemView.findViewById(R.id.tv_voice);
-            cl_voice = itemView.findViewById(R.id.cl_voice);
-            cl_vp = itemView.findViewById(R.id.cl_vp);
-            root = itemView.findViewById(R.id.root);
-            jz_video = itemView.findViewById(R.id.jz_video);
-            imageView = itemView.findViewById(R.id.imageView);
-            iv_type = itemView.findViewById(R.id.iv_type);
-            tv_status = itemView.findViewById(R.id.tv_status);
-            toggleButton2 = itemView.findViewById(R.id.toggleButton2);
         }
     }
 }
diff --git a/app/src/main/java/com/vscool/os/alarm/AlarmUtils.java b/app/src/main/java/com/vscool/os/alarm/AlarmUtils.java
index 040edbf..bced925 100644
--- a/app/src/main/java/com/vscool/os/alarm/AlarmUtils.java
+++ b/app/src/main/java/com/vscool/os/alarm/AlarmUtils.java
@@ -525,8 +525,12 @@ public class AlarmUtils {
      */
     public boolean updateAlarmFinished(int mId) {
         AlarmClockData alarmClockData = getDatabaseSingleAlarm(mId);
-        alarmClockData.setFinished(true);
-        return updateAlarmFinished(alarmClockData);
+        if (alarmClockData != null) {
+            alarmClockData.setFinished(true);
+            return updateAlarmFinished(alarmClockData);
+        } else {
+            return false;
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/vscool/os/base/BaseApplication.java b/app/src/main/java/com/vscool/os/base/BaseApplication.java
index 1514fa6..1240b4f 100644
--- a/app/src/main/java/com/vscool/os/base/BaseApplication.java
+++ b/app/src/main/java/com/vscool/os/base/BaseApplication.java
@@ -67,7 +67,7 @@ public class BaseApplication extends Application {
         ShortcutUtils.init(this);
 
         AmapManager.init(this);
-        HeConfig.init("HE2407111551551292", "28301b41b0ae42c2b6cecf12862ade1f");
+        HeConfig.init("K8GYNVKK7B", "bc49ebd378d1438e8c1eb9e1fd1573c4");
         //切换至开发版服务
         HeConfig.switchToDevService();
 
diff --git a/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java b/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java
index 331774c..d5e2dcb 100644
--- a/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java
+++ b/app/src/main/java/com/vscool/os/fragment/app/AppListFragment.java
@@ -374,7 +374,7 @@ public class AppListFragment extends BaseFragment {
     }
 
     private void showHideDialog(DesktopIcon desktopIcon) {
-        int appLockCtrl = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.APP_LOCK_CTRL, 0);
+        int appLockCtrl = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.APP_LOCK_CTRL, 1);
         if (appLockCtrl == 0) {
             Toaster.showLong("已禁止桌面编辑");
             return;
diff --git a/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerFragment.java b/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerFragment.java
index 250caef..5a74acf 100644
--- a/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerFragment.java
+++ b/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerFragment.java
@@ -20,7 +20,7 @@ import com.vscool.os.activity.contact.AddContactActivity;
 import com.vscool.os.activity.selectnumber.SelectNumberActivity;
 import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment;
 import com.vscool.os.config.CommonConfig;
-import com.vscool.os.databinding.FragmentDialerNewBinding;
+import com.vscool.os.databinding.FragmentDialerBinding;
 import com.vscool.os.utils.ApkUtils;
 import com.vscool.os.utils.Utils;
 
@@ -31,7 +31,7 @@ import java.util.HashMap;
  * Use the {@link DialerFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class DialerFragment extends BaseMvvmFragment<DialerViewModel, FragmentDialerNewBinding> {
+public class DialerFragment extends BaseMvvmFragment<DialerViewModel, FragmentDialerBinding> {
     private static final String TAG = "DialerFragment";
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
@@ -51,7 +51,7 @@ public class DialerFragment extends BaseMvvmFragment<DialerViewModel, FragmentDi
 
     @Override
     protected int getLayoutId() {
-        return R.layout.fragment_dialer_new;
+        return R.layout.fragment_dialer;
     }
 
     @Override
diff --git a/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerViewModel.java b/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerViewModel.java
index aa099f9..61ea069 100644
--- a/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerViewModel.java
+++ b/app/src/main/java/com/vscool/os/fragment/phone/dialer/DialerViewModel.java
@@ -2,11 +2,12 @@ package com.vscool.os.fragment.phone.dialer;
 
 import com.trello.rxlifecycle4.android.FragmentEvent;
 import com.vscool.os.base.mvvm.BaseViewModel;
-import com.vscool.os.databinding.FragmentDialerNewBinding;
+import com.vscool.os.databinding.FragmentDialerBinding;
+
+public class DialerViewModel extends BaseViewModel<FragmentDialerBinding, FragmentEvent> {
 
-public class DialerViewModel extends BaseViewModel<FragmentDialerNewBinding, FragmentEvent> {
     @Override
-    public FragmentDialerNewBinding getVDBinding() {
+    public FragmentDialerBinding getVDBinding() {
         return binding;
     }
 
diff --git a/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java b/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java
index 17bfdae..6f24372 100644
--- a/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java
+++ b/app/src/main/java/com/vscool/os/fragment/settings/SettingsFragment.java
@@ -11,17 +11,12 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 
 import com.blankj.utilcode.util.NetworkUtils;
 import com.hjq.toast.Toaster;
-import com.jeremyliao.liveeventbus.LiveEventBus;
-import com.qweather.sdk.bean.weather.WeatherDailyBean;
-import com.qweather.sdk.bean.weather.WeatherHourlyBean;
-import com.qweather.sdk.bean.weather.WeatherNowBean;
 import com.tencent.mmkv.MMKV;
 import com.vscool.os.R;
 import com.vscool.os.activity.alarm.list.AlarmListActivity;
@@ -31,13 +26,12 @@ import com.vscool.os.activity.emergency.EmergencyActivity;
 import com.vscool.os.activity.setting.SettingActivity;
 import com.vscool.os.activity.weather.WeatherActivity;
 import com.vscool.os.base.mvvm.fragment.BaseMvvmFragment;
-import com.vscool.os.bean.MapBean;
 import com.vscool.os.bean.SystemSettings;
 import com.vscool.os.config.CommonConfig;
 import com.vscool.os.databinding.FragmentSettingsBinding;
 import com.vscool.os.manager.AmapManager;
+import com.vscool.os.manager.DesktopIconManager;
 import com.vscool.os.utils.ApkUtils;
-import com.vscool.os.utils.DayUtils;
 
 import java.util.List;
 
@@ -116,70 +110,6 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
 
     @Override
     protected void initData(Bundle savedInstanceState) {
-        LiveEventBus
-                .get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
-                .observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
-                    @Override
-                    public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
-                        mViewDataBinding.tvTemp.setText(nowBaseBean.getTemp() + "℃");
-                        if (DayUtils.isNight()) {
-//                            mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_night));
-                        } else {
-                            switch (nowBaseBean.getIcon()) {
-                                default:
-                                case "100":
-                                case "150":
-                                    //晴
-//                                    mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather));
-                                    break;
-                                case "102":
-                                case "152":
-                                    //少云
-//                                    mViewDataBinding.clWeather.setBackground(mContext.getDrawable(R.drawable.custom_bg_weather_rain));
-                                    break;
-                            }
-                        }
-//                mViewDataBinding.tvWeather.setText(nowBaseBean.getText());
-                    }
-                });
-
-        LiveEventBus
-                .get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
-                .observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
-                    @Override
-                    public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
-                        String imageName = "he" + hourlyBean.getIcon();
-                        Log.e(TAG, "onSuccess: " + imageName);
-                        if (isAdded()) {
-                            int resId = getResources().getIdentifier(imageName, "drawable", mContext.getPackageName());
-//                            Log.e(TAG, "onSuccess: " + resId);
-//                            if (resId == 0) {
-//                                mViewDataBinding.ivPic.setImageDrawable(mContext.getDrawable(R.drawable.he100));
-//                            } else {
-//                                mViewDataBinding.ivPic.setImageDrawable(mContext.getDrawable(resId));
-//                            }
-                            mViewDataBinding.tvTemp.setText(hourlyBean.getTemp() + "℃");
-                        }
-                    }
-                });
-
-        LiveEventBus
-                .get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
-                .observe(this, new Observer<WeatherDailyBean.DailyBean>() {
-                    @Override
-                    public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
-                        mViewDataBinding.tvWeather.setText(dailyBean.getTempMin() + "℃ - " + dailyBean.getTempMax() + "℃");
-                    }
-                });
-
-        LiveEventBus.get(CommonConfig.AMAP_LOCATION_MAP_BEAN, MapBean.class)
-                .observe(this, new Observer<MapBean>() {
-                    @Override
-                    public void onChanged(@Nullable MapBean mapBean) {
-                        mViewDataBinding.tvLocation2.setText(mapBean.getAddress());
-                    }
-                });
-
         mViewModel.mSystemSettingsData.observe(this, new Observer<SystemSettings>() {
             @Override
             public void onChanged(SystemSettings systemSettings) {
@@ -267,7 +197,8 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
         }
 
         public void toVideoplayer(View view) {
-            ApkUtils.openPackage(mContext, "com.vscool.hvideo", "com.vscool.hvideo.activity.main.MainActivity");
+//            ApkUtils.openPackage(mContext, "com.vscool.hvideo", "com.vscool.hvideo.activity.main.MainActivity");
+            DesktopIconManager.getInstance().openGallery();
         }
 
         public void openAlarmClock(View view) {
diff --git a/app/src/main/java/com/vscool/os/manager/AppStatusManager.java b/app/src/main/java/com/vscool/os/manager/AppStatusManager.java
index bfe9741..c838822 100644
--- a/app/src/main/java/com/vscool/os/manager/AppStatusManager.java
+++ b/app/src/main/java/com/vscool/os/manager/AppStatusManager.java
@@ -11,6 +11,7 @@ import com.tencent.mmkv.MMKV;
 import com.vscool.os.activity.main.MainActivity;
 import com.vscool.os.bean.DailyAppBean;
 import com.vscool.os.config.CommonConfig;
+import com.vscool.os.config.PackagesName;
 import com.vscool.os.utils.ApkUtils;
 
 import java.util.ArrayList;
@@ -134,6 +135,7 @@ public class AppStatusManager {
                 dailyAppBeanList.add(appSelectBean);
             }
         }
+
 //        if (hidedAppSet.contains(PackagesName.VSCOOL_CONTACTS)) {
 //            DailyAppBean contactIcon = new DailyAppBean("联系人", PackagesName.VSCOOL_CONTACTS);
 //            dailyAppBeanList.add(0, contactIcon);
@@ -144,6 +146,11 @@ public class AppStatusManager {
 //            dailyAppBeanList.add(0, serviceIcon);
 //        }
 
+//        if (hidedAppSet.contains(PackagesName.VSCOOL_DIALER)) {
+        DailyAppBean contactIcon = new DailyAppBean("拨号", PackagesName.VSCOOL_DIALER);
+        dailyAppBeanList.add(0, contactIcon);
+//        }
+
         return dailyAppBeanList;
     }
 
diff --git a/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java b/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java
index 332b4f5..42e5c72 100644
--- a/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java
+++ b/app/src/main/java/com/vscool/os/manager/DesktopIconManager.java
@@ -16,10 +16,12 @@ import com.vscool.os.R;
 import com.vscool.os.bean.DockApp;
 import com.vscool.os.config.CommonConfig;
 import com.vscool.os.config.PackagesName;
+import com.vscool.os.utils.ApkUtils;
 import com.vscool.os.utils.IconUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 
 public class DesktopIconManager {
     private static final String TAG = "DesktopIconManager";
@@ -101,4 +103,24 @@ public class DesktopIconManager {
                 }
         }
     }
+
+    public void openGallery() {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_APP_GALLERY);
+        //                activity.startActivity(new Intent(mContext, GalleryActivity.class));
+        PackageManager pm = mContext.getPackageManager();
+        Intent resolveIntent = new Intent(Intent.ACTION_MAIN, null);
+        resolveIntent.addCategory(Intent.CATEGORY_APP_GALLERY);
+        List<ResolveInfo> resolveinfoList = pm.queryIntentActivities(resolveIntent, 0);
+        if (resolveinfoList.stream().noneMatch(new Predicate<ResolveInfo>() {
+            @Override
+            public boolean test(ResolveInfo resolveInfo) {
+                return "com.android.gallery3d".equals(resolveInfo.getComponentInfo().getComponentName().getPackageName());
+            }
+        })) {
+            mContext.startActivity(new Intent().setComponent(resolveinfoList.get(0).getComponentInfo().getComponentName()));
+        } else {
+            ApkUtils.openApp(mContext, "com.android.gallery3d");
+        }
+    }
 }
diff --git a/app/src/main/java/com/vscool/os/view/ToggleButton.java b/app/src/main/java/com/vscool/os/view/ToggleButton.java
index 5bf6507..eb0b052 100644
--- a/app/src/main/java/com/vscool/os/view/ToggleButton.java
+++ b/app/src/main/java/com/vscool/os/view/ToggleButton.java
@@ -30,11 +30,11 @@ public class ToggleButton extends View {
     /**
      * 开启颜色
      */
-    private int onColor = Color.parseColor("#32CD32");
+    private int onColor = Color.parseColor("#FFB70D");
     /**
      * 关闭颜色
      */
-    private int offBorderColor = Color.parseColor("#f62626");
+    private int offBorderColor = Color.parseColor("#e0dede");
     /**
      * 灰色带颜色
      */
@@ -191,6 +191,14 @@ public class ToggleButton extends View {
         }
     }
 
+    public void setToggleStatu(boolean on) {
+        if (on) {
+            setToggleOn();
+        } else {
+            setToggleOff();
+        }
+    }
+
     /**
      * 设置显示成打开样式，不会触发toggle事件
      */
diff --git a/app/src/main/res/drawable-hdpi/default_avatar.png b/app/src/main/res/drawable-hdpi/default_avatar.png
index 92c3edab1486fa98f2adabe985346f7464f61d86..0c5fc72192d53abe7d57061c6fdf35445f51622e 100644
GIT binary patch
delta 5739
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

delta 5938
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
X7m${*^KdAD2%nLjnQpcA!)N~oM>+lS

diff --git a/app/src/main/res/drawable-hdpi/icon_add.png b/app/src/main/res/drawable-hdpi/icon_add.png
index 0ee142222c04040822c8a81d8b1b90542a9240b3..a952e53cfc139b3c77b91c3f2783075b736d1d72 100644
GIT binary patch
literal 2818
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

literal 2455
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

diff --git a/app/src/main/res/drawable-hdpi/icon_menu.png b/app/src/main/res/drawable-hdpi/icon_menu.png
index 5ab043574b72de9c31fa8901bc9f832f7409d316..87fadb281c091cefe4d96b074610f14d5406ad97 100644
GIT binary patch
delta 1176
zcmV;J1ZVrP1-J>2Fn<JcNkl<ZcwX(CTUOjK3_xS=g3L$DN(w6}tOQsIu#!$!(&@(}
zyBPN<P0k64Wy!YeygWZsN*p`adRY=tRry2_P*J1H;Hm(O6oLY94*=V?{a#ho!|is1
z?{7*e_#Qs+?+g53jOo6$*1zHZ?(Xi+k<TAJd=Uu*V7J@tNq;Hz1HeT*#Q^rKwf<ZJ
zXf}W&XfF}KsG%2QOjel50ructlu}RB(+mIptdx37EtSat0ytyLd!&j=Fuf?Ho>PGo
z2bf7!y}=q|KD5>#k)7R?`iKH-+xEd2^Gj-R3GM?n^7C{$y-M9%4B+*8eN{@ObP!U{
z4B^n56vSwND}S<ezJS3tKE|qa6u=(dAK#U)==x}g!2ma4@3{LE<)woF?m+UUaDye$
z8{iJ%4KRZsdIM~l2Evq>^D9@imbmUx*Y&;6#9jb*4zJ?|0r%;2dgel81Kg3*AldXs
zzYp@ls^Vv)o2D_G8}8&9wmoD?;1N`Jy7639CIKEvb$_Q2`;&?@>rDbYqV$bGl3v*f
zux;C?KBu=6)8_veloUDv9$fkc+UL5iA2IYOz$4o}A6tk5yk4*G3)C_Ebu7aOmq$hc
zHcbO*s&Rcb!%|l}1?o(!0E_dOZzSeStN@Gp&H-X&04u<vzE)FW^~M;$Bb|G>hSzEb
zX8=q1f`9Y0*+Cn?!=FCTp!t7?!<RJI3}C|gE_4L=hD9M`;Q2$xIn~+bNNfN_1L*Oj
zeIMY^Gvk5@jX|*6T^k0o_6#{ZXx-=}BvFgW%#q9hN}hkQ%q~%wLeHMAwJD|UZAEh7
zm^LdwXDSFY6&Q$-B+d%?R0>{DC|CeRj&M{)7k~5ibzM^#qS^W=fP!{?CKSn3m}=lb
zREtbt+Jby4XD4{FVo9J>-PZ{NvrR4-nC+ybUGQX;6(HJ1mcWUiRkSTTkuDyaHZ(F%
zI$s)oxM9qAt`uR6P15%mNGA!R`>usqV`e$ZaZ?G<g}^z=F;&cC+WlN=i&1S72uH0g
zcYmEG+c8^=isb{PLYZU_ll#V4sD!2TH`8&S3#1poVh1CON-$jT0G>-olFoyj(Orf0
zqQ?D}1QphI+)VB*sjl-ml{z}SH>MI5RD0Xn|9H?_ntTUPsj|{w=_cxIZG)jCz$4p2
zO8Qs;;Ud9|uCE3yc0FbLhJ}$5=qlzc_J4F4CUzCK#?!L^_7D%#vA|JXF9{qj7OZY%
zkfE?CxT+fjkeON!TlqRhkyXLzGTACT4D2C7fbHAovJOP}D!k#bz3_C-J%%<ub}z_@
z>=<JHKl$I0I!D0^R^hQUZrCOU*}P~cVza?1ir6VVj&G>qT8p<AcHL|PabmQ}CV!E@
zsY>@RS6tO=pd_VE#0yg@wxXb0T<Wp_oOtRb-Xr*>XPVmZ(BF&NK-VHhj^<~=Q%u(l
zrnUZveW@51Xf}X|os4}6E!=j1c24z{%4}YkyK7UJy+p#BeL1f|{tM%^){6j3?uA1j
qZh6ciD!gT2MFNF)uSj4d(0_sk3lV-qOD~ZC0000<MNUMnLSTXubTrfe

literal 689
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)jKx9jP7LeL$-HD>V9NG%aSW-5
zdpqY~;bH@c){779%w8U`tJ2Bp2=<)h_2>$Noc!YuA+C)}V+|V=x0SQ>3;(qE@84rL
zPhdg2&ml!YgGo|_Ob!=W7+4l~I81r$z|h6wV#zm0>cPW;3X8dZ{7JhvPf3p~`*U;S
zwMND}KWpmzC#6`PzUO~^rIGLDt5tjToF|JOkh=H1<oS$RZ`~tY34tO9D{tQ{uRg?A
z_5S`Qo$6eMI-?Ty%eGP3;T8o3+ru_&zGfHB@YyC_D!GZ<Qi-$TeRyJ6Uiw3u^YOig
z`V)V}$ENjE-peuDT_%>7(Q@;K<@S<uA7v_zD|H`Dx^8nQhVjqUZBjQY<DR-TWv8IJ
z8pR8^I6r;a+x&lnyj5=hG`==q?Pboyz)se0zo*+DvFyv7weRa9*@gQwx&+=Hs4Prg
zzU7)-+oiPF8LDS33UaTW&tShfqmkioz&khV6UTViD>}>GeE+@nyWNfn%99u__IU)9
zpVIoib+SirNPEw`8NK<*zn||~U-165TW#gk%X3bwk5jT|U<y!Gc(s$ADL_TxRG|Wc
zE7Kwwf}96a7+&l8Z#y=_9^`WA<b89BpPn@poMyIoedWu&|2d@nSXlS}aW8%?{_R@p
z&2K3pu8U+BZ-{l-8*A;6&bz#lF``}D`9Mcaf{I6Wu4(;-pAjk>{BC}ImVDRjg!_H<
zU-x^yeBf?eWZrVnu#e&Wp~pM6Y60De<iIY5|4hDiM*>Uub!Pz6AcLo?pUXO@geCwG
CF(i5b

diff --git a/app/src/main/res/drawable-hdpi/icon_more.png b/app/src/main/res/drawable-hdpi/icon_more.png
index 02efbc72b02f25c4cf5d6bf0290efefa680deb29..960b010e5cadf439d27343ebf92026233d4aec75 100644
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px$TS-JgRA@u(*-?svFc1dd40w?CISL+Odz0-=c2CmnN$e2><8yltg)Avu5Glph
zf9BtcKFcs){)8baZXu5>#Nk%Re@k*rWU+~qWx1*A`oaQ2wwCw)EFv4{+$qblJp(iw
zQWV8!jPWo?f`XY1Nq|8je;#uT1d`52*LBrxdr>eDNa~!8fkD_9D1?cDLs%FU2m_-A
zvBs!EEHUa3D~t)m0%Hcz#+X7hG3F303<aWrp+O#CzC#FK&)zhtkkst>Vise(v~9b6
zD@dN_AI`aI)buWdaC#dE5|Pl9t%XKVAQ}jBh!(;Wat|RQ`=)7ro;}$2-ZwcT+6a?G
zED-7tD}*Y<5}^jMMyNm-2sng=fI^rE7=(?0K+;$EzVFY&X^WiLQ>Xsy$v#elfq*2E
zig@p@zurXT_{ybd>Z(6_Z+0SxCJ;4N2x1kHHP%FstBI(!m_&X734{kieT|6F00000
LNkvXXu0mjf;AN|C

literal 716
zcmV;-0yF)IP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00001b5ch_0Itp)
z=>Px%hDk(0RCr$P-Cc6RAP@)e;7RID^d|Ksm{YW#Lh+^cBzlv25v9e^nT#_vAiLzh
zi+S-uhQuFB_y|PP5FMM%=F1o}YntZm@AGgvomO4f9f-1r&Bjn%*>=0#d+!6@{jsvv
zeo~wRHIHmS=Uf2#c<=*NBW43Wh`zq5TEuKX=iE=Y??qHGm5AAZkr8<FRfm`j7;z6&
z-LPZ>2A!G_NdRj`Bm=A!krc2-L~_8|5Lp0gLSzH11(6l721ItifOwtidXE_Hi5syL
z0o06G3{Wd#Q9zA|#R0V;jsmC&aWp_Jh@%2(KpY)VIwAz%Gl<5RMccN!gw8ojQW!v~
zh){qM5#a!(AwmL5LWBjBf(Q*L0TCV$9Z>`zGNKqjR76pLh=}3<uMetXm(*Q`Z=AzE
zk$^~uVga8)JfF|guIrAJvkIaCQxU!QyXA7ZcmduCBrG#-thJ;;Lz)?7$)@C$u*~>q
zt(~UiJ(N~FU;<ufjSp?x&WBJ^z84Lcf)`L;jYuyvp1_-PY&{bhfhc&FPI^jxM@Wl=
zCk_w|PZS^`o)|z>JQ0A%c<_Mec+h|n@L&O@;6VaP!h-{ph6e>G5f27XDjo!2Djw$(
zwr9rrqfRDB#~U>QHQ<c~s0D8nKuvhX0kz>31x(#DjMm!z*FqO*g|*@pi9pSG?10+w
zSOIImV*{)Oj|H$MJaWL=@JIn`#3KVteF3ACPIAojR(3~vy<X2IlgU2jWS0^H*(e=*
zy+i4;0aM1e+VDuKuyf82mD2Tlb#L&c0vz1*!m&C&ve4L*Wmn;$21GL+Nd$&W9&9sE
yS#A4aogIO<%=&+a5u(m}|IM)`nY~UXp5PbW3nXt~;GQi20000<MNUMnLSTZyL@*Hm

diff --git a/app/src/main/res/drawable-hdpi/icon_selected.png b/app/src/main/res/drawable-hdpi/icon_selected.png
index d9560f2eb9b5c8a0cb89d25c6b56b6a5924b7cec..e990767dd2ef65d36f1e47d0b2722800f41a07e2 100644
GIT binary patch
literal 1234
zcmV;@1TFiCP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00001b5ch_0Itp)
z=>Px(j7da6RCr$PoZ(K}Fc8P@Qr2m2uyvDGz5y=*JPGh5gC}8o63R;e-xj2;+Z#;l
zL~nA^loHzB+2>2z)RB-7*opn~|L*K_9E5bK2%xHVstgIBQUnQL0;nXQtezB@04fP6
zt0x6^0pR;T2g5AO&WpYvd?uhF0t})2$=#m`AV<LBcOZDovgzo@n}?CI|LW?kD6j%X
zNXH0pqUc2qfFp$IEh6M?0BscD;P25TAf3&WrQo)*Y7T_o#&7Q~EpEQ-o{a$f^zYzg
zN_cGuuHLuCK$-$<0o*H)2z2$c|M1mHktP70kHa2bEB#x{KIhXXI{p3bp$tM1ujl}a
z0MWzm5!)E+RwfXm0-TxbO{^Xp+$Xwkj0SKPVZRu3I{qyQuVO{&C;&f94sSNd-wA=^
z*Kz;uLRffZF*U%gQeGWH1SP5fZh_C^1*U`;46qaMO1yc7bP>7?3<5Zts<>$D7W-Ye
zf~Pn^0Jk$}u;ZMM`}g~7sagSVfFCCZ=LE&NwsTj8bn0u$-T*tQzDf+<D)a)_W%X4A
z5$M7v`QQa`FgbK<+^z(URW8U&g<^oapuP|liUID3`n-Li4?t=t>=yeRZsQ1XI?vw`
zWXAwhZag(`Nh7idU_<81rkdOYzSn~j0(4m)TVE_(;)wtbCP&w{qwkj)nQwz4nWfJN
zVDzhhf69qn2=LI%e0`@4iybn~1c{<C3((ShrK7w~1(pycevk!d*g(+;b0%cEfhF*R
zJU}D=r!n0+R68r-eRFF7$NhWu*_`^S|6A<@N?Z)v37g~rKeAGIRXK}xMgeHD0ulHY
zUw}rwn)TDH0tb`$Q<#|kuL5o42NOVFCD+SyzFMNd_$jPiGU2wIv#)Y2mYY$6hy_5m
zl^C*tvvx&dlI-PY3j!0iNhHJ!Bt`+my|B%`{=ow*U(2<~dPGy9$yCe9UEr%(fVOWS
z@FUFmLL(PbJT^))!D^W_2O}8eRS@k=w|pWug>hwA1-e3(qg=E!0HQ_IeK}Av>kt97
z9_d-b*_6I3*T7MUqB+taCjw}0#xI9{et4$(Gf`IVf7k@Gr5<AXMEjDL(nSCpF=H-T
zH2Z(?3_%RAAv10k(~74_%~u>mTtU;+`9@%yH$tpFFMzJ_E~rp4_gfrqu?bg|%%?Oh
zs!@_Ws5j3WpzX?}MS8-OhZ<m4BXWrPynSFrzl$%Kho;xOO}GYe6Au-7`vKp;p$a04
zmAep?HSmH>coCw}cA~e6f+_?gF`@*K#hWzos#y>mrc!9ohz_t?r4*knX>hTxf*L`2
z)$@ac$g&P>gE?z`o{0iqnRE{~@f@A%P~j@YM^)hB6laq@IuXm?ErVzRuzHZ2=1c+4
zT0G63Z{=rC>LWFqFWSFZ|NLNca3(=yU1Y3|C>SeJw6CIy;I+!8CcLVl&*weVhiCHQ
zt8Rq1vA)9L3%3=3^{BnK2SXwlmZy>2*X`DP{*K_$mD%af-}#R6CYNtrftw6R(zXOp
wLTOEz1TX<q5>Qr83QPc%1eDd20+j&&1MtUFZw`uH%>V!Z07*qoM6N<$f~96V4gdfE

literal 2194
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
G?fL@<p`C;P

diff --git a/app/src/main/res/drawable-hdpi/icon_turn_off.png b/app/src/main/res/drawable-hdpi/icon_turn_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bca768cc9a77bcf6b65d8699cba703b8a4ba76
GIT binary patch
literal 21758
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/icon_turn_on.png b/app/src/main/res/drawable-hdpi/icon_turn_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5f02dbcccc411154c94f8912944a1b73f5e6f6e
GIT binary patch
literal 11784
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/icon_unselected.png b/app/src/main/res/drawable-hdpi/icon_unselected.png
index d21c906fc523eef23dc0df21f15e19c4d8ca8fcb..165402db8a36615aa2a33d99f9007ece1b6919c5 100644
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00001b5ch_0Itp)
z=>Px(DM>^@RCr$PoQ-kRFc5{MN=Pb!R1#7NPzj+Dl1hL|L|#Uk(Ku)CO1n??`Q#Y}
zNGx0W^!7(9+cC_;L?D`4&&FW_G>TvXoB)jkjLoM4CqN?sWAmxNGXP8}-Gvao=COPV
zA>jYz&)@uW{9XS2FNE+CV|+1=-`so`1y;a5zk&E-7zKa=;w#|p0dy$9l+yPQ!edsK
zf!k_R0R0tX#C?VwLjb0fpt7Gta7$RjKvDtj0PYgVA2G&fmK-SnvyX$~EdI@N%uwV*
zjIjhEw`;ot%<%rW_0aD^6o{?>v&sJU8?*bB+<l`Pz#L(}xeu9hLHI?NNbLeJr3BR-
z#ouX>KgSrKv?s5fX9jp>%3E?UE71h-3VfbMU?zy&08auBfDu@pdY6G+0CTDWzlR0?
z8IJB0rx)Ng1`TPVQH;2kPFnuH8DL5YWhbmM&Uj$8(o`br0eD9B6)`lcunFMF)mI=Q
zps0%vtpKscJxkzNb3siiR0F&b^);)o1>h~Huh|#208E3zZrSI+#!+3r!~RLxcpA|a
zRYX<+9Av&?sVOJ$C|aQE!}i6hC7u=_@;>J5H&sTeT|H*`4BMs;lGL>TndaM+Hq-+m
zSAta0SOiEmU)3ycselYo^n)6JsN6D4MK!~c36VFjL_eqj$nt;Prn`hnv=Y%b?*=fw
zZAwV$(*B;f6DYbEaS){a4sm9+@XC3le!2i;tUyHH(gBd+t3^MpQ6M9Qar1wb0vUD6
z39wbkA1cm*uhuAVn()RfXaF)Q(4up0RZdEYk#33o+zX)STRH$TEJe%~GyoYh3qEdv
z<mibsBRv2>Hx;Io80teG#dJ%fK-Aw@kF1F%BAGHNfiAaoDJGzB$$Vf^oaHr$MALo0
zrDnM)Di9YU&$7x?E))=0zPa2=WgS|8j4Xf2L@ep&$z;DOQTn9{a$10FGp=FQFVB>p
zm;Db$U2@Gs+-n|6R{<Pk#!|c(`FnMS&;oFT8IOdtbuX3qz6Tm@kIAKTZ8t`or&eDR
zz--31ph7YCt7lQIz|v?yN;5)bYxfX~2g`;%0GTV3J>lWrP3mhl;ghSdS$!6O$jeUk
zka^GZ(cJ)ZKpB}_vrW6%bW4YtePBHj_F|q*EnmMIo=Jg~KV;PlNAT;e1i2`%GG*k4
zBiE@OaJzzrIgPp0^Fhz+c|a@IFe}eZfeW8_4d!g}c@zaMARaZvF}+l{CVx{DUc2Z4
z3lA>-?$UTE0ILX%;DQhB?DaM~RCj%!Jz36F&KE~KSzm5V2S*7aTVb+#MS-bE)xL^n
zIH#Jh;3Hwy)|Y3>7u{aHzQWN8cNc&cqIUVz9f0E4`urW<V8U^`pTBFJ<s+ZJy8@34
zN7J_nP(x|soC$COG!ig2p9-7+jRcI%rvi-t{{t<=!(gJRStI}e002ovPDHLkV1gp}
B0bBq8

literal 2163
zcmaJ@dpwl+9v+uAjU=L6P8ov;bH!j7w;9%S8p#ZiQe);F-ZJw}GcRV?Y@I@~m<oGB
zXG3Ldt{Gj9QY&4g4r0l*<5J3{7KhCycBV~x{y5J2dEfVU`8?0_{eFMn=Z{}nV8GWp
zNE0LifzYA*(}I+vlj_s@O8FmrRV-8v#;|WF%!GJwJX-`Hytz;$fTHu+Q9uyD=1LDY
z0qzKd1{!3A!l8^EWDdl~vQ-$Ygs);F5bmB5A)9jufKib^6eyse-__kgqd+bNz1xX_
zX9%f4H0Ylo0+<N_EKb59jw=`K>49>Wkd*>_0A`~k{1}0lETN!3>5`Rm)iw@|`UHUw
zQP6)R70L)iQ6Uk4a>6=bICug9MIvDdj!q;J!5&4#6Nosx@+Dyij$|hindprA{GgT5
zL|h&@i01b>mU2ZwN5im?jKjsp$7ACiu#hMUM{sp@RcR237$pKDmI`3D1S1ezEGy6e
zF-HUnVGt6aREq3KC>Exmm6`rg0$=z=Rv`X-Ov(epN!UUh0gG3av<zf0{y&t@|AH37
zLBOB+{!d{sODY6#L4X*F6>*e}<5{Re3CUCuz=k0a3xZ;nPcbkWf+2A<Bt%h}B$Ul=
zP{4)a#oIpN84NOAAcolj4nU_-&`Jd?2y)3(lAkjXPsKYslUxV{Uz&@bi;oM<#mU9N
zk4SWObY14sAWkeF5Wve^?w?%3id>Zy_(El58XyAW0Ir`1;-fy5Oa@oX#m9F=z0X|k
zin;jst;oeGlfkJP`(KS--cq_pHT_~+<>HI+0fEx(BBiaTvJ|}tgytxn=FO7ybmTQd
z8+IE!*jdo@S6k3<TDavAXrktW-q)6Gs|e2V4MPE^<+`D;#&c=RKM}TVI!j(w(PvW_
z5yAS_hK9j<FtaonX}(dapjT~rWJ>dA_MBSfXTGcD`vQUk$FxPlo0vN7(QVSw=Xxix
zrBD2J*5JtDw|{YsuB;jWZa?j@{xK@J+MrY1$?2qqWXER3rp}s<r!fO;)+wfJ$1OUo
z%QDyUhpz8w%g-A=`tiI|6S8KpW?0tppcbl1xzsf^U!M`s5c>}7sk5IPT|4H~>AU7U
zvkWQfY#pG3OGSMx!E!+-^3dJF)~AjM8lpP_=L?U+UR3eIk{*}OzpOt#lxh+9_nS%V
z*`OqhWfH49`5?ESyLl`0oIO=S2$%PljhAVRVBAni!QsiaoPC_lmXOK9Z}bI6oms;x
z=Wp>Rhf21|1yURBpL|L$C+<Jhn2?5S#u{%>=#BYonU-ykPWX`J2s{5|@RvGQ!;Y|!
zw60qiTic?FiVA*C_QhCT&jJFLB0K9bV<KxAEk1zvXC%%|jGVhlM5f+*6Og(zS{=ds
zdW^a0M}DtYVW5qg=9QTb4#B@ZtR3tcwz@Dh6gf6IUi{$l*8VB8%7~{hm}Qb=v;M^t
zQdVSRFrs%bI=XeUnd#<Bq4v3NL_(I@m=^h=okcb>8s?rTYLl04y{jRoMi>_cLb#v1
zy2g)5PV7)GjnfL`&wtgx%FrXKn~xNoKKb*j9s~ZfX?<C;%%Nv|yGJt`VLq~uQc6yj
zwU>7o*3>x}8X9(VchmF3!~ZjrVXC-!6V#R~6tJnhqT*j^vi2VA{TL8lXk2p;1iKdp
zdV01~j~`c5R}b3AGGy)E=JR>eW!J9F`G!3iR4<7LN)KCob(3gMqPqOsrv>x(a_oLf
z@YKe42;>HPwQgF<gB_wO%F0?Np6t*!;$bZr4qmS{Cr@56-*kAL)|~EzNM6f7^7D(0
zsX5=38r{wsIR~CNbF@I)wY-0IM^TR5tI^SI?v(SIDZBhvg+xRI9QpW>#bgfi9)Wzl
z!1(fr+NvrqCX-1&pyg|CtN;-ftbO|?;~s&NSogb`B`+_|JRCwZ7y)CMh3oI1w7Qn?
zK2cxhW?o|ABG_p5=C$PUeln2NaHhPxylrgEwzl@RjhUUD-L}@g9Z>D{lD!_Zep7R!
z#T%w94nXP+$<57uU6;0|pI|xag_1SPEHJ6aWS3J>z0anniHz^EN<Q|#lrbkug_ai<
zc^S_^J!#B0G4^jH>wK_n@eSUR%lfAq$E;14G%71AAy1B6Z+OauG1Fnzq_cieYbmrm
zQ<1ic{ytpI!mY(9n`7F!QSZU7`7^U8k<I^pC+(lh8`NC;!t0o~j#0X3e;#;P?sYUJ
z=u$C!wqaB;laTTKWafK1uTWN#S!gnC)B3~E{ywC^1g>+}NJy62Pe171_q>W+mFVT>
zcH=rl9S&cR{&Mx~6U#lf9?u;csrsg;>iv{Udm8V`>PGCM<J%_cmPE^6b@Ix0mgmx5
z)Xde?lj^jAd!!MM4=?L4WAe#68Lf#{JKe=bug)pzoP#4{wYP`cMV?Ei47Zns2Zi#&
zWdmp87M=<0!ygt%qI4<JFhzRYKviR}&4-KEs~7q)n{QY(Yuq|wtY@CKxP4tc^}`*6
a2EzJDB>vmIRh_D90Npo$R^fBtZ@&W?&4_dW

diff --git a/app/src/main/res/drawable-hdpi/icon_wechat_call_phone.png b/app/src/main/res/drawable-hdpi/icon_wechat_call_phone.png
index 6c1b8a68fe8f51e8121f875ba67f75b04c488a2b..9aa3d0ccb9e95f4ff1f0eeb265c7aadd0a89e19b 100644
GIT binary patch
delta 3998
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

literal 3131
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
A)&Kwi

diff --git a/app/src/main/res/drawable-hdpi/icon_wechat_call_video.png b/app/src/main/res/drawable-hdpi/icon_wechat_call_video.png
index fea8383cb5d4c5c164ce1edc27143fa5ad003378..0daa5c7a49a33288d768887216179b30e0065db5 100644
GIT binary patch
delta 5781
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

literal 2955
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
BBb@*M

diff --git a/app/src/main/res/drawable-hdpi/icon_wechat_call_voice.png b/app/src/main/res/drawable-hdpi/icon_wechat_call_voice.png
index 7dba78d45e1cf2231f070f9f21f1e3ea523329fe..5b300800d6582a265aa3537f3c4a57d8f8fdde18 100644
GIT binary patch
delta 4556
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
V0i5iRybR_;jP%W~mgqW1{R=CMYU2O^

literal 3119
zcmah~30PBC7JgIPaTzHcL_tA~K?{nI1R*hj07?Q<iL44^1X&UwLKa>gs|&PWotCiJ
zs0Af}7!~vb#Fe#(j7EbjiVG-W8Ih(?gn)>O3Y~jjfHL1`Cttqz?mPFK|NQ5i|J|4B
zwZ%<u-jaC;g6O$#V)-D*EE!mzo%2_4l?05i!EG_d4#0fH;aGeK%11Wv#G!nGyD%hz
z@52w_CB`)H9Y7RO;1_@ea6A}cVxe^i^s!D5N<cJ%I5;IpLc*f>7$KA&ArLW%+L}5d
zLBL}Y{p~npj>Lr@DcF>R@_m!G_=P1!h0%FLCr5%q0s{aD`B(@cK^QHPG7^|X9G3ys
z&`cr{a2G6!Nz{=F;CK;S#3-L&XT8oUj7*^rs8nl;tsRw0Sxc}XQ*20N@TXc)Y#DY`
zh7FA{`6GgCC@-Ah!*ZR>1)iA1NDPxONTm4qc<cCe)?ze*M4{8^5W~jC3V2va6Gd1^
zf|W>WHif|AOT$os1QUow1c(?CDvrgNM8H&6f>1IIE0RvO2{eq95F#N_tjVyXDMt?H
z&s~MWX>Td!!~cWt2Z5!2i4s1^hc6Y!qG4cg;bt(EgyDknLohMwCl*Ifb<rzQjESX@
zVhO>;mrAhk7l?S`c<E}~pTl9ei=<eHD2(sUViEy@wLrjQuxx2G+x51twrr{$g~E2-
zK&G-bP;KdS+BzEDg+iN(Wr@RLg?te<70a8BwIhEt7D_=V0hw8RR1nAKxuRkr0WX;$
z_&68VNAV_Oc^~Cs%l>FA36LSd!Oj@;lnJN@E~jM+9;SuQ7Xh`SK-TMTq})Z2IVap%
z8~hSFo<HHF=WSg)duU`!S;;(M#~Ie+BbZ<g<zV5adn>GV5nJ~wBR`3<^WI3l<r5+~
zwc7Vt#HR}vu?`s&n>dk)m;5#>a*kMV6<>UFyrWPhI(@ib%FudrMf7$a?VC@QYPH$#
zcROiX270QBlUowCg16)Q{-G{(dzD>$ZUwrT=hpL2^(%Fo`iA=LCkS#iH1|Mm#!seW
z5k33Wsp?jB)sGXmTlPG)JXP^8ZI#uFD)myi!mNK!A$X%3FI?daaP94H?@TvMGfj6`
zoEURz;+krqD!ksmb4isGT7%9(kfHL^Pon%4V)j0xM@IBZowQ|KjaHj#D*F8gPm5Fl
zqYV(0<UM~>eqtceT-Lpt=*h}Y^?2g}cD7}tmKQTy<0@8h@3-Bf+k0x$9kv(Nm4H(z
z<w4(|P3^5WV>WyBp50ocDqkJ6AaOl<AaNFgl+2C&TI<~NPF}_i;x>`2;`;k8%e&UV
zTv0v)X!7^b+vUp2G4pp7hx^7$ms7a_&aOCr+i;OOYk$ysNq?W_*cPD$XKZh0ZG*>O
z5TxxVeOA8gc}A{6%MP3MRcP&(!vzOHX=FdghjF!0Svw4`O{j(8(1MAg?7J2Q#`O2S
zxm`FIo%3SVMZm~-`{j|PYwmT)a?%5juM}k{+?wViNO14?`U}E(rSTP`N0C8*ol99<
zowjAKjgYxCIeM2^aI2^Z9Ld4F`=19KaM_cjNv*P!=^y<&n36j2+`Hg%i%ci#R{fow
zLPrp6Ruosyjab$sVhVH6x<|m0UeYmFzui82n_-26<LF@J*paG9YZNWo-%x@2AN|z>
z9__9h2fn>*vM)ljMCGZN3*l?->nVnBF8}$9iXyZArcVKhlY!~cgLa(cY*@JSW4-tX
zrA4%(pMmJorL}htn>2$yrL^hAvSVuKz<8%4D6M<9&e&Exik-lX)o0reU-;P+>_-N2
z{S84#aN7}34|0dk2Dg+QhNCR-<m0`T(`5)2M}AoX`5ClZ0BQaZ;0=fn`s}vBz}|C8
zNTgfmU<p50E6?H%=kblZmXi=V<m-002Ohd9_XG?L#Z&4wdX$m<s{uq{dHx@nj8ug$
zIk2oocB_mCcV{NBmL);k8H?>Ot24X=2VH4`+C15gQ!U^cZthb6JS0yU36mjs#>6yb
zKFq&HrYi(>fM40vg|Jf88_U$8GTd|xDTSrqvHDQ57QEb;8Q}+m1iIRaEIN{abeywG
ziva4%%$wk<qv-5?e*vgz(^N@1#@C09fk%%rAm<8f1G%xy7u*bXh6C|B|4F6S>9DOm
z%3f2*zB-x-1VK1I3TBsb9dB9cGYZ)7f)g|Lnwst<d_vYT6&{Vrl(-Y1glDauIi6`n
z;4vvM@M_9bI(DlLfW8dSOwmo!0uq{U@n8KaXv~K1!=!-z-&iwncHikbH&YKW8E`bZ
zL4i)cg=gT^wf`%<ZoC-=AJ~{F*4n$%;%b4-_VLDWe4WS&`Zor8J1mcHQ-F>lPxsWi
z4wvA(`s-rZ!@pEsY+eiObIR^V8G7b`>XFhzmn|l);jdP$S4IBB1ALix+ESLBy2JKw
zpg(f|ny0OWUE1utGKZlZ4iAN2f-tiI^>Dwr`Hha*b+-D@DgKN}i=pb6TM%sld>l=B
zthc#rLi+w~gRi|ObI7lAyb|^@{ba{n&j<EldFFLOYlst7z98tWjbbtF_s7{C(4oLg
zo|^RQ!>oo&$^d30enLfDct=>Mip=!9*<98HCJ9frH#Y|t)Y58Cu6})^Znv39GhiBg
zIxnNs{&hnY*R%2ba6@*tCQSpnKz_OF^=?7E@?n;0R?LXmx~X%u@~(c;$hhmh!|%E^
z<8r2EHawU=cN<h_zY7}~|Myt)A){{1I(eO91sK<z(@V9P>iw&XROM^)GZhC|6X98a
zt&6uo)J=P4FPl@>wR0%X5!0BotD4IiUsfCkuiv>>4n||Vo~8mLW?kR$dP~{TGFQ=o
z_gABVs@rmxyE;~Tx#v>KzoqT7LOpvf%B31`x}W>4wj-{RRFNn0PD)GKdT1GQG2P&i
zQB`9nh}w2)C+o_Rv38&27;pCZ#1Y?7r)v8bkv$6e6Gy1!txs>u%iQv-I%vjR&GMmW
zp3>vk<u?koi6fj!#S;^udGV9z*XUQF54gvje)Cei{;_YoY}6w&Paf+?f-cup>S1-g
z`fGKX<>(E6X+}3;RR3{%xJyr#I#Zn?ACM2jFTT2F&sk9ZtZ@?Rh*Do1Q#aV`UDOS}
i`!5#lZSDR2Gh^g?ZTrPm+k_n8g}Ae~u+DA_{^mdI28A^M

diff --git a/app/src/main/res/drawable/add_alarm_background.xml b/app/src/main/res/drawable/add_alarm_background.xml
index 1ba86e7..dc0cd26 100644
--- a/app/src/main/res/drawable/add_alarm_background.xml
+++ b/app/src/main/res/drawable/add_alarm_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/white" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="8dp" />
 
diff --git a/app/src/main/res/drawable/add_contact_bg.xml b/app/src/main/res/drawable/add_contact_bg.xml
index 35b386e..90e34cb 100644
--- a/app/src/main/res/drawable/add_contact_bg.xml
+++ b/app/src/main/res/drawable/add_contact_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="16dp" />
 
diff --git a/app/src/main/res/drawable/add_contact_confirm_background.xml b/app/src/main/res/drawable/add_contact_confirm_background.xml
index 6e14110..348254f 100644
--- a/app/src/main/res/drawable/add_contact_confirm_background.xml
+++ b/app/src/main/res/drawable/add_contact_confirm_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="8dp" />
 
diff --git a/app/src/main/res/drawable/alarm_background.xml b/app/src/main/res/drawable/alarm_background.xml
index b383bc1..feb79cc 100644
--- a/app/src/main/res/drawable/alarm_background.xml
+++ b/app/src/main/res/drawable/alarm_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/white" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="16dp" />
 
diff --git a/app/src/main/res/drawable/background_weather_rain.xml b/app/src/main/res/drawable/background_weather_rain.xml
index d01bfbd..d8fbb01 100644
--- a/app/src/main/res/drawable/background_weather_rain.xml
+++ b/app/src/main/res/drawable/background_weather_rain.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:topLeftRadius="10dp"
diff --git a/app/src/main/res/drawable/contact_add_contact_bg.xml b/app/src/main/res/drawable/contact_add_contact_bg.xml
index 26ad50e..a7d2523 100644
--- a/app/src/main/res/drawable/contact_add_contact_bg.xml
+++ b/app/src/main/res/drawable/contact_add_contact_bg.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <!--    <solid android:color="@color/default_blue" />-->
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <!--    <corners android:radius="8dp" />-->
 
-    <gradient
-        android:angle="270"
-        android:endColor="#4C4C4D"
-        android:startColor="#636364" />
+    <!--    <gradient-->
+    <!--        android:angle="270"-->
+    <!--        android:endColor="#ffb70d"-->
+    <!--        android:startColor="#FFB506" />-->
 
     <!--    <padding-->
     <!--        android:bottom="0dp"-->
diff --git a/app/src/main/res/drawable/contact_bg1.xml b/app/src/main/res/drawable/contact_bg1.xml
index 77328c0..f977d2f 100644
--- a/app/src/main/res/drawable/contact_bg1.xml
+++ b/app/src/main/res/drawable/contact_bg1.xml
@@ -2,8 +2,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid
-        android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:topLeftRadius="16dp"
diff --git a/app/src/main/res/drawable/control_background_item.xml b/app/src/main/res/drawable/control_background_item.xml
index 6299595..9c3fed8 100644
--- a/app/src/main/res/drawable/control_background_item.xml
+++ b/app/src/main/res/drawable/control_background_item.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="8dp"
diff --git a/app/src/main/res/drawable/default_button_bg.xml b/app/src/main/res/drawable/default_button_bg.xml
index 9c4a324..e77bed7 100644
--- a/app/src/main/res/drawable/default_button_bg.xml
+++ b/app/src/main/res/drawable/default_button_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="32dp" />
 
diff --git a/app/src/main/res/drawable/edit_background.xml b/app/src/main/res/drawable/edit_background.xml
index 7a45e6d..f75de0f 100644
--- a/app/src/main/res/drawable/edit_background.xml
+++ b/app/src/main/res/drawable/edit_background.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#efefef" />
+            <solid android:color="@color/default_light_background" />
             <corners android:radius="4dp" />
             <!--            <stroke-->
             <!--                android:width="1dp"-->
diff --git a/app/src/main/res/drawable/general_setting_bg.xml b/app/src/main/res/drawable/general_setting_bg.xml
index 951d76e..10fec29 100644
--- a/app/src/main/res/drawable/general_setting_bg.xml
+++ b/app/src/main/res/drawable/general_setting_bg.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="270"
-        android:endColor="#536076"
-        android:startColor="#626E82"
-        android:type="linear" />
+
+
+    <!--    <gradient-->
+    <!--        android:angle="270"-->
+    <!--        android:endColor="#ffb70d"-->
+    <!--        android:startColor="#FFB506"-->
+    <!--        android:type="linear" />-->
+
+    <solid android:color="@color/default_color" />
+    <!-- 圆角的幅度 -->
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/join_background.xml b/app/src/main/res/drawable/join_background.xml
index 67d6e2e..e6920f7 100644
--- a/app/src/main/res/drawable/join_background.xml
+++ b/app/src/main/res/drawable/join_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="4dp" />
 
diff --git a/app/src/main/res/drawable/notice_voice_background.xml b/app/src/main/res/drawable/notice_voice_background.xml
index 374644b..d69f3e7 100644
--- a/app/src/main/res/drawable/notice_voice_background.xml
+++ b/app/src/main/res/drawable/notice_voice_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="30dp"
diff --git a/app/src/main/res/drawable/ok_background.xml b/app/src/main/res/drawable/ok_background.xml
index 5c3afaa..d219707 100644
--- a/app/src/main/res/drawable/ok_background.xml
+++ b/app/src/main/res/drawable/ok_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="100dp"
diff --git a/app/src/main/res/drawable/qrcode_background.xml b/app/src/main/res/drawable/qrcode_background.xml
index c5257a6..98b6262 100644
--- a/app/src/main/res/drawable/qrcode_background.xml
+++ b/app/src/main/res/drawable/qrcode_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="8dp" />
 
diff --git a/app/src/main/res/drawable/refresh_bg.xml b/app/src/main/res/drawable/refresh_bg.xml
index f6e1d27..fecc1d5 100644
--- a/app/src/main/res/drawable/refresh_bg.xml
+++ b/app/src/main/res/drawable/refresh_bg.xml
@@ -2,8 +2,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid
-        android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:topLeftRadius="2dp"
diff --git a/app/src/main/res/drawable/tv_add_alarm_background.xml b/app/src/main/res/drawable/tv_add_alarm_background.xml
index 6fdaa8f..b0d1493 100644
--- a/app/src/main/res/drawable/tv_add_alarm_background.xml
+++ b/app/src/main/res/drawable/tv_add_alarm_background.xml
@@ -2,8 +2,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid
-        android:color="@color/tv_add_color" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:topLeftRadius="8dp"
@@ -11,6 +10,7 @@
         android:bottomLeftRadius="8dp"
         android:bottomRightRadius="8dp" />
 
-    <padding android:top="8dp"
-        android:bottom="8dp"/>
+    <padding
+        android:top="12dp"
+        android:bottom="12dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tv_bg_noti.xml b/app/src/main/res/drawable/tv_bg_noti.xml
index e0d0d3f..121aa75 100644
--- a/app/src/main/res/drawable/tv_bg_noti.xml
+++ b/app/src/main/res/drawable/tv_bg_noti.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="24dp"
diff --git a/app/src/main/res/drawable/update_background.xml b/app/src/main/res/drawable/update_background.xml
index b904dbe..e6d0c46 100644
--- a/app/src/main/res/drawable/update_background.xml
+++ b/app/src/main/res/drawable/update_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="32dp" />
 
diff --git a/app/src/main/res/drawable/view_clock_button_bg.xml b/app/src/main/res/drawable/view_clock_button_bg.xml
index dc208d3..23c252e 100644
--- a/app/src/main/res/drawable/view_clock_button_bg.xml
+++ b/app/src/main/res/drawable/view_clock_button_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/default_blue" />
+    <solid android:color="@color/default_color" />
     <!-- 圆角的幅度 -->
     <corners android:radius="32dp" />
 
diff --git a/app/src/main/res/layout-sw700dp/activity_add_contact.xml b/app/src/main/res/layout-sw700dp/activity_add_contact.xml
deleted file mode 100644
index 5e6d76f..0000000
--- a/app/src/main/res/layout-sw700dp/activity_add_contact.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.contact.AddContactActivity">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.activity.contact.AddContactActivity.BtnClick" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#FAF8F8">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_exit"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/general_setting_bg"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/iv_cancel"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:adjustViewBounds="true"
-                android:onClick="@{click::exit}"
-                android:scaleType="centerInside"
-                android:src="@drawable/add_contact_back"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:text="新建联系人"
-                android:textColor="@color/white"
-                android:textSize="20sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/cl_bottom"
-            app:layout_constraintTop_toBottomOf="@+id/cl_exit">
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/constraintLayout27"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-                    <com.shehuan.niv.NiceImageView
-                        android:id="@+id/nv_avatar"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_gravity="center"
-                        android:layout_marginTop="16dp"
-                        android:layout_marginBottom="16dp"
-                        android:onClick="@{click::selectPic}"
-                        android:src="@drawable/default_avatar"
-                        app:is_circle="true"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="56dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
-
-                        <ImageView
-                            android:id="@+id/imageView7"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginStart="12dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/icon_avatar"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView18"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="12dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:text="姓名"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <EditText
-                            android:id="@+id/et_name"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:hint="请输入微信昵称"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:textColor="@color/black"
-                            android:textColorHint="@color/ok_button"
-                            android:textSize="16sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/textView18"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="56dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
-
-                        <ImageView
-                            android:id="@+id/imageView9"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginStart="12dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/icon_phone"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView19"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="12dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:text="号码"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <EditText
-                            android:id="@+id/et_phone"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:hint="请输入手机号码"
-                            android:inputType="phone"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:textColor="@color/black"
-                            android:textColorHint="@color/ok_button"
-                            android:textSize="16sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/textView19"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="56dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
-
-                        <ImageView
-                            android:id="@+id/imageView11"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginStart="12dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/icon_avatar"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView30"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="12dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:gravity="center"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:text="微信"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <EditText
-                            android:id="@+id/et_tag"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:hint="请输入微信标签"
-                            android:inputType="text"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:text="@string/app_name"
-                            android:textColor="@color/black"
-                            android:textColorHint="@color/ok_button"
-                            android:textSize="16sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/textView30"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="56dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="12dp"
-                            android:text="设为紧急联系人"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <com.vscool.os.view.ToggleButton
-                            android:id="@+id/toggleButton"
-                            android:layout_width="37dp"
-                            android:layout_height="20dp"
-                            android:layout_marginEnd="32dp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="12dp"
-                            android:text="保存到SIM卡"
-                            android:textColor="@color/black"
-                            android:textSize="18sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <com.vscool.os.view.ToggleButton
-                            android:id="@+id/tb_sim"
-                            android:layout_width="37dp"
-                            android:layout_height="20dp"
-                            android:layout_marginEnd="32dp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background"
-                        android:visibility="gone">
-
-                        <ImageView
-                            android:id="@+id/imageView8"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_marginStart="12dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/icon_phone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <EditText
-                            android:id="@+id/et_wechat_id"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginEnd="8dp"
-                            android:background="@null"
-                            android:ellipsize="end"
-                            android:hint="微信号码(可空)"
-                            android:inputType="phone"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:textColor="@color/white"
-                            android:textColorHint="@color/gray"
-                            android:textSize="16sp"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/imageView8"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                </LinearLayout>
-
-            </ScrollView>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout27"
-                android:layout_width="match_parent"
-                android:layout_height="44dp"
-                android:layout_margin="8dp"
-                android:background="@drawable/add_contact_confirm_background"
-                android:onClick="@{click::addContact}"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@null"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:text="保存"
-                    android:textColor="@color/white"
-                    android:textSize="18sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_bottom"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/activity_main.xml b/app/src/main/res/layout-sw700dp/activity_main.xml
deleted file mode 100644
index f54c92b..0000000
--- a/app/src/main/res/layout-sw700dp/activity_main.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.main.MainActivity">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.activity.main.MainActivity.BtnClick" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            android:src="@drawable/main_background" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/root"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/cl_docker"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.viewpager.widget.ViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <net.lucode.hackware.magicindicator.MagicIndicator
-                android:id="@+id/magicIndicator"
-                android:layout_width="wrap_content"
-                android:layout_height="16dp"
-                android:layout_centerHorizontal="true"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_docker"
-            android:layout_width="match_parent"
-            android:layout_height="72dp"
-            app:layout_constraintBottom_toTopOf="@+id/cl_bottom"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <GridView
-                android:id="@+id/gridView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:numColumns="auto_fit"
-                android:orientation="horizontal"
-                android:stretchMode="columnWidth"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:id="@+id/linearLayout7"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:onClick="@{click::dialer}">
-
-                        <ImageView
-                            android:id="@+id/iv_icon0"
-                            android:layout_width="64dp"
-                            android:layout_height="64dp"
-                            android:layout_marginEnd="10dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/home_icon_dialer"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="1.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintVertical_bias="0.3" />
-
-                        <TextView
-                            android:id="@+id/bg0"
-                            android:layout_width="wrap_content"
-                            android:layout_height="24dp"
-                            android:layout_marginStart="56dp"
-                            android:layout_marginBottom="56dp"
-                            android:background="@drawable/badge_bg"
-                            android:gravity="center"
-                            android:minWidth="24dp"
-                            android:text="9"
-                            android:textColor="@color/white"
-                            android:textSize="12sp"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="@+id/iv_icon0"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon0" />
-
-                        <TextView
-                            android:id="@+id/tv_appname10"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="拨号"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            app:layout_constraintEnd_toEndOf="@+id/iv_icon0"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon0"
-                            app:layout_constraintTop_toBottomOf="@+id/iv_icon0" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:onClick="@{click::wechat}"
-                        android:visibility="visible">
-
-                        <ImageView
-                            android:id="@+id/iv_icon1"
-                            android:layout_width="64dp"
-                            android:layout_height="64dp"
-                            android:layout_marginEnd="10dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/home_icon_wechat"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="1.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintVertical_bias="0.3" />
-
-                        <TextView
-                            android:id="@+id/bg1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="24dp"
-                            android:layout_marginStart="56dp"
-                            android:layout_marginBottom="56dp"
-                            android:background="@drawable/badge_bg"
-                            android:gravity="center"
-                            android:minWidth="24dp"
-                            android:text="9"
-                            android:textColor="@color/white"
-                            android:textSize="12sp"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="@+id/iv_icon1"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon1" />
-
-                        <TextView
-                            android:id="@+id/tv_appname1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="微信"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            app:layout_constraintEnd_toEndOf="@+id/iv_icon1"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon1"
-                            app:layout_constraintTop_toBottomOf="@+id/iv_icon1" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:onClick="@{click::toTiktok}"
-                        android:visibility="visible">
-
-                        <ImageView
-                            android:id="@+id/iv_icon2"
-                            android:layout_width="64dp"
-                            android:layout_height="64dp"
-                            android:layout_marginEnd="10dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/home_icon_tiktok"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintVertical_bias="0.3" />
-
-                        <TextView
-                            android:id="@+id/bg2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="24dp"
-                            android:layout_marginStart="56dp"
-                            android:layout_marginBottom="56dp"
-                            android:background="@drawable/badge_bg"
-                            android:gravity="center"
-                            android:minWidth="24dp"
-                            android:text="9"
-                            android:textColor="@color/white"
-                            android:textSize="12sp"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="@+id/iv_icon2"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon2" />
-
-                        <TextView
-                            android:id="@+id/tv_appname2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="抖音"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            app:layout_constraintEnd_toEndOf="@+id/iv_icon2"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon2"
-                            app:layout_constraintTop_toBottomOf="@+id/iv_icon2" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:onClick="@{click::toCamera}"
-                        android:visibility="visible">
-
-                        <ImageView
-                            android:id="@+id/iv_icon3"
-                            android:layout_width="64dp"
-                            android:layout_height="64dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/com_android_camera"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintVertical_bias="0.3" />
-
-                        <TextView
-                            android:id="@+id/tv_appname3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="相机"
-                            android:textColor="@color/white"
-                            android:textSize="16sp"
-                            app:layout_constraintEnd_toEndOf="@+id/iv_icon3"
-                            app:layout_constraintStart_toStartOf="@+id/iv_icon3"
-                            app:layout_constraintTop_toBottomOf="@+id/iv_icon3" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_bottom"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/activity_setting.xml b/app/src/main/res/layout-sw700dp/activity_setting.xml
deleted file mode 100644
index ed1e762..0000000
--- a/app/src/main/res/layout-sw700dp/activity_setting.xml
+++ /dev/null
@@ -1,646 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.setting.SettingActivity">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.activity.setting.SettingActivity.BtnClick" />
-
-        <variable
-            name="float_window_enable"
-            type="Boolean" />
-
-        <variable
-            name="voice_broadcast"
-            type="Boolean" />
-
-        <variable
-            name="auto_accept"
-            type="Boolean" />
-
-        <variable
-            name="dial_tone"
-            type="Boolean" />
-
-        <variable
-            name="status_bar"
-            type="Boolean" />
-
-        <variable
-            name="versionName"
-            type="String" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/general_setting_bg"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:text="通用设置"
-                android:textColor="@color/white"
-                android:textSize="23sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/iv_confirm"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerInside"
-                android:src="@drawable/icon_confirm"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::openFloat}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="悬浮按钮"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{float_window_enable?"已开启":"未开启"}'
-                        android:textColor="@{float_window_enable?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="已开启"
-                        tools:textColor="@color/setting_enable_color" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::voiceBroadcast}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="短信语音播报"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{voice_broadcast?"已开启":"未开启"}'
-                        android:textColor="@{voice_broadcast?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::autoAccept}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="微信自动接听"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{auto_accept?"已开启":"未开启"}'
-                        android:textColor="@{auto_accept?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::setDialTone}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="拨号提示音"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{dial_tone?"已开启":"未开启"}'
-                        android:textColor="@{dial_tone?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::setStatusBar}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="通知栏开关"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{status_bar?"已开启":"未开启"}'
-                        android:textColor="@{status_bar?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::setSimCard}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="拨号设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::toInternet}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="网络设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::toFont}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="亮度字体设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::toTouch}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="防误触设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::toDockSetting}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="快捷图标设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::toSettings}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="系统其他设置"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::checkupdate}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="检测更新"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:text="@{versionName}"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="23sp"
-                        android:layout_marginEnd="8dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/imageView13"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/imageView13"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-        </ScrollView>
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/activity_sim_card.xml b/app/src/main/res/layout-sw700dp/activity_sim_card.xml
deleted file mode 100644
index 0172463..0000000
--- a/app/src/main/res/layout-sw700dp/activity_sim_card.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".activity.sim.SimCardActivity">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.activity.sim.SimCardActivity.BtnClick" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/general_setting_bg"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/iv_cancel"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:adjustViewBounds="true"
-                android:onClick="@{click::exit}"
-                android:scaleType="centerInside"
-                android:src="@drawable/add_contact_back"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:text="默认拨号设置"
-                android:textColor="@color/white"
-                android:textSize="23sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/iv_confirm"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerInside"
-                android:src="@drawable/icon_confirm"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:background="@color/white"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/activity_touch.xml b/app/src/main/res/layout-sw700dp/activity_touch.xml
deleted file mode 100644
index b701279..0000000
--- a/app/src/main/res/layout-sw700dp/activity_touch.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.setting.TouchActivity">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.activity.setting.TouchActivity.BtnClick" />
-
-        <variable
-            name="disable_key"
-            type="Boolean" />
-
-        <variable
-            name="disable_contact"
-            type="Boolean" />
-
-        <variable
-            name="disable_clock"
-            type="Boolean" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/general_setting_bg"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:text="防止误触设置"
-                android:textColor="@color/white"
-                android:textSize="23sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/iv_confirm"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerInside"
-                android:src="@drawable/icon_confirm"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::disableVolumeKey}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="音量键禁用"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{disable_key?"已开启":"未开启"}'
-                        android:textColor="@{disable_key?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::disableContactModify}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="修改联系人禁用"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{disable_contact?"已开启":"未开启"}'
-                        android:textColor="@{disable_contact?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="设置访问禁用"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:onClick="@{click::disableClockModify}">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="闹钟设置禁用"
-                        android:textColor="@color/black"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{disable_clock?"已开启":"未开启"}'
-                        android:textColor="@{disable_clock?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="22sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/lightGray"
-                        app:layout_constraintBottom_toBottomOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-        </ScrollView>
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/fragment_applist.xml b/app/src/main/res/layout-sw700dp/fragment_applist.xml
deleted file mode 100644
index 8d0d5cb..0000000
--- a/app/src/main/res/layout-sw700dp/fragment_applist.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragment.app.AppListFragment">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="330dp"
-            android:layout_height="400dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.vscool.os.view.MyGridLayout
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="2px"
-                android:layout_marginTop="2px"
-                android:layout_marginEnd="2px"
-                android:layout_marginBottom="2px"
-                android:orientation="vertical"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!--    <ImageView-->
-            <!--        android:layout_width="2px"-->
-            <!--        android:layout_height="0dp"-->
-            <!--        android:background="@color/line_color"-->
-            <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--        app:layout_constraintStart_toStartOf="parent"-->
-            <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
-            <!--    <ImageView-->
-            <!--        android:layout_width="2px"-->
-            <!--        android:layout_height="0dp"-->
-            <!--        android:background="@color/line_color"-->
-            <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--        app:layout_constraintEnd_toEndOf="parent"-->
-            <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
-            <!--    <ImageView-->
-            <!--        android:layout_width="0dp"-->
-            <!--        android:layout_height="2px"-->
-            <!--        android:background="@color/line_color"-->
-            <!--        app:layout_constraintEnd_toEndOf="parent"-->
-            <!--        app:layout_constraintStart_toStartOf="parent"-->
-            <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
-            <!--    <ImageView-->
-            <!--        android:layout_width="0dp"-->
-            <!--        android:layout_height="2px"-->
-            <!--        android:background="@color/line_color"-->
-            <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--        app:layout_constraintEnd_toEndOf="parent"-->
-            <!--        app:layout_constraintStart_toStartOf="parent" />-->
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/fragment_contact_home.xml b/app/src/main/res/layout-sw700dp/fragment_contact_home.xml
deleted file mode 100644
index 07c4650..0000000
--- a/app/src/main/res/layout-sw700dp/fragment_contact_home.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragment.contact.ContactFragment">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.fragment.contact.ContactFragment.BtnClick" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="330dp"
-            android:layout_height="400dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_weather"
-                android:layout_width="330dp"
-                android:layout_height="165dp"
-                android:onClick="@{click::toWeather}"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/tv_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:textColor="@color/white"
-                        android:textSize="44sp"
-                        android:textStyle="bold"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="00:00" />
-
-                    <TextView
-                        android:id="@+id/tv_data"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:layout_marginTop="8dp"
-                        android:maxLines="1"
-                        android:textColor="@color/white"
-                        android:textSize="18sp"
-                        app:layout_constraintStart_toStartOf="@+id/tv_time"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_time"
-                        tools:text="20230621" />
-
-                    <TextView
-                        android:id="@+id/tv_week"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:maxLines="1"
-                        android:textColor="@color/white"
-                        android:textSize="18sp"
-                        app:layout_constraintStart_toStartOf="@+id/tv_data"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_data"
-                        tools:text="20230621" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout26"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="16dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/tv_temp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:text="--℃"
-                        android:textColor="@color/white"
-                        android:textSize="40sp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="0℃" />
-
-                    <TextView
-                        android:id="@+id/tv_weather"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="--"
-                        android:textColor="@color/white"
-                        android:textSize="18sp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_temp"
-                        tools:text="天气" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_weather">
-
-                        <ImageView
-                            android:id="@+id/imageView11"
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:src="@drawable/home_icon_location"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/tv_location"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
-                            android:text="--"
-                            android:textColor="@color/white"
-                            android:textSize="20sp"
-                            app:layout_constraintBottom_toBottomOf="@+id/imageView11"
-                            app:layout_constraintStart_toEndOf="@+id/imageView11"
-                            app:layout_constraintTop_toTopOf="@+id/imageView11"
-                            tools:text="位置" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_contact"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/cl_weather" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_nodata"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="12dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/cl_weather">
-
-                <TextView
-                    android:id="@+id/tv_no_contact"
-                    android:layout_width="match_parent"
-                    android:layout_height="64dp"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
-                    android:gravity="center"
-                    android:text="暂无联系人"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_add"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_add"
-                    android:layout_width="match_parent"
-                    android:layout_height="64dp"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="32dp"
-                    android:background="@drawable/fragment_add_contact_background"
-                    android:gravity="center"
-                    android:onClick="@{click::toAdd}"
-                    android:text="添加联系人"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:visibility="visible"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/fragment_home.xml b/app/src/main/res/layout-sw700dp/fragment_home.xml
deleted file mode 100644
index 9eca402..0000000
--- a/app/src/main/res/layout-sw700dp/fragment_home.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragment.home.HomeFragment">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.fragment.home.HomeFragment.BtnClick" />
-
-        <variable
-            name="flashing"
-            type="Boolean" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="330dp"
-                android:layout_height="400dp"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_weather"
-                    android:layout_width="330dp"
-                    android:layout_height="165dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:onClick="@{click::openCalendar}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="44sp"
-                            android:textStyle="bold"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="00:00" />
-
-                        <TextView
-                            android:id="@+id/tv_data"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
-                            android:layout_marginTop="8dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="@+id/tv_time"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_time"
-                            tools:text="20230621" />
-
-                        <TextView
-                            android:id="@+id/tv_week"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="@+id/tv_data"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_data"
-                            tools:text="20230621" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/constraintLayout26"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:onClick="@{click::toWeather}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_temp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:text="--℃"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="0℃" />
-
-                        <TextView
-                            android:id="@+id/tv_weather"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="--"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_temp"
-                            tools:text="天气" />
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_weather">
-
-                            <ImageView
-                                android:id="@+id/imageView11"
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:src="@drawable/home_icon_location"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_location"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:text="--"
-                                android:textColor="@color/white"
-                                android:textSize="20sp"
-                                app:layout_constraintBottom_toBottomOf="@+id/imageView11"
-                                app:layout_constraintStart_toEndOf="@+id/imageView11"
-                                app:layout_constraintTop_toTopOf="@+id/imageView11"
-                                tools:text="位置" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="horizontal">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:background="@drawable/card_bindsn_background"
-                        android:onClick="@{click::toSn}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView19"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView19"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="辅助功能"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:onClick="@{click::addContact}"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView10"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView10"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="家庭空间"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:background="@drawable/card_wifi_background"
-                        android:onClick="@{click::openWifi}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@{flashing?@drawable/home_icon_light_on:@drawable/home_icon_light_off}"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView18"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView18"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="手电筒"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="horizontal">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:background="@drawable/card_flashlight_background"
-                        android:onClick="@{click::openFlash}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/cl_contact">
-
-                        <TextView
-                            android:id="@+id/textView31"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="应用市场"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView31"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:onClick="@{click::openCalendar}"
-                        app:layout_constraintStart_toStartOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_app"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="更多应用"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/tv_app"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:background="@drawable/card_network_background"
-                        android:onClick="@{click::openNetwork}"
-                        android:visibility="visible"
-                        app:layout_constraintStart_toEndOf="@+id/cl_space"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView3"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="闹钟"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/fragment_settings.xml b/app/src/main/res/layout-sw700dp/fragment_settings.xml
deleted file mode 100644
index 42b5b90..0000000
--- a/app/src/main/res/layout-sw700dp/fragment_settings.xml
+++ /dev/null
@@ -1,479 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragment.settings.SettingsFragment">
-
-    <data>
-
-        <variable
-            name="click"
-            type="com.vscool.os.fragment.settings.SettingsFragment.BtnClick" />
-
-        <variable
-            name="systemSettings"
-            type="com.vscool.os.bean.SystemSettings" />
-
-        <import type="android.view.View" />
-    </data>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="330dp"
-                android:layout_height="400dp"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_weather"
-                    android:layout_width="330dp"
-                    android:layout_height="165dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:onClick="@{click::openCalendar}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="44sp"
-                            android:textStyle="bold"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="00:00" />
-
-                        <TextView
-                            android:id="@+id/tv_data"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="4dp"
-                            android:layout_marginTop="8dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="@+id/tv_time"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_time"
-                            tools:text="20230621" />
-
-                        <TextView
-                            android:id="@+id/tv_week"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:maxLines="1"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="@+id/tv_data"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_data"
-                            tools:text="20230621" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/constraintLayout26"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:onClick="@{click::toWeather}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <TextView
-                            android:id="@+id/tv_temp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:text="--℃"
-                            android:textColor="@color/white"
-                            android:textSize="40sp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="0℃" />
-
-                        <TextView
-                            android:id="@+id/tv_weather"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="--"
-                            android:textColor="@color/white"
-                            android:textSize="18sp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_temp"
-                            tools:text="天气" />
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_weather">
-
-                            <ImageView
-                                android:id="@+id/imageView11"
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:src="@drawable/home_icon_location"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_location"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="4dp"
-                                android:text="--"
-                                android:textColor="@color/white"
-                                android:textSize="20sp"
-                                app:layout_constraintBottom_toBottomOf="@+id/imageView11"
-                                app:layout_constraintStart_toEndOf="@+id/imageView11"
-                                app:layout_constraintTop_toTopOf="@+id/imageView11"
-                                tools:text="位置" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="horizontal">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginEnd="6dp"
-                        android:layout_marginStart="6dp"
-                        android:onClick="@{click::openSettings}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_bind"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView21"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView21"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="设备绑定"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:background="@drawable/card_family_background"
-                        android:onClick="@{click::toVideoplayer}"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_add_contact"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView22"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView22"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="新建联系人"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginEnd="6dp"
-                        android:layout_marginStart="6dp"
-                        android:background="@drawable/card_alarm_clock_bakground"
-                        android:onClick="@{click::openAlarmClock}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_bind"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView19"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView19"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="设备绑定"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="horizontal"
-                    android:visibility="visible">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
-                        android:background="@drawable/card_sos_background"
-                        android:onClick="@{click::openEmergency}"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_add_contact"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView20"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView20"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="新建联系人"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginEnd="6dp"
-                        android:layout_marginStart="6dp"
-                        android:onClick="@{click::toAppstore}"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_wifi"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView18"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView18"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="WiFi设置"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="98dp"
-                        android:layout_height="89dp"
-                        android:layout_marginStart="6dp"
-                        android:background="@drawable/card_more_app_background"
-                        android:onClick="@{click::dailyApp}"
-                        android:visibility="visible"
-                        app:layout_constraintStart_toEndOf="@+id/cl_space"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <ImageView
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/setting_icon_network"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toTopOf="@+id/textView3"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:text="流量设置"
-                            android:textColor="@color/white"
-                            android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:orientation="horizontal">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="330dp"
-                        android:layout_height="89dp"
-                        android:layout_marginTop="12dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/cl_contact">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/clLocation"
-                            android:layout_width="match_parent"
-                            tools:visibility="visible"
-                            android:layout_marginStart="6dp"
-                            android:layout_marginEnd="6dp"
-                            android:layout_height="match_parent"
-                            android:onClick="@{click::getAddress}"
-                            android:visibility="@{systemSettings.desktop_location==1?View.VISIBLE:View.INVISIBLE}">
-
-                            <ImageView
-                                android:id="@+id/imageView14"
-                                android:layout_width="28dp"
-                                android:layout_height="28dp"
-                                android:layout_marginEnd="12dp"
-                                android:adjustViewBounds="true"
-                                android:onClick="@{click::getAddress}"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/icon_location_refresh"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tv_location2"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:layout_marginEnd="8dp"
-                                android:gravity="center"
-                                android:maxLines="3"
-                                android:text="我的位置"
-                                android:textColor="@color/white"
-                                android:textSize="19sp"
-                                android:textStyle="bold"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toStartOf="@+id/imageView14"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <TextView
-                            android:id="@+id/tv_location_tips"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:maxLines="1"
-                            android:text="定位功能未开放"
-                            android:textColor="@color/white"
-                            android:textSize="19sp"
-                            tools:visibility="gone"
-                            android:visibility="@{systemSettings.desktop_location==1?View.GONE:View.VISIBLE}"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </FrameLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/item_actions.xml b/app/src/main/res/layout-sw700dp/item_actions.xml
deleted file mode 100644
index eed2a7a..0000000
--- a/app/src/main/res/layout-sw700dp/item_actions.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/btn_booktag"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/iv_bg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="4dp"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/app_card_backround" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <!--        <ImageView-->
-        <!--            android:layout_width="2px"-->
-        <!--            android:layout_height="0dp"-->
-        <!--            android:background="@color/line_color"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--        <ImageView-->
-        <!--            android:layout_width="2px"-->
-        <!--            android:layout_height="0dp"-->
-        <!--            android:background="@color/line_color"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--        <ImageView-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="2px"-->
-        <!--            android:background="@color/line_color"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--        <ImageView-->
-        <!--            android:layout_width="0dp"-->
-        <!--            android:layout_height="2px"-->
-        <!--            android:background="@color/line_color"-->
-        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--            app:layout_constraintEnd_toEndOf="parent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent" />-->
-
-        <ImageView
-            android:id="@+id/iv"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_app"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="28dp"
-            android:layout_marginTop="28dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitCenter"
-            android:visibility="gone"
-            app:layout_constraintStart_toStartOf="@+id/iv"
-            app:layout_constraintTop_toTopOf="@+id/iv" />
-
-        <TextView
-            android:id="@+id/bg"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="52dp"
-            android:layout_marginBottom="52dp"
-            android:background="@drawable/badge_bg"
-            android:gravity="center"
-            android:maxLines="1"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:text="1"
-            android:textColor="@color/white"
-            android:textSize="12sp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/iv"
-            app:layout_constraintStart_toStartOf="@+id/iv" />
-
-        <TextView
-            android:id="@+id/tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:gravity="center"
-            android:maxLines="2"
-            android:textColor="@color/white"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="@+id/iv"
-            app:layout_constraintStart_toStartOf="@+id/iv"
-            app:layout_constraintTop_toBottomOf="@+id/iv" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/item_contact_wechat.xml b/app/src/main/res/layout-sw700dp/item_contact_wechat.xml
deleted file mode 100644
index c1ea444..0000000
--- a/app/src/main/res/layout-sw700dp/item_contact_wechat.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="128dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_bg"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="4dp"
-            android:adjustViewBounds="true"
-            android:scaleType="fitXY"
-            android:src="@drawable/contact_card_backround" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_contact"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.shehuan.niv.NiceImageView
-                android:id="@+id/iv_head"
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/default_avatar"
-                app:is_circle="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.126" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="@+id/iv_head"
-                app:layout_constraintStart_toStartOf="@+id/iv_head"
-                app:layout_constraintTop_toBottomOf="@+id/iv_head">
-
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="20sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="姓名" />
-
-                <TextView
-                    android:id="@+id/tv_phone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:maxLines="1"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_name"
-                    tools:text="phone" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw700dp/item_dock_app.xml b/app/src/main/res/layout-sw700dp/item_dock_app.xml
deleted file mode 100644
index 3f219e5..0000000
--- a/app/src/main/res/layout-sw700dp/item_dock_app.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="72dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/iv_icon"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/home_icon_dialer"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/bg"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp"
-                android:layout_marginStart="44dp"
-                android:layout_marginBottom="44dp"
-                android:background="@drawable/badge_bg"
-                android:gravity="center"
-                android:minWidth="20dp"
-                android:text="9"
-                android:textColor="@color/white"
-                android:textSize="12sp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
-                app:layout_constraintStart_toStartOf="@+id/iv_icon" />
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="拨号"
-                android:visibility="gone"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="@+id/iv_icon"
-                app:layout_constraintStart_toStartOf="@+id/iv_icon"
-                app:layout_constraintTop_toBottomOf="@+id/iv_icon" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_alarm_add.xml b/app/src/main/res/layout/activity_alarm_add.xml
index c5e9a20..2b8fa54 100644
--- a/app/src/main/res/layout/activity_alarm_add.xml
+++ b/app/src/main/res/layout/activity_alarm_add.xml
@@ -15,7 +15,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:background="@color/default_light_background">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_exit"
@@ -87,9 +87,10 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="8dp"
-                        android:text="选择时间"
+                        android:text="时间"
                         android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -169,7 +170,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="80dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:background="@drawable/add_alarm_background">
@@ -185,7 +186,7 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/cl_type"
                             android:layout_width="match_parent"
-                            android:layout_height="0dp"
+                            android:layout_height="80dp"
                             android:layout_weight="1">
 
                             <TextView
@@ -193,76 +194,55 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="16dp"
-                                android:text="重复"
+                                android:text="类型"
                                 android:textColor="@color/black"
-                                android:textSize="16sp"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
-                            <TextView
-                                android:id="@+id/tv_type"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
-                                android:text="只响一次"
-                                android:textColor="@color/title_gray"
-                                android:textSize="12sp"
-                                android:visibility="gone"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
+                                android:layout_height="match_parent"
+                                android:onClick="@{click::setType}"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintTop_toTopOf="parent">
 
-                                <RadioGroup
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:orientation="horizontal">
+                                <TextView
+                                    android:id="@+id/tv_type"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="8dp"
+                                    android:text="一次"
+                                    android:textColor="@color/black"
+                                    android:textSize="20sp"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toStartOf="@+id/imageView2"
+                                    app:layout_constraintTop_toTopOf="parent" />
 
-                                    <RadioButton
-                                        android:id="@+id/rb1"
-                                        android:layout_width="50dp"
-                                        android:layout_height="25dp"
-                                        android:background="@drawable/tv_times_bg_once_selector"
-                                        android:button="@null"
-                                        android:textColor="@color/radio_botton_gray"
-                                        android:textSize="12sp" />
-
-                                    <RadioButton
-                                        android:id="@+id/rb2"
-                                        android:layout_width="50dp"
-                                        android:layout_height="25dp"
-                                        android:layout_marginStart="8dp"
-                                        android:background="@drawable/tv_times_bg_loop_selector"
-                                        android:button="@null"
-                                        android:textColor="@color/radio_botton_gray"
-                                        android:textSize="12sp" />
-                                </RadioGroup>
+                                <ImageView
+                                    android:id="@+id/imageView2"
+                                    android:layout_width="28dp"
+                                    android:layout_height="28dp"
+                                    android:layout_marginEnd="8dp"
+                                    android:adjustViewBounds="true"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_more"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
 
                             </androidx.constraintlayout.widget.ConstraintLayout>
 
-
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="16dp"
-                            android:background="@color/gray" />
-
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
-                            android:visibility="gone"
-                            android:layout_weight="1">
+                            android:layout_weight="1"
+                            android:visibility="gone">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -305,15 +285,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:text="标题"
+                        android:text="备注"
                         android:textColor="@color/black"
-                        android:textSize="12sp"
-                        android:visibility="gone"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_activation"
                         android:layout_width="0dp"
@@ -323,7 +302,7 @@
                         android:background="@drawable/edit_background"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/textView27"
                         app:layout_constraintTop_toTopOf="parent">
 
                         <EditText
@@ -332,10 +311,10 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentBottom="true"
                             android:background="@null"
-                            android:hint="请输入标题"
-                            android:padding="4dp"
+                            android:hint="输入"
                             android:maxLength="13"
                             android:maxLines="1"
+                            android:padding="4dp"
                             android:singleLine="true"
                             android:textColorHint="@color/radio_botton_gray"
                             android:textSize="18sp"
@@ -350,7 +329,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="160dp"
+                    android:layout_height="200dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -362,9 +341,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:text="选择图片或视频"
+                        android:text="附件"
                         android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
                         app:layout_constraintBottom_toTopOf="@+id/cl_pic"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -377,7 +357,8 @@
                         android:onClick="@{click::openGallery}"
                         android:padding="8dp"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="@+id/textView28"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent">
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -400,7 +381,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
-                        android:textColor="@color/radio_botton_gray"
+                        android:textColor="@color/black"
                         android:textSize="13sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="@+id/cl_pic"
@@ -425,8 +406,9 @@
             android:gravity="center"
             android:onClick="@{click::submit}"
             android:text="添加闹钟"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="18sp"
+            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/activity_alarm_edit.xml b/app/src/main/res/layout/activity_alarm_edit.xml
index 051c635..124ffd7 100644
--- a/app/src/main/res/layout/activity_alarm_edit.xml
+++ b/app/src/main/res/layout/activity_alarm_edit.xml
@@ -20,7 +20,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:background="@color/default_light_background">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_exit"
@@ -53,7 +53,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="编辑闹钟"
+                    android:text="设置闹钟"
                     android:textColor="@color/black"
                     android:textSize="18sp"
                     android:textStyle="bold"
@@ -92,9 +92,10 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="8dp"
-                        android:text="选择时间"
+                        android:text="时间"
                         android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -113,7 +114,68 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@drawable/add_alarm_background"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/textView25"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:text="闹钟类型"
+                        android:textColor="@color/black"
+                        android:textSize="12sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <RadioGroup
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/textView25"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <RadioButton
+                            android:id="@+id/rb_all"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:button="@null"
+                            android:checked="true"
+                            android:textColor="@color/radio_botton_gray"
+                            android:textSize="9sp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_look"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:layout_marginStart="8dp"
+                            android:button="@null"
+                            android:textColor="@color/radio_botton_gray"
+                            android:textSize="9sp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_reserve"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:layout_marginStart="8dp"
+                            android:button="@null"
+                            android:textColor="@color/radio_botton_gray"
+                            android:textSize="9sp" />
+
+                    </RadioGroup>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
                     android:background="@drawable/add_alarm_background">
@@ -129,7 +191,7 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/cl_type"
                             android:layout_width="match_parent"
-                            android:layout_height="0dp"
+                            android:layout_height="80dp"
                             android:layout_weight="1">
 
                             <TextView
@@ -137,63 +199,55 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="16dp"
-                                android:text="重复"
+                                android:text="类型"
                                 android:textColor="@color/black"
-                                android:textSize="16sp"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
+                                android:layout_height="match_parent"
+                                android:onClick="@{click::setType}"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintTop_toTopOf="parent">
 
-                                <RadioGroup
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:orientation="horizontal">
+                                <TextView
+                                    android:id="@+id/tv_type"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="8dp"
+                                    android:text="一次"
+                                    android:textColor="@color/black"
+                                    android:textSize="20sp"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toStartOf="@+id/imageView2"
+                                    app:layout_constraintTop_toTopOf="parent" />
 
-                                    <RadioButton
-                                        android:id="@+id/rb1"
-                                        android:layout_width="50dp"
-                                        android:layout_height="25dp"
-                                        android:background="@drawable/tv_times_bg_once_selector"
-                                        android:button="@null"
-                                        android:textColor="@color/radio_botton_gray"
-                                        android:textSize="12sp" />
-
-                                    <RadioButton
-                                        android:id="@+id/rb2"
-                                        android:layout_width="50dp"
-                                        android:layout_height="25dp"
-                                        android:layout_marginStart="8dp"
-                                        android:background="@drawable/tv_times_bg_loop_selector"
-                                        android:button="@null"
-                                        android:textColor="@color/radio_botton_gray"
-                                        android:textSize="12sp" />
-                                </RadioGroup>
+                                <ImageView
+                                    android:id="@+id/imageView2"
+                                    android:layout_width="28dp"
+                                    android:layout_height="28dp"
+                                    android:layout_marginEnd="8dp"
+                                    android:adjustViewBounds="true"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_more"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
 
                             </androidx.constraintlayout.widget.ConstraintLayout>
 
-
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="16dp"
-                            android:background="@color/gray" />
-
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
-                            android:visibility="gone"
-                            android:layout_weight="1">
+                            android:layout_weight="1"
+                            android:visibility="gone">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -236,15 +290,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:text="标题"
+                        android:text="备注"
                         android:textColor="@color/black"
-                        android:textSize="12sp"
-                        android:visibility="gone"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_activation"
                         android:layout_width="0dp"
@@ -254,7 +307,7 @@
                         android:background="@drawable/edit_background"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/textView27"
                         app:layout_constraintTop_toTopOf="parent">
 
                         <EditText
@@ -263,11 +316,10 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentBottom="true"
                             android:background="@null"
-                            android:hint="请输入标题"
-                            android:text="@{alarmClockData.title}"
-                            android:padding="4dp"
+                            android:hint="输入"
                             android:maxLength="13"
                             android:maxLines="1"
+                            android:padding="4dp"
                             android:singleLine="true"
                             android:textColorHint="@color/radio_botton_gray"
                             android:textSize="18sp"
@@ -282,7 +334,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="160dp"
+                    android:layout_height="200dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -294,9 +346,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:text="选择图片或视频"
+                        android:text="附件"
                         android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
                         app:layout_constraintBottom_toTopOf="@+id/cl_pic"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -309,7 +362,8 @@
                         android:onClick="@{click::openGallery}"
                         android:padding="8dp"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="@+id/textView28"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent">
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -332,7 +386,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
-                        android:textColor="@color/radio_botton_gray"
+                        android:textColor="@color/black"
                         android:textSize="13sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="@+id/cl_pic"
@@ -355,9 +409,10 @@
             android:layout_marginBottom="8dp"
             android:background="@drawable/tv_add_alarm_background"
             android:gravity="center"
+            android:textStyle="bold"
             android:onClick="@{click::submit}"
-            android:text="保存"
-            android:textColor="@color/white"
+            android:text="添加闹钟"
+            android:textColor="@color/black"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml
index 23b21dd..340afc7 100644
--- a/app/src/main/res/layout/activity_alarm_list.xml
+++ b/app/src/main/res/layout/activity_alarm_list.xml
@@ -28,7 +28,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_exit"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="64dp"
+                android:background="@color/default_color"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -46,6 +47,7 @@
                         android:id="@+id/imageView12"
                         android:layout_width="32dp"
                         android:layout_height="32dp"
+                        android:layout_marginStart="8dp"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/back_black"
@@ -58,7 +60,7 @@
                         android:layout_height="wrap_content"
                         android:text="我的闹钟"
                         android:textColor="@color/black"
-                        android:textSize="18sp"
+                        android:textSize="22sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/imageView12"
@@ -70,7 +72,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:background="@color/default_light_background"
+                app:layout_constraintBottom_toTopOf="@+id/constraintLayout17"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/cl_exit">
@@ -123,17 +126,52 @@
                         android:layout_gravity="bottom|center"
                         android:layout_marginBottom="16dp"
                         android:background="@null"
-                        android:backgroundTint="#4880FF"
+                        android:backgroundTint="@color/default_color"
                         android:onClick="@{click::add}"
                         android:src="@drawable/fb_alarm_add"
+                        android:visibility="gone"
                         app:borderWidth="0dp"
                         app:fabCustomSize="80dp"
                         app:layout_behavior="com.vscool.os.view.FAB_Float_on_Scroll" />
 
                 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout17"
+                android:layout_width="match_parent"
+                android:layout_height="64dp"
+                android:layout_weight="2"
+                android:background="@drawable/contact_add_contact_bg"
+                android:onClick="@{click::add}"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="添加闹钟"
+                        android:textColor="@color/black"
+                        android:textSize="20sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_add_contact.xml b/app/src/main/res/layout/activity_contact_add.xml
similarity index 93%
rename from app/src/main/res/layout/activity_add_contact.xml
rename to app/src/main/res/layout/activity_contact_add.xml
index feef218..440b154 100644
--- a/app/src/main/res/layout/activity_add_contact.xml
+++ b/app/src/main/res/layout/activity_contact_add.xml
@@ -70,19 +70,25 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <com.shehuan.niv.NiceImageView
-                        android:id="@+id/nv_avatar"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_gravity="center"
-                        android:layout_marginTop="32dp"
-                        android:layout_marginBottom="32dp"
-                        android:onClick="@{click::selectPic}"
-                        android:src="@drawable/default_avatar"
-                        app:is_circle="true"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="164dp"
+                        android:background="@color/default_color">
+
+                        <com.shehuan.niv.NiceImageView
+                            android:id="@+id/nv_avatar"
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            android:layout_gravity="center"
+                            android:onClick="@{click::selectPic}"
+                            android:src="@drawable/default_avatar"
+                            app:is_circle="true"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -113,7 +119,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="姓名"
+                            android:text="微信备注"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -171,7 +177,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="号码"
+                            android:text="手机号码"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -229,7 +235,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="微信"
+                            android:text="微信标签"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -262,14 +268,13 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="60dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
+                        android:layout_margin="8dp">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="12dp"
-                            android:text="设为紧急联系人"
+                            android:text="紧急联系人开关"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_edit_contact.xml b/app/src/main/res/layout/activity_contact_edit.xml
similarity index 92%
rename from app/src/main/res/layout/activity_edit_contact.xml
rename to app/src/main/res/layout/activity_contact_edit.xml
index d1f9cef..eafe62e 100644
--- a/app/src/main/res/layout/activity_edit_contact.xml
+++ b/app/src/main/res/layout/activity_contact_edit.xml
@@ -73,8 +73,6 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
 
@@ -92,21 +90,25 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
-                    <com.shehuan.niv.NiceImageView
-                        android:id="@+id/nv_avatar"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_gravity="center"
-                        android:layout_marginTop="32dp"
-                        android:layout_marginBottom="32dp"
-                        android:onClick="@{click::selectPic}"
-                        android:src="@drawable/default_avatar"
-                        app:error="@{@drawable/default_avatar}"
-                        app:imageUrl="@{contact.avatar}"
-                        app:is_circle="true"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="164dp"
+                        android:background="@color/default_color">
+
+                        <com.shehuan.niv.NiceImageView
+                            android:id="@+id/nv_avatar"
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            android:layout_gravity="center"
+                            android:onClick="@{click::selectPic}"
+                            android:src="@drawable/default_avatar"
+                            app:is_circle="true"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -137,7 +139,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="姓名"
+                            android:text="微信备注"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -196,7 +198,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="号码"
+                            android:text="手机号码"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -255,7 +257,7 @@
                             android:gravity="center"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:text="微信"
+                            android:text="微信标签"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -288,14 +290,13 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="60dp"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/add_wechat_contact_background">
+                        android:layout_margin="8dp">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="12dp"
-                            android:text="设为紧急联系人"
+                            android:text="紧急联系人开关"
                             android:textColor="@color/black"
                             android:textSize="18sp"
                             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_contact_list.xml b/app/src/main/res/layout/activity_contact_list.xml
index 49d6222..69a9a20 100644
--- a/app/src/main/res/layout/activity_contact_list.xml
+++ b/app/src/main/res/layout/activity_contact_list.xml
@@ -96,12 +96,13 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="加人"
+                        android:text="添加联系人"
                         android:textColor="@color/white"
-                        android:textSize="30sp"
+                        android:textSize="26sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/imageView11"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_dailyapp.xml b/app/src/main/res/layout/activity_dailyapp.xml
index f695d05..a25d4f2 100644
--- a/app/src/main/res/layout/activity_dailyapp.xml
+++ b/app/src/main/res/layout/activity_dailyapp.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/control_bg">
+        android:background="@color/default_background_color">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout"
@@ -24,13 +24,13 @@
 
             <ImageView
                 android:id="@+id/iv_back"
-                android:layout_width="60dp"
+                android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginStart="8dp"
                 android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
                 android:onClick="@{click::exit}"
-                android:src="@drawable/exit"
+                android:scaleType="centerCrop"
+                android:src="@drawable/back_black"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -39,8 +39,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="日常应用"
-                android:textColor="@color/white"
-                android:textSize="18sp"
+                android:textColor="@color/black"
+                android:textSize="22sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -53,6 +53,7 @@
                 android:layout_marginEnd="8dp"
                 android:textColor="@color/white"
                 android:textSize="14sp"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -63,9 +64,9 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_dock.xml b/app/src/main/res/layout/activity_dock.xml
index 5e613ba..a14c1b1 100644
--- a/app/src/main/res/layout/activity_dock.xml
+++ b/app/src/main/res/layout/activity_dock.xml
@@ -5,6 +5,7 @@
     tools:context=".activity.dock.DockActivity">
 
     <data>
+
         <variable
             name="click"
             type="com.vscool.os.activity.dock.DockActivity.BtnClick" />
@@ -12,7 +13,6 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@drawable/control_bg"
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -23,12 +23,12 @@
 
             <ImageView
                 android:id="@+id/iv_back"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
                 android:layout_marginStart="8dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/back_white"
+                android:src="@drawable/back_black"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -36,9 +36,10 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="快捷应用"
-                android:textColor="@color/white"
+                android:text="DOCK栏图标"
+                android:textColor="@color/black"
                 android:textSize="18sp"
+                android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -49,8 +50,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textSize="14sp"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/activity_flashlight.xml b/app/src/main/res/layout/activity_flashlight.xml
index 26d71d8..084e019 100644
--- a/app/src/main/res/layout/activity_flashlight.xml
+++ b/app/src/main/res/layout/activity_flashlight.xml
@@ -11,12 +11,12 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#323a4c">
+        android:background="@color/default_light_background">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_exit"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="64dp"
             android:background="@drawable/general_setting_bg"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -27,7 +27,7 @@
                 android:layout_marginStart="8dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/back_white"
+                android:src="@drawable/back_black"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -36,8 +36,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="手电筒"
-                android:textColor="@color/white"
-                android:textSize="18sp"
+                android:textColor="@color/black"
+                android:textSize="22sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -55,32 +55,18 @@
             app:layout_constraintTop_toBottomOf="@+id/cl_exit"
             app:layout_constraintVertical_bias="0.385">
 
-            <TextView
-                android:id="@+id/tv_flashlight_statu"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="手电筒"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                android:textStyle="bold"
+            <ImageView
+                android:id="@+id/iv_statu"
+                android:layout_width="300dp"
+                android:layout_height="482dp"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_turn_off"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/iv_statu"
-                android:layout_width="120dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="64dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/icon_flash_light_close"
-                app:layout_constraintEnd_toEndOf="@+id/tv_flashlight_statu"
-                app:layout_constraintStart_toStartOf="@+id/tv_flashlight_statu"
-                app:layout_constraintTop_toBottomOf="@+id/tv_flashlight_statu" />
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_network.xml b/app/src/main/res/layout/activity_network.xml
index 6e08dfb..07bec26 100644
--- a/app/src/main/res/layout/activity_network.xml
+++ b/app/src/main/res/layout/activity_network.xml
@@ -11,12 +11,12 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#323a4c">
+        android:background="@color/default_light_background">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_exit"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
+            android:layout_height="64dp"
             android:background="@drawable/general_setting_bg"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -27,7 +27,7 @@
                 android:layout_marginStart="16dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/back_white"
+                android:src="@drawable/back_black"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -36,8 +36,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="移动数据"
-                android:textColor="@color/white"
-                android:textSize="18sp"
+                android:textColor="@color/black"
+                android:textSize="22sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -55,32 +55,18 @@
             app:layout_constraintTop_toBottomOf="@+id/cl_exit"
             app:layout_constraintVertical_bias="0.385">
 
-            <TextView
-                android:id="@+id/tv_flashlight_statu"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:text="移动数据"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                android:textStyle="bold"
+            <ImageView
+                android:id="@+id/iv_statu"
+                android:layout_width="300dp"
+                android:layout_height="482dp"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_turn_off"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/iv_statu"
-                android:layout_width="120dp"
-                android:layout_height="120dp"
-                android:layout_marginTop="64dp"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/icon_flash_light_close"
-                app:layout_constraintEnd_toEndOf="@+id/tv_flashlight_statu"
-                app:layout_constraintStart_toStartOf="@+id/tv_flashlight_statu"
-                app:layout_constraintTop_toBottomOf="@+id/tv_flashlight_statu" />
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -88,5 +74,6 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_phone.xml b/app/src/main/res/layout/activity_phone.xml
index 48f9699..8b43400 100644
--- a/app/src/main/res/layout/activity_phone.xml
+++ b/app/src/main/res/layout/activity_phone.xml
@@ -24,12 +24,14 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:tl_indicator_color="#FFFFFF"
+            app:tl_indicator_color="@color/black"
             app:tl_indicator_style="TRIANGLE"
             app:tl_indicator_width_equal_title="true"
             app:tl_selectTextSize="22sp"
             app:tl_tab_space_equal="true"
             app:tl_textBold="SELECT"
+            app:tl_textSelectColor="@color/black"
+            app:tl_textUnselectColor="@color/black"
             app:tl_textsize="20sp" />
 
         <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 445eff6..7f584b2 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -10,33 +10,6 @@
             name="click"
             type="com.vscool.os.activity.setting.SettingActivity.BtnClick" />
 
-        <variable
-            name="float_window_enable"
-            type="Boolean" />
-
-        <variable
-            name="voice_broadcast"
-            type="Boolean" />
-
-        <variable
-            name="auto_accept"
-            type="Boolean" />
-
-        <variable
-            name="dial_tone"
-            type="Boolean" />
-
-        <variable
-            name="status_bar"
-            type="Boolean" />
-
-        <variable
-            name="versionName"
-            type="String" />
-
-        <variable
-            name="hourly_time"
-            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -56,9 +29,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:text="通用设置"
+                android:text="桌面设置"
                 android:textColor="@color/white"
-                android:textSize="25sp"
+                android:textSize="21sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -94,36 +67,28 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::openFloat}">
+                    android:layout_height="72dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="悬浮按钮"
+                        android:text="主页按钮"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_float"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{float_window_enable?"已开启":"未开启"}'
-                        android:textColor="@{float_window_enable?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="已开启"
-                        tools:textColor="@color/setting_enable_color" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -135,34 +100,29 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::voiceBroadcast}">
+                    android:layout_height="72dp"
+                    android:onClick="@{click::testTts}">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="短信语音播报"
+                        android:text="语音播报"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_sms"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{voice_broadcast?"已开启":"未开启"}'
-                        android:textColor="@{voice_broadcast?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -174,35 +134,28 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::autoAccept}">
+                    android:layout_height="72dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="微信自动接听"
+                        android:text="自动接听"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_auto"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{auto_accept?"已开启":"未开启"}'
-                        android:textColor="@{auto_accept?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -214,8 +167,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::setDialTone}">
+                    android:layout_height="72dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -224,25 +176,19 @@
                         android:maxLines="1"
                         android:text="拨号提示音"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_dialer"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{dial_tone?"已开启":"未开启"}'
-                        android:textColor="@{dial_tone?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -254,8 +200,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::setStatusBar}">
+                    android:layout_height="72dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -264,25 +209,19 @@
                         android:maxLines="1"
                         android:text="通知栏开关"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_statu"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{status_bar?"已开启":"未开启"}'
-                        android:textColor="@{status_bar?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -294,8 +233,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::setHourlyTimeSignal}">
+                    android:layout_height="72dp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -304,25 +242,19 @@
                         android:maxLines="1"
                         android:text="整点报时"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_hourly"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{hourly_time?"已开启":"未开启"}'
-                        android:textColor="@{hourly_time?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="未开启" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -334,8 +266,108 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::setSimCard}">
+                    android:layout_height="72dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="音量设置开关"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_volume"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/lightGray"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="72dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="联系人修改开关"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_contact"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/lightGray"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="72dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="闹钟设置开关"
+                        android:textColor="@color/black"
+                        android:textSize="18sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.vscool.os.view.ToggleButton
+                        android:id="@+id/tb_clock"
+                        android:layout_width="37dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/lightGray"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="72dp"
+                    android:onClick="@{click::setSimCard}"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -344,7 +376,7 @@
                         android:maxLines="1"
                         android:text="拨号设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -357,7 +389,7 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -384,8 +416,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::toInternet}">
+                    android:layout_height="72dp"
+                    android:onClick="@{click::toInternet}"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -394,7 +427,7 @@
                         android:maxLines="1"
                         android:text="网络设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -407,7 +440,7 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -434,8 +467,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::toFont}">
+                    android:layout_height="72dp"
+                    android:onClick="@{click::toFont}"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -444,7 +478,7 @@
                         android:maxLines="1"
                         android:text="亮度字体设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -457,7 +491,7 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -484,8 +518,9 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::toTouch}">
+                    android:layout_height="72dp"
+                    android:onClick="@{click::toTouch}"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -494,7 +529,7 @@
                         android:maxLines="1"
                         android:text="防误触设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -507,7 +542,7 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -534,7 +569,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="72dp"
                     android:onClick="@{click::toDockSetting}">
 
                     <TextView
@@ -542,38 +577,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="快捷图标设置"
+                        android:text="DOCK栏图标"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
@@ -584,7 +594,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="72dp"
                     android:onClick="@{click::toSettings}">
 
                     <TextView
@@ -592,38 +602,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="系统其他设置"
+                        android:text="系统设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text="未开启"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
@@ -634,7 +619,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="72dp"
                     android:onClick="@{click::checkupdate}">
 
                     <TextView
@@ -642,37 +627,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="检测更新"
+                        android:text="版本"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="18sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:text="@{versionName}"
-                        android:textColor="@color/setting_disable_color"
-                        android:textSize="23sp"
-                        android:layout_marginEnd="8dp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/imageView13"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/imageView13"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_more"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
diff --git a/app/src/main/res/layout/activity_wechat_call.xml b/app/src/main/res/layout/activity_wechat_call.xml
index ea059e5..c1b1763 100644
--- a/app/src/main/res/layout/activity_wechat_call.xml
+++ b/app/src/main/res/layout/activity_wechat_call.xml
@@ -211,8 +211,8 @@
 
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="310dp"
-                android:layout_height="70dp"
+                android:layout_width="304dp"
+                android:layout_height="60dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/icon_wechat_call_voice"
@@ -228,6 +228,7 @@
                     android:textColor="@color/white"
                     android:textSize="30sp"
                     android:textStyle="bold"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -236,8 +237,8 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="310dp"
-                android:layout_height="70dp"
+                android:layout_width="304dp"
+                android:layout_height="60dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/icon_wechat_call_video"
@@ -253,6 +254,7 @@
                     android:textColor="@color/white"
                     android:textSize="30sp"
                     android:textStyle="bold"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -261,8 +263,8 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="310dp"
-                android:layout_height="70dp"
+                android:layout_width="304dp"
+                android:layout_height="60dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/icon_wechat_call_phone"
@@ -277,6 +279,7 @@
                     android:textColor="@color/white"
                     android:textSize="30sp"
                     android:textStyle="bold"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -285,12 +288,13 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="310dp"
-                android:layout_height="70dp"
+                android:layout_width="304dp"
+                android:layout_height="60dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/icon_wechat_call_cancel"
-                android:onClick="@{click::exit}">
+                android:onClick="@{click::exit}"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_edit_contact.xml b/app/src/main/res/layout/dialog_edit_contact.xml
index 51b625b..6ead30a 100644
--- a/app/src/main/res/layout/dialog_edit_contact.xml
+++ b/app/src/main/res/layout/dialog_edit_contact.xml
@@ -34,7 +34,8 @@
                     android:singleLine="true"
                     android:text="@{Contact.mobile}"
                     android:textColor="@color/black"
-                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +47,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_edit"
                 android:layout_width="match_parent"
-                android:layout_height="80dp">
+                android:layout_height="72dp">
 
                 <ImageView
                     android:id="@+id/imageView15"
@@ -54,6 +55,7 @@
                     android:layout_height="32dp"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
+                    android:visibility="gone"
                     android:src="@drawable/icon_edit_contact"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -65,16 +67,15 @@
                     android:id="@+id/tv_phone"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
                     android:maxLines="1"
                     android:singleLine="true"
                     android:text="编辑联系人"
+                    android:gravity="center"
                     android:textColor="@color/black"
                     android:textSize="18sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.123"
-                    app:layout_constraintStart_toEndOf="@+id/imageView15"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
@@ -88,13 +89,14 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_delete"
                 android:layout_width="match_parent"
-                android:layout_height="80dp">
+                android:layout_height="72dp">
 
                 <ImageView
                     android:id="@+id/imageView16"
                     android:layout_width="32dp"
                     android:layout_height="32dp"
                     android:adjustViewBounds="true"
+                    android:visibility="gone"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_delete_contact"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -107,16 +109,15 @@
                     android:id="@+id/tv_vide"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
                     android:maxLines="1"
                     android:singleLine="true"
                     android:text="删除联系人"
                     android:textColor="@color/black"
                     android:textSize="18sp"
+                    android:gravity="center"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.123"
-                    app:layout_constraintStart_toEndOf="@+id/imageView16"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <View
@@ -129,7 +130,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_cancel"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="72dp"
                 android:layout_marginTop="8dp">
 
                 <TextView
diff --git a/app/src/main/res/layout/fragment_contact.xml b/app/src/main/res/layout/fragment_contact.xml
index 618e404..eb15254 100644
--- a/app/src/main/res/layout/fragment_contact.xml
+++ b/app/src/main/res/layout/fragment_contact.xml
@@ -22,8 +22,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout"
                 android:layout_width="match_parent"
-                android:visibility="gone"
                 android:layout_height="48dp"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -77,11 +77,11 @@
                     android:id="@+id/rv_contact"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    tools:listitem="@layout/item_contact"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:listitem="@layout/item_contact" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -105,12 +105,13 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="加人"
+                        android:text="添加联系人"
                         android:textColor="@color/white"
-                        android:textSize="30sp"
+                        android:textSize="26sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/imageView11"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_dialer_new.xml b/app/src/main/res/layout/fragment_dialer.xml
similarity index 99%
rename from app/src/main/res/layout/fragment_dialer_new.xml
rename to app/src/main/res/layout/fragment_dialer.xml
index 4734b27..f178936 100644
--- a/app/src/main/res/layout/fragment_dialer_new.xml
+++ b/app/src/main/res/layout/fragment_dialer.xml
@@ -44,7 +44,7 @@
                         android:inputType="phone"
                         android:letterSpacing="0.1"
                         android:paddingStart="8dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/black"
                         android:textSize="24sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/iv_delete"
@@ -447,10 +447,11 @@
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="0dp"
-                                android:onClick="@{click::add}"
-                                android:background="@drawable/contact_add_contact_bg"
                                 android:layout_height="match_parent"
-                                android:layout_weight="1">
+                                android:layout_weight="1"
+                                android:background="@drawable/contact_add_contact_bg"
+                                android:onClick="@{click::add}"
+                                android:visibility="gone">
 
                                 <TextView
                                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_alarm_clock.xml b/app/src/main/res/layout/item_alarm_clock.xml
index a7100e8..c950caf 100644
--- a/app/src/main/res/layout/item_alarm_clock.xml
+++ b/app/src/main/res/layout/item_alarm_clock.xml
@@ -8,10 +8,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="152dp"
+        android:layout_height="100dp"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
         android:background="@drawable/alarm_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -19,9 +19,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            android:id="@+id/linearLayout6"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,32 +38,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/black"
-                    android:textSize="24sp"
+                    android:textSize="28sp"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="00:00" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/tv_remind_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:background="@drawable/tv_times_bg_once"
-                    android:gravity="center"
-                    android:textColor="@color/white"
-                    android:textSize="13sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="一次" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
             <TextView
                 android:id="@+id/tv_title"
                 android:layout_width="wrap_content"
@@ -70,76 +52,34 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:maxLines="1"
-                android:textColor="@color/alarm_title_color"
-                android:textSize="13sp"
+                android:textColor="@color/black"
+                android:textSize="18sp"
                 app:layout_constraintStart_toStartOf="@+id/tv_remind_type"
                 app:layout_constraintTop_toBottomOf="@+id/tv_remind_type"
                 tools:text="标题" />
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_voice"
-                    android:layout_width="140dp"
-                    android:layout_height="24dp"
-                    android:background="@drawable/voice_background"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
-
-                    <TextView
-                        android:id="@+id/tv_voice"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:textColor="@color/white"
-                        android:textSize="14sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="0秒" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/voice"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_vp"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
+            android:layout_weight="1"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.vscool.os.view.JzvdStdRound
-                android:id="@+id/jz_video"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:radius="8dp" />
-
-            <com.shehuan.niv.NiceImageView
-                android:id="@+id/imageView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                app:corner_radius="8dp"
+            <TextView
+                android:id="@+id/tv_remind_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textColor="@color/black"
+                android:textSize="20sp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="一次" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_alarm_port.xml b/app/src/main/res/layout/item_alarm_port.xml
deleted file mode 100644
index 296ab52..0000000
--- a/app/src/main/res/layout/item_alarm_port.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/root"
-        android:layout_width="match_parent"
-        android:layout_height="152dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/alarm_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/iv_type"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="8dp"
-            android:visibility="gone"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/linearLayout6" />
-
-        <LinearLayout
-            android:id="@+id/linearLayout6"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/iv_type"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/tv_remind_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24dp"
-                    android:background="@drawable/tv_times_bg_once"
-                    android:gravity="center"
-                    android:textColor="@color/white"
-                    android:textSize="13sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="一次" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/tv_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black"
-                    android:textSize="24sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="00:00" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <TextView
-                android:id="@+id/tv_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:maxLines="1"
-                android:textColor="@color/alarm_title_color"
-                android:textSize="13sp"
-                app:layout_constraintStart_toStartOf="@+id/tv_remind_type"
-                app:layout_constraintTop_toBottomOf="@+id/tv_remind_type"
-                tools:text="标题" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_voice"
-                    android:layout_width="140dp"
-                    android:layout_height="24dp"
-                    android:background="@drawable/voice_background"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
-
-                    <TextView
-                        android:id="@+id/tv_voice"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:textColor="@color/white"
-                        android:textSize="14sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="0秒" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/voice"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="8dp"
-            android:maxLines="1"
-            android:text="已开启"
-            android:textSize="11sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.vscool.os.view.ToggleButton
-            android:id="@+id/toggleButton2"
-            android:layout_width="36dp"
-            android:layout_height="18dp"
-            android:visibility="gone"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_vp"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/toggleButton2"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.vscool.os.view.JzvdStdRound
-                android:id="@+id/jz_video"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:radius="8dp" />
-
-            <com.shehuan.niv.NiceImageView
-                android:id="@+id/imageView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                app:corner_radius="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index dc9e051..ae48485 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -83,16 +83,16 @@
 
             <ImageView
                 android:id="@+id/iv_clear"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginEnd="16dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
                 android:src="@drawable/icon_menu"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.322" />
+                app:layout_constraintVertical_bias="0.5" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_contact_wechat.xml b/app/src/main/res/layout/item_contact_wechat.xml
index 6b867ac..46918b2 100644
--- a/app/src/main/res/layout/item_contact_wechat.xml
+++ b/app/src/main/res/layout/item_contact_wechat.xml
@@ -35,7 +35,6 @@
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
                 android:src="@drawable/default_avatar"
-                app:is_circle="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/item_daily_app.xml b/app/src/main/res/layout/item_daily_app.xml
index f2868fe..8b66bf2 100644
--- a/app/src/main/res/layout/item_daily_app.xml
+++ b/app/src/main/res/layout/item_daily_app.xml
@@ -48,7 +48,7 @@
             android:layout_marginTop="4dp"
             android:maxLines="1"
             android:text="@string/app_name"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/iv_icon"
diff --git a/app/src/main/res/layout/item_dock_app_select.xml b/app/src/main/res/layout/item_dock_app_select.xml
index c1114e1..2647055 100644
--- a/app/src/main/res/layout/item_dock_app_select.xml
+++ b/app/src/main/res/layout/item_dock_app_select.xml
@@ -8,7 +8,6 @@
         android:id="@+id/root"
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:background="@drawable/app_select_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +49,7 @@
                 android:layout_marginTop="8dp"
                 android:maxLines="1"
                 android:text="@string/app_name"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/iv_icon"
                 app:layout_constraintStart_toStartOf="@+id/iv_icon"
diff --git a/app/src/main/res/layout/popup_type.xml b/app/src/main/res/layout/popup_type.xml
new file mode 100644
index 0000000..f4898a5
--- /dev/null
+++ b/app/src/main/res/layout/popup_type.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/default_light_background"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_once"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:padding="4dp"
+            android:singleLine="true"
+            android:text="一次"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_loop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:padding="4dp"
+            android:singleLine="true"
+            android:text="每天"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 81cfb3b..9679e25 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#343336</color>
+    <color name="colorPrimary">#FAF8F8</color>
     <color name="colorPrimaryDark">#272727</color>
     <color name="colorAccent">#454347</color>
 
+    <color name="default_background_color">#FAF8F8</color>
+    <color name="default_color">#ffb70d</color>
+    <color name="default_light_background">#F3EFE7</color>
+
     <color name="white">#ffffff</color>
     <color name="action_bar_red">#f5433f</color>
     <color name="noti_text_gray">#F68F8C</color>
@@ -17,7 +21,6 @@
     <color name="lightGray">#FFD3D3D3</color>
     <color name="tv_add_color">#4880ff</color>
     <color name="yellow">#F8B551</color>
-    <color name="default_blue">#0480FF</color>
     <color name="settings_color">#4D3AD8</color>
     <color name="settings_color_bg">#221C27</color>
     <color name="radio_botton_gray">#bbbbbb</color>
@@ -26,7 +29,6 @@
     <color name="green">#FF008000</color>
     <color name="progress_bg">#F1B3B3</color>
     <color name="actions_item_pressed">#2a2b35</color>
-    <color name="default_background_color">#8e6afb</color>
     <color name="main_default_text_gray">#808080</color>
     <color name="NormalCircleColor">#99FFFFFF</color>
     <color name="SelectedCircleColor">#ffffff</color>