version:2.0.0

fix:
update:修改样式，设置页面开关修改，联系人页面修改

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 {

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));
         }
     }
 

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);
+            }
+        }
     }
 }

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);
+            }
+        }
     }
 
 }

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;

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

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;
     }
 

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

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;
     }
 

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

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);

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;

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);
         }
 

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;

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;

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, "");

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: 无障碍服务已打开");

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);
         }
     }
 }

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;
+        }
     }
 
     /**

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();
 

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;

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

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;
     }
 

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) {

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;
     }
 

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");
+        }
+    }
 }

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事件
      */

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" />
 

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" />
 

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" />
 

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" />
 

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"

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"-->

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"

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"

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" />
 

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"-->

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>

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" />
 

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"

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"

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" />
 

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"

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>

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"

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" />
 

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" />
 

app/src/main/res/layout-sw700dp/activity_add_contact.xml

@@ -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>

app/src/main/res/layout-sw700dp/activity_main.xml

@@ -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>

app/src/main/res/layout-sw700dp/activity_setting.xml

@@ -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>

app/src/main/res/layout-sw700dp/activity_sim_card.xml

@@ -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>

app/src/main/res/layout-sw700dp/activity_touch.xml

@@ -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>

app/src/main/res/layout-sw700dp/fragment_applist.xml

@@ -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>

app/src/main/res/layout-sw700dp/fragment_contact_home.xml

@@ -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>

app/src/main/res/layout-sw700dp/fragment_home.xml

@@ -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>

app/src/main/res/layout-sw700dp/fragment_settings.xml

@@ -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>

app/src/main/res/layout-sw700dp/item_actions.xml

@@ -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>

app/src/main/res/layout-sw700dp/item_contact_wechat.xml

@@ -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>

app/src/main/res/layout-sw700dp/item_dock_app.xml

@@ -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>

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" />

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"

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>

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"

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"

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>

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"

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"

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

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>

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

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"

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"

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

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>

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"

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>

app/src/main/res/layout/item_alarm_port.xml

@@ -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>

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>
 

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"

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"

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"

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>

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>