version:1.7.3

fix:
update:样式修改，目录调整

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.xxpatx.os"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1071
-        versionName "1.7.1"
+        versionCode 1073
+        versionName "1.7.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -156,11 +156,11 @@
         <activity android:name=".activity.control.ControlActivity" />
         <activity android:name=".activity.quickapp.QuickAppActivity" />
         <activity
-            android:name=".activity.setting.SettingActivity"
+            android:name=".activity.settings.setting.SettingActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".activity.setting.TimeActivity"
+            android:name=".activity.settings.time.TimeActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
@@ -168,7 +168,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".activity.phone.WhiteListActivity"
+            android:name=".activity.settings.whitelist.WhiteListActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
@@ -177,11 +177,19 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".activity.dock.DockActivity"
+            android:name=".activity.settings.dock.DockActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".activity.setting.TouchActivity"
+            android:name=".activity.settings.touch.TouchActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.settings.other.OtherSettingsActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.settings.broadcast.VoiceBroadcastActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity

app/src/main/java/com/xxpatx/os/activity/alarm/add/AlarmAddActivity.java

@@ -87,10 +87,12 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
                 if (isChecked) {
                     ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
                     mViewDataBinding.rb1.setTextColor(colorStateList);
+                    mViewDataBinding.rb1.setBackground(getDrawable(R.drawable.alarm_checked_background));
                     mDayType = 1;
                 } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
+                    ColorStateList colorStateList = getResources().getColorStateList(R.color.black);
                     mViewDataBinding.rb1.setTextColor(colorStateList);
+                    mViewDataBinding.rb1.setBackground(getDrawable(R.drawable.alarm_unchecked_background));
                 }
             }
         });
@@ -100,10 +102,12 @@ public class AlarmAddActivity extends BaseMvvmActivity<AlarmAddViewModel, Activi
                 if (isChecked) {
                     ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
                     mViewDataBinding.rb2.setTextColor(colorStateList);
+                    mViewDataBinding.rb2.setBackground(getDrawable(R.drawable.alarm_checked_background));
                     mDayType = 2;
                 } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
+                    ColorStateList colorStateList = getResources().getColorStateList(R.color.black);
                     mViewDataBinding.rb2.setTextColor(colorStateList);
+                    mViewDataBinding.rb2.setBackground(getDrawable(R.drawable.alarm_unchecked_background));
                 }
             }
         });

app/src/main/java/com/xxpatx/os/activity/alarm/edit/AlarmEditActivity.java

@@ -48,9 +48,7 @@ import java.util.Map;
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
-import okhttp3.MediaType;
 import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
 
 public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, ActivityAlarmEditBinding> {
     private static final String TAG = "AlarmEditActivity";
@@ -99,10 +97,12 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
                 if (b) {
                     ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
                     mViewDataBinding.rb1.setTextColor(colorStateList);
+                    mViewDataBinding.rb1.setBackground(getDrawable(R.drawable.alarm_checked_background));
                     mDayType = 1;
                 } else {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
+                    ColorStateList colorStateList = getResources().getColorStateList(R.color.black);
                     mViewDataBinding.rb1.setTextColor(colorStateList);
+                    mViewDataBinding.rb1.setBackground(getDrawable(R.drawable.alarm_unchecked_background));
                 }
             }
         });
@@ -110,12 +110,14 @@ public class AlarmEditActivity extends BaseMvvmActivity<AlarmEditViewModel, Acti
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                 if (b) {
-                    ColorStateList colorStateList = getResources().getColorStateList(R.color.white);
+                    ColorStateList colorStateList = getResources().getColorStateList(R.color.black);
                     mViewDataBinding.rb2.setTextColor(colorStateList);
+                    mViewDataBinding.rb2.setBackground(getDrawable(R.drawable.alarm_checked_background));
                     mDayType = 2;
                 } else {
                     ColorStateList colorStateList = getResources().getColorStateList(R.color.radio_botton_gray);
                     mViewDataBinding.rb2.setTextColor(colorStateList);
+                    mViewDataBinding.rb2.setBackground(getDrawable(R.drawable.alarm_unchecked_background));
                 }
             }
         });

app/src/main/java/com/xxpatx/os/activity/alarm/list/AlarmListActivity.java

@@ -25,7 +25,7 @@ import com.xxpatx.os.base.mvvm.BaseMvvmActivity;
 import com.xxpatx.os.bean.BaseResponse;
 import com.xxpatx.os.config.CommonConfig;
 import com.xxpatx.os.databinding.ActivityAlarmListBinding;
-import com.xxpatx.os.dialog.DeleteDialog;
+import com.xxpatx.os.dialog.DeleteClockDialog;
 import com.xxpatx.os.network.NetInterfaceManager;
 import com.xxpatx.os.push.PushManager;
 
@@ -151,12 +151,12 @@ public class AlarmListActivity extends BaseMvvmActivity<AlarmListViewModel, Acti
     }
 
     private void showDialog(AlarmClockData alarmClockData) {
-        DeleteDialog dialog = new DeleteDialog(this);
+        DeleteClockDialog dialog = new DeleteClockDialog(this);
         dialog.setTitle("提醒")
-                .setMessage("是否要删除本次闹钟")
+                .setMessage("删除这个闹钟")
                 .setPositive("确定")
-                .setNegtive("取消")
-                .setOnClickBottomListener(new DeleteDialog.OnClickBottomListener() {
+                .setNegative("取消")
+                .setOnClickBottomListener(new DeleteClockDialog.OnClickBottomListener() {
                     @Override
                     public void onPositiveClick() {
                         deleteAlarm(alarmClockData);

app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java

@@ -6,6 +6,8 @@ import android.content.ContentValues;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.provider.ContactsContract;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -93,6 +95,10 @@ public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, Ac
                 .setLoadSpeed(LoadingDialog.Speed.SPEED_TWO)
                 .closeSuccessAnim()
                 .closeFailedAnim();
+
+        mViewDataBinding.etName.setFilters(new InputFilter[]{new NoSpaceInputFilter(), new ChineseOnlyFilter(), new InputFilter.LengthFilter(8)});
+        mViewDataBinding.etPhone.setFilters(new InputFilter[]{new NoSpaceInputFilter(), new InputFilter.LengthFilter(12)});
+        mViewDataBinding.etTag.setFilters(new InputFilter[]{new NoSpaceInputFilter(), new ChineseOnlyFilter(), new InputFilter.LengthFilter(8)});
     }
 
     @Override
@@ -130,6 +136,49 @@ public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, Ac
         super.onPause();
     }
 
+
+    public static class NoSpaceInputFilter implements InputFilter {
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            // 遍历输入字符，移除空格
+            StringBuilder filtered = new StringBuilder();
+            for (int i = start; i < end; i++) {
+                char c = source.charAt(i);
+                if (!Character.isWhitespace(c)) {
+                    filtered.append(c);
+                }
+            }
+            return filtered.length() > 0 ? filtered.toString() : "";
+        }
+    }
+
+    public static class ChineseOnlyFilter implements InputFilter {
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            StringBuilder validChars = new StringBuilder();
+            for (int i = start; i < end; i++) {
+                char c = source.charAt(i);
+                if (isChinese(c)) {
+                    validChars.append(c); // 中文字符保留
+                }
+            }
+            // 若 validChars 长度与原输入一致，说明全部合法；否则返回合法部分
+            return validChars.length() == (end - start) ? null : validChars;
+        }
+
+        // 判断字符是否为中文（含全角符号）
+        private boolean isChinese(char c) {
+            Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
+            return ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
+//                    || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
+//                    || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
+//                    || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
+                    ;
+        }
+    }
+
     private void openSelector() {
         PictureSelector.create(AddContactActivity.this)
                 .openGallery(SelectMimeType.ofAll())

app/src/main/java/com/xxpatx/os/activity/contact/EditContactActivity.java

@@ -3,6 +3,8 @@ package com.xxpatx.os.activity.contact;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -16,7 +18,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.google.gson.JsonObject;
 import com.hjq.toast.Toaster;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.SelectMimeType;
@@ -42,7 +43,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
-import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
@@ -86,6 +86,10 @@ public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel,
                 .setLoadSpeed(LoadingDialog.Speed.SPEED_TWO)
                 .closeSuccessAnim()
                 .closeFailedAnim();
+
+        mViewDataBinding.etName.setFilters(new InputFilter[]{new AddContactActivity.NoSpaceInputFilter(), new AddContactActivity.ChineseOnlyFilter(), new InputFilter.LengthFilter(8)});
+        mViewDataBinding.etPhone.setFilters(new InputFilter[]{new AddContactActivity.NoSpaceInputFilter(), new InputFilter.LengthFilter(12)});
+        mViewDataBinding.etTag.setFilters(new InputFilter[]{new AddContactActivity.NoSpaceInputFilter(), new AddContactActivity.ChineseOnlyFilter(), new InputFilter.LengthFilter(8)});
     }
 
     @Override
@@ -141,6 +145,48 @@ public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel,
         mViewDataBinding.setContact(mContact);
     }
 
+    public static class NoSpaceInputFilter implements InputFilter {
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            // 遍历输入字符，移除空格
+            StringBuilder filtered = new StringBuilder();
+            for (int i = start; i < end; i++) {
+                char c = source.charAt(i);
+                if (!Character.isWhitespace(c)) {
+                    filtered.append(c);
+                }
+            }
+            return filtered.length() > 0 ? filtered.toString() : "";
+        }
+    }
+
+    public static class ChineseOnlyFilter implements InputFilter {
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            StringBuilder validChars = new StringBuilder();
+            for (int i = start; i < end; i++) {
+                char c = source.charAt(i);
+                if (isChinese(c)) {
+                    validChars.append(c); // 中文字符保留
+                }
+            }
+            // 若 validChars 长度与原输入一致，说明全部合法；否则返回合法部分
+            return validChars.length() == (end - start) ? null : validChars;
+        }
+
+        // 判断字符是否为中文（含全角符号）
+        private boolean isChinese(char c) {
+            Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
+            return ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
+//                    || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
+//                    || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
+//                    || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
+                    ;
+        }
+    }
+
     private void openSelector() {
         PictureSelector.create(EditContactActivity.this)
                 .openGallery(SelectMimeType.ofAll())
@@ -177,7 +223,7 @@ public class EditContactActivity extends BaseMvvmActivity<EditContactViewModel,
             Toaster.show("请输入手机号码");
             return;
         }
-        String groupTag = mViewDataBinding.etGroup.getText().toString();
+        String groupTag = mViewDataBinding.etTag.getText().toString();
 //        if (TextUtils.isEmpty(groupTag)) {
 //            Toaster.show("请输入微信群组标签");
 //            return;

app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java

@@ -280,24 +280,25 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
 //        public static final int PRECISE_CALL_STATE_DISCONNECTING = 8; //正在挂断
 //    }
 
-    public class BtnClick{
-        public void call(View view){
-            mNeedDial = true;
-
-            if (mContactList == null || mContactList.isEmpty()) {
-                Toaster.showLong("没有设置紧急联系人");
-                finish();
-                return;
-            }
-
-            Intent intent = new Intent(Intent.ACTION_CALL);
-            Uri data = Uri.parse("tel:" + mContactList.get(0).getMobile());
-            intent.setData(data);
-            startActivity(intent);
-            mContactList.remove(0);
-            mEmergencyContactAdapter.notifyDataSetChanged();
-            mCalling = true;
+    public class BtnClick {
+        public void call(View view) {
+//            mNeedDial = true;
+//
+//            if (mContactList == null || mContactList.isEmpty()) {
+//                Toaster.showLong("没有设置紧急联系人");
+//                finish();
+//                return;
+//            }
+//
+//            Intent intent = new Intent(Intent.ACTION_CALL);
+//            Uri data = Uri.parse("tel:" + mContactList.get(0).getMobile());
+//            intent.setData(data);
+//            startActivity(intent);
+//            mContactList.remove(0);
+//            mEmergencyContactAdapter.notifyDataSetChanged();
+//            mCalling = true;
             mDisposable.dispose();
+            finish();
         }
     }
 }

app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java

@@ -53,8 +53,8 @@ import com.jeremyliao.liveeventbus.LiveEventBus;
 import com.tencent.mmkv.MMKV;
 import com.xxpatx.os.BuildConfig;
 import com.xxpatx.os.R;
-import com.xxpatx.os.activity.dock.DockActivity;
 import com.xxpatx.os.activity.phone.PhoneActivity;
+import com.xxpatx.os.activity.settings.dock.DockActivity;
 import com.xxpatx.os.activity.update.UpdateActivity;
 import com.xxpatx.os.adapter.DockAppGridAdapter;
 import com.xxpatx.os.base.BaseFragmentPagerAdapter;

app/src/main/java/com/xxpatx/os/activity/main/MainViewModel.java

@@ -24,7 +24,6 @@ import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.xxpatx.os.R;
-import com.xxpatx.os.activity.setting.SettingActivity;
 import com.xxpatx.os.activity.update.UpdateActivity;
 import com.xxpatx.os.base.mvvm.BaseViewModel;
 import com.xxpatx.os.bean.ActivationBean;
@@ -64,7 +63,6 @@ import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 

app/src/main/java/com/xxpatx/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/xxpatx/os/activity/settings/broadcast/VoiceBroadcastActivity.java

@@ -0,0 +1,106 @@
+package com.xxpatx.os.activity.settings.broadcast;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
+import com.tencent.mmkv.MMKV;
+import com.xxpatx.os.R;
+import com.xxpatx.os.base.mvvm.BaseMvvmActivity;
+import com.xxpatx.os.config.CommonConfig;
+import com.xxpatx.os.databinding.ActivityVoiceBroadcastBinding;
+
+public class VoiceBroadcastActivity extends BaseMvvmActivity<VoiceBroadcastViewModel, ActivityVoiceBroadcastBinding> {
+    private static final String TAG = "VoiceBroadcastActivity";
+
+    private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
+
+    private static final int REQUEST_PERMISSION_CODE = 1234;
+
+    private String[] PERMISSIONS_SMS = {
+            Manifest.permission.READ_SMS,
+            Manifest.permission.RECEIVE_SMS,
+    };
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_voice_broadcast;
+    }
+
+    @Override
+    protected void initDataBinding() {
+        mViewModel.setCtx(this);
+        mViewModel.setVDBinding(mViewDataBinding);
+        mViewModel.setLifecycle(getLifecycleSubject());
+        mViewDataBinding.setClick(new BtnClick());
+    }
+
+    @Override
+    protected void initView() {
+
+        boolean voiceBroadcast = mMMKV.decodeBool(CommonConfig.VOICE_BROADCAST, false);
+        Log.e(TAG, "initView: voiceBroadcast = " + voiceBroadcast);
+        mViewDataBinding.setVoiceBroadcast(voiceBroadcast);
+
+        boolean dialTone = mMMKV.decodeBool(CommonConfig.DISABLE_DIAL_TONE_MODIFY, true);
+        Log.e(TAG, "initView: dialTone = " + dialTone);
+        mViewDataBinding.setDialTone(dialTone);
+
+        boolean voiceSpeaker = mMMKV.decodeInt(CommonConfig.VOICE_SPEAKER_KEY, 0) == 1;
+        Log.e(TAG, "appSpeak: voiceSpeaker = " + voiceSpeaker);
+        mViewDataBinding.setVoiceSpeaker(voiceSpeaker);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == REQUEST_PERMISSION_CODE) {
+
+        }
+    }
+
+    public class BtnClick {
+        public void voiceBroadcast(View view) {
+            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(VoiceBroadcastActivity.this, Manifest.permission.READ_SMS)) {
+                ActivityCompat.requestPermissions(VoiceBroadcastActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
+                Toast.makeText(VoiceBroadcastActivity.this, "请授予读取短信权限", Toast.LENGTH_LONG).show();
+                return;
+            }
+            if (PackageManager.PERMISSION_GRANTED != ActivityCompat.checkSelfPermission(VoiceBroadcastActivity.this, Manifest.permission.RECEIVE_SMS)) {
+                ActivityCompat.requestPermissions(VoiceBroadcastActivity.this, PERMISSIONS_SMS, REQUEST_PERMISSION_CODE);
+                Toast.makeText(VoiceBroadcastActivity.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);
+        }
+
+        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);
+        }
+
+        public void appSpeak(View view) {
+            boolean voiceSpeaker = mMMKV.decodeInt(CommonConfig.VOICE_SPEAKER_KEY, 0) == 1;
+            Log.e(TAG, "appSpeak: voiceSpeaker = " + voiceSpeaker);
+            mViewDataBinding.setVoiceSpeaker(!voiceSpeaker);
+            mMMKV.encode(CommonConfig.VOICE_SPEAKER_KEY, voiceSpeaker ? 0 : 1);
+        }
+
+
+    }
+}

app/src/main/java/com/xxpatx/os/activity/settings/broadcast/VoiceBroadcastViewModel.java

@@ -0,0 +1,18 @@
+package com.xxpatx.os.activity.settings.broadcast;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.xxpatx.os.base.mvvm.BaseViewModel;
+import com.xxpatx.os.databinding.ActivityVoiceBroadcastBinding;
+
+public class VoiceBroadcastViewModel extends BaseViewModel<ActivityVoiceBroadcastBinding, ActivityEvent> {
+
+    @Override
+    public ActivityVoiceBroadcastBinding getVDBinding() {
+        return binding;
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+}

app/src/main/java/com/xxpatx/os/activity/settings/dock/DockActivity.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.dock;
+package com.xxpatx.os.activity.settings.dock;
 
 import android.text.TextUtils;
 import android.util.Log;

app/src/main/java/com/xxpatx/os/activity/settings/dock/DockViewModel.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.dock;
+package com.xxpatx.os.activity.settings.dock;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -46,13 +46,13 @@ public class DockViewModel extends BaseViewModel<ActivityDockBinding, ActivityDo
             if (ApkUtils.excludePackageName.contains(pkgName)) {
                 continue;
             }
-            if (ApkUtils.isSystemApp(getCtx(), pkgName)) {
-                if (DockActivity.INCLUDE_SYSTEM_APP.contains(pkgName)) {
-
-                } else {
-                    continue;
-                }
-            }
+//            if (ApkUtils.isSystemApp(getCtx(), pkgName)) {
+//                if (DockActivity.INCLUDE_SYSTEM_APP.contains(pkgName)) {
+//
+//                } else {
+//                    continue;
+//                }
+//            }
 
             Log.e(TAG, "getPackageList: " + pkgName);
             DockApp dockApp = new DockApp(resolveInfo.activityInfo.loadLabel(pm).toString(),

app/src/main/java/com/xxpatx/os/activity/settings/other/OtherSettingsActivity.java

@@ -0,0 +1,55 @@
+package com.xxpatx.os.activity.settings.other;
+
+import android.content.Intent;
+import android.provider.Settings;
+import android.view.View;
+
+import com.xxpatx.os.R;
+import com.xxpatx.os.base.mvvm.BaseMvvmActivity;
+import com.xxpatx.os.databinding.ActivityOtherSettingsBinding;
+
+public class OtherSettingsActivity extends BaseMvvmActivity<OtherSettingsViewModel, ActivityOtherSettingsBinding> {
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_other_settings;
+    }
+
+    @Override
+    protected void initDataBinding() {
+        mViewModel.setCtx(this);
+        mViewModel.setVDBinding(mViewDataBinding);
+        mViewModel.setLifecycle(getLifecycleSubject());
+        mViewDataBinding.setClick(new BtnClick());
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+
+    public class BtnClick {
+        public void toInternet(View view) {
+            startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
+        }
+
+        public void openSound(View view) {
+            startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
+        }
+
+        public void toFont(View view) {
+            startActivity(new Intent(Settings.ACTION_DISPLAY_SETTINGS));
+        }
+
+        public void toSettings(View view) {
+            startActivity(new Intent(Settings.ACTION_SETTINGS));
+        }
+    }
+}

app/src/main/java/com/xxpatx/os/activity/settings/other/OtherSettingsViewModel.java

@@ -0,0 +1,18 @@
+package com.xxpatx.os.activity.settings.other;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.xxpatx.os.base.mvvm.BaseViewModel;
+import com.xxpatx.os.databinding.ActivityOtherSettingsBinding;
+
+public class OtherSettingsViewModel extends BaseViewModel<ActivityOtherSettingsBinding, ActivityEvent> {
+
+    @Override
+    public ActivityOtherSettingsBinding getVDBinding() {
+        return binding;
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+}

app/src/main/java/com/xxpatx/os/activity/settings/setting/SettingActivity.java

@@ -1,10 +1,9 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.setting;
 
-import android.Manifest;
 import android.app.AppOpsManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -13,8 +12,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
 import androidx.lifecycle.Observer;
 
 import com.google.android.accessibility.selecttospeak.SelectToSpeakService;
@@ -22,8 +19,12 @@ import com.hjq.toast.Toaster;
 import com.tencent.mmkv.MMKV;
 import com.xxpatx.os.BuildConfig;
 import com.xxpatx.os.R;
-import com.xxpatx.os.activity.dock.DockActivity;
-import com.xxpatx.os.activity.phone.WhiteListActivity;
+import com.xxpatx.os.activity.settings.broadcast.VoiceBroadcastActivity;
+import com.xxpatx.os.activity.settings.dock.DockActivity;
+import com.xxpatx.os.activity.settings.other.OtherSettingsActivity;
+import com.xxpatx.os.activity.settings.time.TimeActivity;
+import com.xxpatx.os.activity.settings.touch.TouchActivity;
+import com.xxpatx.os.activity.settings.whitelist.WhiteListActivity;
 import com.xxpatx.os.activity.sim.SimCardActivity;
 import com.xxpatx.os.activity.tts.TtsActivity;
 import com.xxpatx.os.activity.update.UpdateActivity;
@@ -42,16 +43,10 @@ import java.lang.reflect.Method;
 
 public class SettingActivity extends BaseMvvmActivity<SettingViewModel, ActivitySettingBinding> {
     private static final String TAG = "SettingActivity";
-    private static final int REQUEST_PERMISSION_CODE = 1234;
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
 
-    private String[] PERMISSIONS_SMS = {
-            Manifest.permission.READ_SMS,
-            Manifest.permission.RECEIVE_SMS,
-    };
-
     @Override
     public boolean setfitWindow() {
         return true;
@@ -116,11 +111,6 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
         Log.e(TAG, "initView: showFloatWindow = " + showFloatWindow);
         mViewDataBinding.setFloatWindowEnable(showFloatWindow);
 
-        boolean voiceBroadcast = mMMKV.decodeBool(CommonConfig.VOICE_BROADCAST, false);
-        Log.e(TAG, "initView: voiceBroadcast = " + voiceBroadcast);
-        mViewDataBinding.setVoiceBroadcast(voiceBroadcast);
-
-
         boolean autoCall = mMMKV.decodeBool(CommonConfig.WECHAT_AUTO_CALL_KEY, false);
         Log.e(TAG, "initView: autoCall = " + autoCall);
         mViewDataBinding.setAutoCall(autoCall);
@@ -129,23 +119,9 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
         Log.e(TAG, "initView: autoAccept = " + autoAccept);
         mViewDataBinding.setAutoAccept(autoAccept);
 
-        boolean dialTone = mMMKV.decodeBool(CommonConfig.DISABLE_DIAL_TONE_MODIFY, true);
-        Log.e(TAG, "initView: dialTone = " + dialTone);
-        mViewDataBinding.setDialTone(dialTone);
-
-        int code = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 1);
-        boolean statusBar = code == 1;
-        Log.e(TAG, "setStatusBar: statusBar = " + statusBar);
-        mViewDataBinding.setStatusBar(statusBar);
-
         boolean hourly_time = mMMKV.decodeInt(CommonConfig.HOURLY_TIME_SIGNAL_KEY, 0) == 1;
         Log.e(TAG, "setHourlyTimeSignal: hourly_time = " + hourly_time);
         mViewDataBinding.setHourlyTime(hourly_time);
-
-        boolean voiceSpeaker = mMMKV.decodeInt(CommonConfig.VOICE_SPEAKER_KEY, 0) == 1;
-        Log.e(TAG, "appSpeak: voiceSpeaker = " + voiceSpeaker);
-        mViewDataBinding.setVoiceSpeaker(voiceSpeaker);
-
     }
 
     private static final int REQUEST_CODE_DRAW_OVER_OTHER_APPS_PERMISSION = 200;
@@ -165,13 +141,6 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
         setStatus();
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_PERMISSION_CODE) {
-
-        }
-    }
 
     private void showFloatingWindow() {
         mViewDataBinding.setFloatWindowEnable(true);
@@ -254,23 +223,6 @@ 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);
-        }
-
         private String testText = "TTS（从文本到语音，Text To Speech），是将文本转化为语音，人机对话的一部分，让机器能够说话。\n" +
                 "android自带的TTS目前只支持英文、法文、意大利文、德文、西班牙文。不支持中文，如果想要播放出中文语音需要借助中文TTS引擎的帮助。";
 
@@ -367,20 +319,6 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             }
         }
 
-        public void appSpeak(View view) {
-            boolean voiceSpeaker = mMMKV.decodeInt(CommonConfig.VOICE_SPEAKER_KEY, 0) == 1;
-            Log.e(TAG, "appSpeak: voiceSpeaker = " + voiceSpeaker);
-            mViewDataBinding.setVoiceSpeaker(!voiceSpeaker);
-            mMMKV.encode(CommonConfig.VOICE_SPEAKER_KEY, voiceSpeaker ? 0 : 1);
-        }
-
-        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);
-        }
-
         public void setHourlyTimeSignal(View view) {
             startActivity(new Intent(SettingActivity.this, TimeActivity.class));
 //            boolean hourly_time = mMMKV.decodeBool(CommonConfig.HOURLY_TIME_SIGNAL_KEY, false);
@@ -411,23 +349,6 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
 //            }
         }
 
-        public void setStatusBar(View view) {
-            boolean statusBar = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 1) == 1;
-            String statusbarStatus;
-            if (statusBar) {
-                statusbarStatus = CommonConfig.ACTION_HIDE_STATUS_BAR;
-            } else {
-                statusbarStatus = CommonConfig.ACTION_SHOW_STATUS_BAR;
-            }
-            Intent statusIntent = new Intent(statusbarStatus);
-//            statusIntent.setPackage("com.android.settings");
-            sendBroadcast(statusIntent);
-
-            Log.e(TAG, "setStatusBar: old statusBar = " + statusBar);
-            mViewDataBinding.setStatusBar(!statusBar);
-            Settings.System.putInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, statusBar ? 0 : 1);
-        }
-
         public void setBlacklist(View view) {
             startActivity(new Intent(SettingActivity.this, WhiteListActivity.class));
         }
@@ -436,24 +357,35 @@ public class SettingActivity extends BaseMvvmActivity<SettingViewModel, Activity
             startActivity(new Intent(SettingActivity.this, SimCardActivity.class));
         }
 
-        public void toInternet(View view) {
-            startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
-        }
-
-        public void toFont(View view) {
-            startActivity(new Intent(Settings.ACTION_DISPLAY_SETTINGS));
-        }
-
         public void toTouch(View view) {
             startActivity(new Intent(SettingActivity.this, TouchActivity.class));
         }
 
+        public void toVoiceBroadcast(View view) {
+            startActivity(new Intent(SettingActivity.this, VoiceBroadcastActivity.class));
+        }
+
         public void toSettings(View view) {
-            startActivity(new Intent(Settings.ACTION_SETTINGS));
+            startActivity(new Intent(SettingActivity.this, OtherSettingsActivity.class));
         }
 
         public void checkupdate(View view) {
             mViewModel.checkUpdate();
+
+            Intent intent = new Intent();
+            ComponentName componentName = new ComponentName("com.xxpatx.sn", "com.xxpatx.sn.activity.update.UpdateActivity");
+            intent.setComponent(componentName);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            try {
+                startActivity(intent);
+            } catch (Exception e) {
+                Log.e(TAG, "openOta: " + e.getMessage());
+                Toaster.showLong("打开设备信息失败，请检查是否安装");
+            }
+        }
+
+        public void openOta(View view) {
+            ApkUtils.openOta(SettingActivity.this);
         }
 
         public void toDockSetting(View view) {

app/src/main/java/com/xxpatx/os/activity/settings/setting/SettingViewModel.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.setting;
 
 import android.util.Log;
 

app/src/main/java/com/xxpatx/os/activity/settings/time/TimeActivity.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.time;
 
 import android.text.TextUtils;
 import android.util.Log;

app/src/main/java/com/xxpatx/os/activity/settings/time/TimeViewModel.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.time;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.xxpatx.os.base.mvvm.BaseViewModel;

app/src/main/java/com/xxpatx/os/activity/settings/touch/TouchActivity.java

@@ -1,5 +1,7 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.touch;
 
+import android.content.Intent;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
 
@@ -45,6 +47,11 @@ public class TouchActivity extends BaseMvvmActivity<TouchViewModel, ActivityTouc
         boolean clockModify = mMMKV.decodeBool(CommonConfig.DISABLE_CLOCK_MODIFY, false);
         Log.e(TAG, "disableVolumeKey: clockModify = " + clockModify);
         mViewDataBinding.setDisableClock(clockModify);
+
+        int code = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 1);
+        boolean statusBar = code == 1;
+        Log.e(TAG, "setStatusBar: statusBar = " + statusBar);
+        mViewDataBinding.setStatusBar(statusBar);
     }
 
     @Override
@@ -74,5 +81,21 @@ public class TouchActivity extends BaseMvvmActivity<TouchViewModel, ActivityTouc
             mMMKV.encode(CommonConfig.DISABLE_CLOCK_MODIFY, !clockModify);
         }
 
+        public void setStatusBar(View view) {
+            boolean statusBar = Settings.System.getInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, 1) == 1;
+            String statusbarStatus;
+            if (statusBar) {
+                statusbarStatus = CommonConfig.ACTION_HIDE_STATUS_BAR;
+            } else {
+                statusbarStatus = CommonConfig.ACTION_SHOW_STATUS_BAR;
+            }
+            Intent statusIntent = new Intent(statusbarStatus);
+//            statusIntent.setPackage("com.android.settings");
+            sendBroadcast(statusIntent);
+
+            Log.e(TAG, "setStatusBar: old statusBar = " + statusBar);
+            mViewDataBinding.setStatusBar(!statusBar);
+            Settings.System.putInt(getContentResolver(), CommonConfig.ACTION_STATUS_BAR_STATE, statusBar ? 0 : 1);
+        }
     }
 }

app/src/main/java/com/xxpatx/os/activity/settings/touch/TouchViewModel.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.setting;
+package com.xxpatx.os.activity.settings.touch;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.xxpatx.os.base.mvvm.BaseViewModel;

app/src/main/java/com/xxpatx/os/activity/settings/whitelist/WhiteListActivity.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.phone;
+package com.xxpatx.os.activity.settings.whitelist;
 
 import android.content.Context;
 import android.telecom.TelecomManager;

app/src/main/java/com/xxpatx/os/activity/settings/whitelist/WhiteListViewModel.java

@@ -1,4 +1,4 @@
-package com.xxpatx.os.activity.phone;
+package com.xxpatx.os.activity.settings.whitelist;
 
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.xxpatx.os.base.mvvm.BaseViewModel;

app/src/main/java/com/xxpatx/os/adapter/CallRecordAdapter.java

@@ -80,14 +80,14 @@ public class CallRecordAdapter extends RecyclerView.Adapter<CallRecordAdapter.Ho
             case CallLog.Calls.INCOMING_TYPE:
                 holder.tv_state.setImageDrawable(mContext.getDrawable(R.drawable.icon_call_incoming));
                 holder.tv_name.setTextColor(mContext.getColor(R.color.black));
-                holder.tv_phone.setTextColor(mContext.getColor(R.color.black));
-                holder.tv_time.setTextColor(mContext.getColor(R.color.black));
+                holder.tv_phone.setTextColor(mContext.getColor(R.color.default_gray_text_color));
+                holder.tv_time.setTextColor(mContext.getColor(R.color.default_gray_text_color));
                 break;
             case CallLog.Calls.OUTGOING_TYPE:
                 holder.tv_state.setImageDrawable(mContext.getDrawable(R.drawable.icon_call_outgoing));
                 holder.tv_name.setTextColor(mContext.getColor(R.color.black));
-                holder.tv_phone.setTextColor(mContext.getColor(R.color.black));
-                holder.tv_time.setTextColor(mContext.getColor(R.color.black));
+                holder.tv_phone.setTextColor(mContext.getColor(R.color.default_gray_text_color));
+                holder.tv_time.setTextColor(mContext.getColor(R.color.default_gray_text_color));
                 break;
             case CallLog.Calls.MISSED_TYPE:
                 holder.tv_state.setImageDrawable(mContext.getDrawable(R.drawable.icon_call_missed));

app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java

@@ -1,6 +1,9 @@
 package com.xxpatx.os.adapter;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,12 +17,13 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.hjq.toast.Toaster;
 import com.tencent.mmkv.MMKV;
+import com.xxpatx.os.BuildConfig;
 import com.xxpatx.os.R;
-import com.xxpatx.os.activity.dock.DockActivity;
+import com.xxpatx.os.activity.settings.dock.DockActivity;
 import com.xxpatx.os.bean.DockApp;
 import com.xxpatx.os.config.CommonConfig;
 import com.xxpatx.os.gson.GsonUtils;
-import com.xxpatx.os.utils.ApkUtils;
+import com.xxpatx.os.utils.IconUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -66,7 +70,7 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
                 holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui));
                 break;
             default:
-                holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, dockApp.getPackageName()));
+                holder.iv_icon.setImageDrawable(getIcon(dockApp.getPackageName()));
         }
         holder.tv_name.setText(dockApp.getAppName());
         if (mSelectedPkgList.contains(dockApp)) {
@@ -91,6 +95,28 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
         });
     }
 
+    public Drawable getIcon(String packageName) {
+        PackageManager pm = mContext.getPackageManager();
+        ApplicationInfo info = null;
+        try {
+            info = pm.getApplicationInfo(packageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (info == null) {
+            return null;
+        } else {
+            int i = IconUtils.appClassNameList.indexOf(packageName);
+            if (i != -1) {
+                String val = IconUtils.appIconList.get(i);
+                int resID = mContext.getResources().getIdentifier(val, "drawable", BuildConfig.APPLICATION_ID);
+                if (resID != 0) {
+                    return mContext.getResources().getDrawable(resID);
+                }
+            }
+            return info.loadIcon(pm);
+        }
+    }
 
     @Override
     public int getItemCount() {

app/src/main/java/com/xxpatx/os/adapter/WechatContactAdapter.java

@@ -87,7 +87,7 @@ public class WechatContactAdapter extends RecyclerView.Adapter<WechatContactAdap
         contactHolder.root.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if ("未设置".equals(contact.getName())) {
+                if ("添加联系人".equals(contact.getName())) {
                     Intent intent = new Intent(mContext, AddContactActivity.class);
                     mContext.startActivity(intent);
                 } else {

app/src/main/java/com/xxpatx/os/dialog/CustomDialog.java

@@ -37,7 +37,7 @@ public class CustomDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     /**
      * 按钮之间的分割线
@@ -56,7 +56,7 @@ public class CustomDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private int imageResId = -1;
 
     /**
@@ -92,7 +92,7 @@ public class CustomDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -122,10 +122,10 @@ public class CustomDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
 
         if (imageResId != -1) {
@@ -156,7 +156,7 @@ public class CustomDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -212,17 +212,17 @@ public class CustomDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public CustomDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public CustomDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-    public CustomDialog setNegtiveText(String negtive) {
-        negtiveBn.setText(negtive);
+    public CustomDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
         return this;
     }
 

app/src/main/java/com/xxpatx/os/dialog/DailyAppDialog.java

@@ -33,7 +33,7 @@ public class DailyAppDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     private ImageView ivIcon;
 
@@ -49,7 +49,7 @@ public class DailyAppDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private Drawable mDrawable;
     /**
      * 底部是否只有一个按钮
@@ -84,7 +84,7 @@ public class DailyAppDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -114,10 +114,10 @@ public class DailyAppDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
         ivIcon.setImageDrawable(mDrawable);
     }
@@ -132,7 +132,7 @@ public class DailyAppDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -187,17 +187,17 @@ public class DailyAppDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public DailyAppDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public DailyAppDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-    public DailyAppDialog setNegtiveText(String negtive) {
-        negtiveBn.setText(negtive);
+    public DailyAppDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
         return this;
     }
 

app/src/main/java/com/xxpatx/os/dialog/DeleWifiDialog.java

@@ -38,7 +38,7 @@ public class DeleWifiDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
     /**
      * 按钮之间的分割线
      */
@@ -92,7 +92,7 @@ public class DeleWifiDialog extends AlertDialog {
                 }
             }
         });
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 dismiss();
@@ -120,7 +120,7 @@ public class DeleWifiDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        negtiveBn.setText("取消");
+        negativeBn.setText("取消");
 
         if (imageResId != -1) {
             imageIv.setImageResource(imageResId);
@@ -151,7 +151,7 @@ public class DeleWifiDialog extends AlertDialog {
      */
     private void initView() {
         positiveBn = findViewById(R.id.positive);
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
         imageIv = findViewById(R.id.image);

app/src/main/java/com/xxpatx/os/dialog/DeleteClockDialog.java

@@ -0,0 +1,251 @@
+package com.xxpatx.os.dialog;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.xxpatx.os.R;
+
+
+/**
+ * description:自定义dialog
+ */
+
+public class DeleteClockDialog extends AlertDialog {
+    /**
+     * 显示的图片
+     */
+    private ImageView imageIv;
+
+    /**
+     * 显示的标题
+     */
+    private TextView titleTv;
+
+    /**
+     * 显示的消息
+     */
+    private TextView messageTv;
+
+    /**
+     * 确认和取消按钮
+     */
+    private TextView positiveBn;
+    private TextView negativeBn;
+
+    /**
+     * 按钮之间的分割线
+     */
+//    private View columnLineView;
+
+    private Context mContext;
+
+    public DeleteClockDialog(Context context) {
+        super(context, R.style.CustomDialog);
+        this.mContext = context;
+    }
+
+    /**
+     * 都是内容数据
+     */
+    private String message;
+    private String title;
+    private String positive, negative;
+    private int imageResId = -1;
+
+    /**
+     * 底部是否只有一个按钮
+     */
+    private boolean isSingle = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_delete_clock);
+        //按空白处不能取消动画
+        setCanceledOnTouchOutside(false);
+        //初始化界面控件
+        initView();
+        //初始化界面数据
+        refreshView();
+        //初始化界面控件的事件
+        initEvent();
+    }
+
+    /**
+     * 初始化界面的确定和取消监听器
+     */
+    private void initEvent() {
+        //设置确定按钮被点击后，向外界提供监听
+        positiveBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onPositiveClick();
+                }
+            }
+        });
+        //设置取消按钮被点击后，向外界提供监听
+        negativeBn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickBottomListener != null) {
+                    onClickBottomListener.onNegtiveClick();
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化界面控件的显示数据
+     */
+    private void refreshView() {
+        //如果用户自定了title和message
+        if (!TextUtils.isEmpty(title)) {
+            titleTv.setText(title);
+            titleTv.setVisibility(View.VISIBLE);
+        } else {
+            titleTv.setVisibility(View.GONE);
+        }
+        if (!TextUtils.isEmpty(message)) {
+            messageTv.setText(message);
+        }
+        //如果设置按钮的文字
+        if (!TextUtils.isEmpty(positive)) {
+            positiveBn.setText(positive);
+        } else {
+            positiveBn.setText("确定");
+        }
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
+        } else {
+            negativeBn.setText("取消");
+        }
+
+        if (imageResId != -1) {
+            imageIv.setImageResource(imageResId);
+            imageIv.setVisibility(View.VISIBLE);
+        } else {
+            imageIv.setVisibility(View.GONE);
+        }
+        /**
+         * 只显示一个按钮的时候隐藏取消按钮，回掉只执行确定的事件
+         */
+//        if (isSingle) {
+////            columnLineView.setVisibility(View.GONE);
+//            negtiveBn.setVisibility(View.GONE);
+//        } else {
+//            negtiveBn.setVisibility(View.VISIBLE);
+////            columnLineView.setVisibility(View.VISIBLE);
+//        }
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        refreshView();
+    }
+
+    /**
+     * 初始化界面控件
+     */
+    private void initView() {
+        negativeBn = findViewById(R.id.negative);
+        positiveBn = findViewById(R.id.positive);
+        titleTv = findViewById(R.id.title);
+        messageTv = findViewById(R.id.message);
+        imageIv = findViewById(R.id.image);
+//        columnLineView = findViewById(R.id.column_line);
+    }
+
+    /**
+     * 设置确定取消按钮的回调
+     */
+    private OnClickBottomListener onClickBottomListener;
+
+    public void setOnClickBottomListener(OnClickBottomListener onClickBottomListener) {
+        this.onClickBottomListener = onClickBottomListener;
+    }
+
+    public interface OnClickBottomListener {
+        /**
+         * 点击确定按钮事件
+         */
+        void onPositiveClick();
+
+        /**
+         * 点击取消按钮事件
+         */
+        void onNegtiveClick();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public DeleteClockDialog setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public DeleteClockDialog setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public String getPositive() {
+        return positive;
+    }
+
+    public DeleteClockDialog setPositive(String positive) {
+        this.positive = positive;
+        return this;
+    }
+
+    public String getNegative() {
+        return negative;
+    }
+
+    public DeleteClockDialog setNegative(String negative) {
+        this.negative = negative;
+        return this;
+    }
+
+    public DeleteClockDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
+        return this;
+    }
+
+    public int getImageResId() {
+        return imageResId;
+    }
+
+    public boolean isSingle() {
+        return isSingle;
+    }
+
+    public DeleteClockDialog setSingle(boolean single) {
+        isSingle = single;
+        return this;
+    }
+
+    public DeleteClockDialog setImageResId(int imageResId) {
+        this.imageResId = imageResId;
+        return this;
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+    }
+}

app/src/main/java/com/xxpatx/os/dialog/DeleteContactDialog.java

@@ -1,6 +1,5 @@
 package com.xxpatx.os.dialog;
 
-
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -12,7 +11,6 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.xxpatx.os.R;
 
-
 /**
  * description:自定义dialog
  */
@@ -37,7 +35,7 @@ public class DeleteContactDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     /**
      * 按钮之间的分割线
@@ -56,7 +54,7 @@ public class DeleteContactDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private int imageResId = -1;
 
     /**
@@ -92,7 +90,7 @@ public class DeleteContactDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -122,10 +120,10 @@ public class DeleteContactDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
 
         if (imageResId != -1) {
@@ -156,7 +154,7 @@ public class DeleteContactDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -212,17 +210,17 @@ public class DeleteContactDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public DeleteContactDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public DeleteContactDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-    public DeleteContactDialog setNegtiveText(String negtive) {
-        negtiveBn.setText(negtive);
+    public DeleteContactDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
         return this;
     }
 

app/src/main/java/com/xxpatx/os/dialog/DeleteDialog.java

@@ -37,7 +37,7 @@ public class DeleteDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     /**
      * 按钮之间的分割线
@@ -56,7 +56,7 @@ public class DeleteDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private int imageResId = -1;
 
     /**
@@ -92,7 +92,7 @@ public class DeleteDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -122,10 +122,10 @@ public class DeleteDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
 
         if (imageResId != -1) {
@@ -156,7 +156,7 @@ public class DeleteDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -212,17 +212,17 @@ public class DeleteDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public DeleteDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public DeleteDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-    public DeleteDialog setNegtiveText(String negtive) {
-        negtiveBn.setText(negtive);
+    public DeleteDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
         return this;
     }
 

app/src/main/java/com/xxpatx/os/dialog/PasswordDialog.java

@@ -39,7 +39,7 @@ public class PasswordDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     /**
      * 按钮之间的分割线
@@ -58,7 +58,7 @@ public class PasswordDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private int imageResId = -1;
 
     /**
@@ -94,7 +94,7 @@ public class PasswordDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -124,10 +124,10 @@ public class PasswordDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
 
         if (imageResId != -1) {
@@ -158,7 +158,7 @@ public class PasswordDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -229,17 +229,17 @@ public class PasswordDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public PasswordDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public PasswordDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-//    public SingleDialog setNegtiveText(String negtive) {
-//        negtiveBn.setText(negtive);
+//    public SingleDialog setNegtiveText(String negative) {
+//        negtiveBn.setText(negative);
 //        return this;
 //    }
 

app/src/main/java/com/xxpatx/os/dialog/ShortcutDialog.java

@@ -33,7 +33,7 @@ public class ShortcutDialog extends AlertDialog {
      * 确认和取消按钮
      */
     private TextView positiveBn;
-    private TextView negtiveBn;
+    private TextView negativeBn;
 
     private ImageView ivIcon;
     private ImageView ivAppIcon;
@@ -50,7 +50,7 @@ public class ShortcutDialog extends AlertDialog {
      */
     private String message;
     private String title;
-    private String positive, negtive;
+    private String positive, negative;
     private Drawable mDrawable;
     private Drawable mAppDrawable;
     /**
@@ -86,7 +86,7 @@ public class ShortcutDialog extends AlertDialog {
             }
         });
         //设置取消按钮被点击后，向外界提供监听
-        negtiveBn.setOnClickListener(new View.OnClickListener() {
+        negativeBn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (onClickBottomListener != null) {
@@ -116,10 +116,10 @@ public class ShortcutDialog extends AlertDialog {
         } else {
             positiveBn.setText("确定");
         }
-        if (!TextUtils.isEmpty(negtive)) {
-            negtiveBn.setText(negtive);
+        if (!TextUtils.isEmpty(negative)) {
+            negativeBn.setText(negative);
         } else {
-            negtiveBn.setText("取消");
+            negativeBn.setText("取消");
         }
         ivIcon.setImageDrawable(mDrawable);
         ivAppIcon.setImageDrawable(mAppDrawable);
@@ -135,7 +135,7 @@ public class ShortcutDialog extends AlertDialog {
      * 初始化界面控件
      */
     private void initView() {
-        negtiveBn = findViewById(R.id.negtive);
+        negativeBn = findViewById(R.id.negative);
         positiveBn = findViewById(R.id.positive);
         titleTv = findViewById(R.id.title);
         messageTv = findViewById(R.id.message);
@@ -191,17 +191,17 @@ public class ShortcutDialog extends AlertDialog {
         return this;
     }
 
-    public String getNegtive() {
-        return negtive;
+    public String getNegative() {
+        return negative;
     }
 
-    public ShortcutDialog setNegtive(String negtive) {
-        this.negtive = negtive;
+    public ShortcutDialog setNegative(String negative) {
+        this.negative = negative;
         return this;
     }
 
-    public ShortcutDialog setNegtiveText(String negtive) {
-        negtiveBn.setText(negtive);
+    public ShortcutDialog setNegtiveText(String negative) {
+        negativeBn.setText(negative);
         return this;
     }
 

app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java

@@ -19,6 +19,7 @@ import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
 import com.xxpatx.os.bean.Contact;
 import com.xxpatx.os.config.CommonConfig;
 import com.xxpatx.os.databinding.FragmentContactHomeBinding;
+import com.xxpatx.os.view.EqualHeightDecoration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,16 +57,19 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
             SPAN_COUNT = 2;
         }
         mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), SPAN_COUNT));
+//        EquallyDividedItemDecoration equallyDividedItemDecoration = new EquallyDividedItemDecoration(2, ScreenUtils.dip2px(mContext, 4));
+//        mViewDataBinding.rvContact.addItemDecoration(equallyDividedItemDecoration);
+        mViewDataBinding.rvContact.addItemDecoration(new EqualHeightDecoration(3));
         mViewDataBinding.rvContact.setAdapter(mContactAdapter);
     }
 
     private List<Contact> mContacts = new ArrayList<Contact>() {{
-        this.add(new Contact("未设置"));
-        this.add(new Contact("未设置"));
-        this.add(new Contact("未设置"));
-        this.add(new Contact("未设置"));
-        this.add(new Contact("未设置"));
-        this.add(new Contact("未设置"));
+        this.add(new Contact("添加联系人"));
+        this.add(new Contact("添加联系人"));
+        this.add(new Contact("添加联系人"));
+        this.add(new Contact("添加联系人"));
+        this.add(new Contact("添加联系人"));
+        this.add(new Contact("添加联系人"));
     }};
 
     @Override

app/src/main/java/com/xxpatx/os/fragment/control/ControlFragment.java

@@ -35,7 +35,7 @@ import androidx.lifecycle.Observer;
 
 import com.tencent.mmkv.MMKV;
 import com.xxpatx.os.R;
-import com.xxpatx.os.activity.setting.SettingActivity;
+import com.xxpatx.os.activity.settings.setting.SettingActivity;
 import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
 import com.xxpatx.os.bean.FamilyAddress;
 import com.xxpatx.os.config.CommonConfig;

app/src/main/java/com/xxpatx/os/fragment/home/HomeFragment.java

@@ -28,7 +28,7 @@ import com.xxpatx.os.R;
 import com.xxpatx.os.activity.FlashlightActivity;
 import com.xxpatx.os.activity.NetworkActivity;
 import com.xxpatx.os.activity.contact.AddContactActivity;
-import com.xxpatx.os.activity.setting.SettingActivity;
+import com.xxpatx.os.activity.settings.setting.SettingActivity;
 import com.xxpatx.os.activity.weather.WeatherActivity;
 import com.xxpatx.os.alarm.AlarmClockData;
 import com.xxpatx.os.alarm.AlarmUtils;

app/src/main/java/com/xxpatx/os/fragment/phone/record/RecordFragment.java

@@ -194,7 +194,7 @@ public class RecordFragment extends BaseMvvmFragment<RecordViewModel, FragmentRe
         dialog.setTitle("提醒")
                 .setMessage("清空全部通话记录")
                 .setPositive("确定")
-                .setNegtive("取消")
+                .setNegative("取消")
 //                    .setSingle(true)
                 .setOnClickBottomListener(new DeleteDialog.OnClickBottomListener() {
                     @Override

app/src/main/java/com/xxpatx/os/fragment/settings/SettingsFragment.java

@@ -26,7 +26,7 @@ import com.xxpatx.os.R;
 import com.xxpatx.os.activity.alarm.list.AlarmListActivity;
 import com.xxpatx.os.activity.dailyapp.DailyAppActivity;
 import com.xxpatx.os.activity.emergency.EmergencyActivity;
-import com.xxpatx.os.activity.setting.SettingActivity;
+import com.xxpatx.os.activity.settings.setting.SettingActivity;
 import com.xxpatx.os.activity.weather.WeatherActivity;
 import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
 import com.xxpatx.os.bean.MapBean;

app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java

@@ -48,7 +48,7 @@ public class AppStatusManager {
 
     private static final Set<String> mExcludeApp = new HashSet<String>() {{
         this.add("com.android.contacts");
-        this.add("com.android.dialer");
+//        this.add("com.android.dialer");
 //        this.add("com.mediatek.camera");
         this.add("cn.etouch.ecalendar");
     }};

app/src/main/java/com/xxpatx/os/utils/ApkUtils.java

@@ -85,6 +85,7 @@ public class ApkUtils {
 //        this.add("com.xxpatx.store");
         this.add("com.joytv.live");
         this.add("com.xxpatx.store");
+        this.add("com.xxpatx.sn");
         this.add("com.teclast.zyos");
         this.add("com.teclast.zy");
         this.add("com.teclast.zyappstore");
@@ -1053,4 +1054,18 @@ public class ApkUtils {
                     .create();   //启动下载}
         }
     }
+
+    public static void openOta(Context context) {
+        Intent intent = new Intent();
+        ComponentName componentName = new ComponentName("com.zhongkeweilai.update", "com.zhongkeweilai.update.GoogleOtaClient");
+        intent.setComponent(componentName);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        try {
+            context.startActivity(intent);
+        } catch (Exception e) {
+            Log.e(TAG, "openOta: " + e.getMessage());
+            Toaster.showLong("打开OTA失败，请进入设置-关于手机手动检查");
+            context.startActivity(new Intent(Settings.ACTION_SETTINGS));
+        }
+    }
 }

app/src/main/java/com/xxpatx/os/view/EqualHeightDecoration.java

@@ -0,0 +1,28 @@
+package com.xxpatx.os.view;
+
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.xxpatx.os.utils.ScreenUtils;
+
+public class EqualHeightDecoration extends RecyclerView.ItemDecoration {
+    private int rowCount;
+
+    public EqualHeightDecoration(int rowCount) {
+        this.rowCount = rowCount;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        int recyclerViewHeight = parent.getHeight();
+        int height = recyclerViewHeight - (rowCount - 1) * ScreenUtils.dp2px(view.getResources(), 4);
+        int itemHeight = recyclerViewHeight / rowCount;
+        ViewGroup.LayoutParams params = view.getLayoutParams();
+        params.height = itemHeight;
+        view.setLayoutParams(params);
+    }
+}
+

app/src/main/java/com/xxpatx/os/view/MyGridLayout.java

@@ -7,9 +7,9 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-
 import com.xxpatx.os.R;
 import com.xxpatx.os.bean.DesktopIcon;
+import com.xxpatx.os.utils.ScreenUtils;
 
 import java.util.ArrayList;
 
@@ -41,6 +41,7 @@ public class MyGridLayout extends ViewGroup {
             colums = a.getInteger(R.styleable.MyGridLayout_numColumns, 3);
             rows = a.getInteger(R.styleable.MyGridLayout_numRows, 3);
         }
+        margin = ScreenUtils.dp2px(context.getResources(), 8);
     }
 
     public MyGridLayout(Context context, AttributeSet attrs) {
@@ -103,11 +104,11 @@ public class MyGridLayout extends ViewGroup {
                 if (child == null) {
                     return;
                 }
-//                if (j == 0) {
-                left = j * gridW + (j + 1) * margin + margin / 2;
-//                } else {
-//                    left = j * gridW + (j + 1) * margin;
-//                }
+                if (j == 0) {
+                    left = margin;
+                } else {
+                    left = j * gridW + (j + 1) * margin;
+                }
                 // 如果当前布局宽度和测量宽度不一样，就直接用当前布局的宽度重新测量
                 if (gridW != child.getMeasuredWidth()
                         || gridH != child.getMeasuredHeight()) {

app/src/main/res/drawable/add_alarm_background.xml

@@ -3,7 +3,7 @@
     <!-- 内部颜色 -->
     <solid android:color="@color/white" />
     <!-- 圆角的幅度 -->
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/default_radius" />
 
     <!--    <padding-->
     <!--        android:bottom="0dp"-->

app/src/main/res/drawable/alarm_checked_background.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="@color/tv_add_color" />
+    <!-- 圆角的幅度 -->
+    <corners android:radius="@dimen/default_radius" />
+
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/alarm_unchecked_background.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="@color/white" />
+    <!-- 圆角的幅度 -->
+    <corners android:radius="@dimen/default_radius" />
+
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/bg_dialog.xml

@@ -5,5 +5,5 @@
         android:width="0.8dp"
         android:color="#ffffff" />
     <!-- 圆角 -->
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/default_radius" />
 </shape>

app/src/main/res/drawable/bt_sos_bg.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/sos_text_color" />
+    <!--    <solid android:color="@color/sos_text_color" />-->
     <!-- 圆角的幅度 -->
 
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/default_radius" />
 
+    <gradient
+        android:angle="270"
+        android:endColor="#F55C43"
+        android:startColor="#C13445" />
     <!--    <padding-->
     <!--        android:bottom="0dp"-->
     <!--        android:left="8dp"-->

app/src/main/res/drawable/contact_card_backround1.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#FD7102"
+        android:startColor="#EFC700" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/contact_card_backround2.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#1AD368"
+        android:startColor="#08DDC4" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/contact_card_backround3.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#E23434"
+        android:startColor="#FF7C7C" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/contact_card_backround4.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#FD7102"
+        android:startColor="#EFC700" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/contact_card_backround5.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#0394F2"
+        android:startColor="#1BEBEF" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/contact_card_backround6.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <!--    <solid android:color="@color/sos_text_color" />-->
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="@dimen/default_radius" />
+
+    <gradient
+        android:angle="315"
+        android:endColor="#114BEB"
+        android:startColor="#17BEE6" />
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>

app/src/main/res/drawable/dailyapp_cancel_bg.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="#dcdcdc" />
+    <!-- 圆角的幅度 -->
+    <corners android:radius="32dp" />
+
+    <padding
+        android:bottom="10dp"
+        android:left="16dp"
+        android:right="16dp"
+        android:top="10dp" />
+</shape>

app/src/main/res/drawable/dailyapp_confirm_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="#1677FF" />
+    <!-- 圆角的幅度 -->
+    <corners android:radius="32dp" />
+
+    <!--    <gradient-->
+    <!--        android:angle="270"-->
+    <!--        android:endColor="#4c71f6"-->
+    <!--        android:startColor="#6695f7" />-->
+
+    <padding
+        android:bottom="10dp"
+        android:left="16dp"
+        android:right="16dp"
+        android:top="10dp" />
+</shape>

app/src/main/res/drawable/ic_alarm_clock.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:pathData="M505.6,557.6m-334.72,0a334.72,334.72 0,1 0,669.44 0,334.72 334.72,0 1,0 -669.44,0Z"
+        android:fillColor="#DFE8F4" />
+    <path
+        android:pathData="M160,208a111.04,111.04 0,0 0,-12.96 141.28,17.6 17.6,0 0,0 26.72,2.08L304,221.6a17.44,17.44 0,0 0,-2.08 -26.56A111.04,111.04 0,0 0,160 208z"
+        android:fillColor="#CCD8E5" />
+    <path
+        android:pathData="M505.65,557.47m-43.97,270.85a274.4,274.4 0,1 0,87.93 -541.71,274.4 274.4,0 1,0 -87.93,541.71Z"
+        android:fillColor="#CCD8E5" />
+    <path
+        android:pathData="M505.12,550.24a14.24,14.24 0,0 1,-14.24 -14.4v-156a14.24,14.24 0,0 1,14.24 -14.24,14.24 14.24,0 0,1 14.4,14.24v156a14.4,14.4 0,0 1,-14.4 14.4z"
+        android:fillColor="#FFFFFF" />
+    <path
+        android:pathData="M505.6,557.6m-35.84,0a35.84,35.84 0,1 0,71.68 0,35.84 35.84,0 1,0 -71.68,0Z"
+        android:fillColor="#156CDD" />
+    <path
+        android:pathData="M629.6,593.44H505.6v-71.68h124a35.84,35.84 0,0 1,36 35.84,36 36,0 0,1 -36,35.84z"
+        android:fillColor="#156CDD" />
+    <path
+        android:pathData="M754.72,400.32m-46.24,0a46.24,46.24 0,1 0,92.48 0,46.24 46.24,0 1,0 -92.48,0Z"
+        android:fillColor="#156CDD" />
+    <path
+        android:pathData="M883.84,362.24a66.72,66.72 0,0 1,-27.04 -52.16V260.8a101.92,101.92 0,0 0,-71.04 -97.28,10.72 10.72,0 0,1 -7.68,-10.4 24.48,24.48 0,0 0,-1.92 -10.4,23.52 23.52,0 0,0 -44.96,9.6 11.52,11.52 0,0 1,-7.68 11.2,102.08 102.08,0 0,0 -70.88,97.28v49.28a67.2,67.2 0,0 1,-27.04 52.16,32 32,0 0,0 -11.04,33.76 33.12,33.12 0,0 0,32 23.84H862.4a33.28,33.28 0,0 0,32 -23.84,32 32,0 0,0 -10.56,-33.76z"
+        android:fillColor="#0795FF" />
+</vector>

app/src/main/res/drawable/ic_easy_mode_sos.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="104.10156dp"
+    android:height="100dp"
+    android:viewportWidth="1066"
+    android:viewportHeight="1024">
+    <path
+        android:pathData="M1047.05,431.97l-59.24,17.73c-14.78,5.91 -35.53,-2.95 -41.44,-17.77 -5.92,-14.77 2.95,-35.5 17.78,-41.41l59.19,-17.73c14.78,-5.95 35.53,2.95 41.49,17.73 5.87,20.73 -3,38.45 -17.79,41.45zM102.53,384.57c14.79,5.91 23.7,20.68 17.74,41.45 -5.91,11.78 -20.7,20.69 -41.45,17.73L19.63,425.97C4.85,420.06 -4.07,405.25 1.85,384.52c5.92,-14.77 20.75,-23.64 41.49,-17.73l59.15,17.77h0.04zM819.07,115.33c8.87,-11.82 26.61,-14.77 44.36,-5.91 11.91,8.91 14.83,29.59 5.96,44.41l-38.49,50.28c-8.87,11.82 -26.66,14.77 -44.41,5.91 -11.87,-8.86 -14.78,-32.54 -2.95,-44.36l35.53,-50.28v-0.04zM238.74,201.19l-35.53,-53.27c-8.91,-11.82 -5.96,-32.51 5.92,-44.32 14.78,-8.91 35.53,-5.96 44.4,8.82l38.49,50.31c5.91,11.82 2.95,35.5 -8.87,44.37 -14.79,8.86 -35.53,5.91 -44.41,-5.91zM505.21,94.68L505.21,32.55C505.21,14.81 517.04,0 534.77,0c17.79,0 29.65,11.86 29.65,32.54v62.14c0,17.73 -11.87,32.55 -29.61,32.55 -14.79,-2.95 -29.62,-14.77 -29.62,-32.55zM848.65,524.03v313.56L226.87,837.59L226.87,524.03c0,-171.56 139.17,-313.56 310.91,-313.56 171.7,0 310.87,139.01 310.87,313.56zM164.72,961.81v-62.1h743.16v62.14c0,35.5 -26.66,62.14 -62.19,62.14L226.87,1023.99c-32.57,0 -62.14,-29.59 -62.14,-62.13v-0.05zM374.83,588.07c-19.11,0 -34.35,3.88 -45.99,12.25 -11.95,7.77 -17.62,18.82 -17.62,33.15 0,13.44 5.97,23.89 17.92,31.36 7.47,4.78 20.31,9.26 38.53,13.44 15.53,3.58 25.69,6.27 30.46,8.66 8.96,4.18 13.44,9.86 13.44,17.02 0,12.54 -11.95,19.11 -35.84,19.11 -11.35,0 -19.41,-2.09 -24.49,-5.67 -5.08,-4.18 -8.66,-11.05 -10.45,-20.91L307.63,696.49c3.29,36.14 26.28,54.36 69.29,54.36 46.29,0 69.59,-16.43 69.59,-49.28 0,-13.74 -6.27,-24.79 -18.52,-32.55 -8.36,-5.67 -21.5,-10.45 -38.83,-14.63 -15.53,-3.88 -25.69,-6.87 -30.76,-8.96 -8.36,-3.58 -12.25,-8.06 -12.25,-12.84 0,-5.97 2.39,-10.15 7.77,-12.84 4.48,-2.69 11.35,-3.88 20.31,-3.88 10.45,0 18.22,1.49 23.3,4.78 4.78,2.99 8.36,8.66 10.75,16.43h33.15c-3.58,-32.85 -25.98,-48.98 -66.6,-48.98zM545.07,588.07c-23.59,0 -42.41,7.47 -56.45,23 -14.34,15.23 -21.21,34.65 -21.21,58.54 0,23.59 6.87,43.01 20.91,57.94 14.34,15.53 33.15,23.3 56.75,23.3 23.3,0 42.41,-7.77 56.75,-23.3 13.74,-14.93 20.91,-34.35 20.91,-57.94 0,-23.89 -7.17,-43.31 -21.21,-58.54 -14.34,-15.53 -33.15,-23 -56.45,-23zM545.07,615.85c14.04,0 25.09,5.38 32.85,16.73 6.57,9.56 10.15,22.1 10.15,37.03 0,14.63 -3.58,26.88 -10.15,36.74 -7.77,11.05 -18.82,16.73 -32.85,16.73 -14.34,0 -25.09,-5.67 -32.85,-16.73 -6.57,-9.56 -9.86,-21.8 -9.86,-36.74s3.29,-27.48 9.86,-37.03c7.77,-11.35 18.52,-16.73 32.85,-16.73zM710.83,588.07c-19.11,0 -34.35,3.88 -45.99,12.25 -11.95,7.77 -17.62,18.82 -17.62,33.15 0,13.44 5.97,23.89 17.92,31.36 7.47,4.78 20.31,9.26 38.53,13.44 15.53,3.58 25.69,6.27 30.46,8.66 8.96,4.18 13.44,9.86 13.44,17.02 0,12.54 -11.95,19.11 -35.84,19.11 -11.35,0 -19.41,-2.09 -24.49,-5.67 -5.08,-4.18 -8.66,-11.05 -10.45,-20.91h-33.15c3.29,36.14 26.28,54.36 69.29,54.36 46.29,0 69.59,-16.43 69.59,-49.28 0,-13.74 -6.27,-24.79 -18.52,-32.55 -8.36,-5.67 -21.5,-10.45 -38.83,-14.63 -15.53,-3.88 -25.69,-6.87 -30.76,-8.96 -8.36,-3.58 -12.25,-8.06 -12.25,-12.84 0,-5.97 2.39,-10.15 7.77,-12.84 4.48,-2.69 11.35,-3.88 20.31,-3.88 10.45,0 18.22,1.49 23.3,4.78 4.78,2.99 8.36,8.66 10.75,16.43h33.15c-3.58,-32.85 -25.98,-48.98 -66.6,-48.98zM539.06,516.04c8.84,0.09 17,-4.46 21.23,-11.82l47.42,-85.3a19.41,19.41 0,0 0,-1.02 -20.74c-4.5,-6.38 -12.09,-10.19 -20.18,-10.13L530.02,388.06l30.23,-54.46a19.83,19.83 0,0 0,1.22 -16.46c-2.01,-5.41 -6.28,-9.8 -11.81,-12.12 -11.59,-5.31 -25.54,-1.13 -31.81,9.54l-47.45,85.3a19.41,19.41 0,0 0,1.05 20.74c4.27,6.27 11.93,10.13 20.18,10.13h56.49l-30.23,54.46a19.83,19.83 0,0 0,-1.23 16.46c2.01,5.41 6.28,9.8 11.81,12.12 3.42,1.56 7.03,2.28 10.58,2.28z"
+        android:fillColor="@color/easy_icon_color" />
+</vector>

app/src/main/res/drawable/sos_dialer_background.xml

@@ -3,7 +3,7 @@
     <!-- 内部颜色 -->
     <solid android:color="@color/sos_text_color" />
     <!-- 圆角的幅度 -->
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/default_radius" />
 
 <!--    <padding-->
 <!--        android:bottom="4dp"-->

app/src/main/res/drawable/tv_add_alarm_background.xml

@@ -5,11 +5,7 @@
     <solid
         android:color="@color/tv_add_color" />
     <!-- 圆角的幅度 -->
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp"
-        android:bottomLeftRadius="8dp"
-        android:bottomRightRadius="8dp" />
+    <corners android:radius="@dimen/default_radius" />
 
     <padding android:top="8dp"
         android:bottom="8dp"/>

app/src/main/res/drawable/tv_sos_bg.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="#303133" />
+    <solid android:color="#1AFFFFFF" />
     <!-- 圆角的幅度 -->
 
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/default_radius" />
 
     <padding
         android:bottom="8dp"

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

@@ -2,33 +2,22 @@
 <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">
+    tools:context=".activity.settings.setting.SettingActivity">
 
     <data>
 
         <variable
             name="click"
-            type="com.xxpatx.os.activity.setting.SettingActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.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"
@@ -129,45 +118,6 @@
 
                 </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"
@@ -211,29 +161,30 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:onClick="@{click::setDialTone}">
+                    android:onClick="@{click::autoCall}">
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
+                        android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="拨号提示音"
+                        android:text="微信自动拨打"
                         android:textColor="@color/black"
                         android:textSize="22sp"
                         app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/textView4"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
                     <TextView
+                        android:id="@+id/textView4"
                         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:text='@{auto_call?"已开启":"未开启"}'
+                        android:textColor="@{auto_call?@color/setting_enable_color:@color/setting_disable_color}"
                         android:textSize="22sp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -251,34 +202,137 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:onClick="@{click::setStatusBar}">
+                    android:onClick="@{click::setHourlyTimeSignal}">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        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_constraintEnd_toStartOf="@+id/textView7"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <TextView
+                        android:id="@+id/textView7"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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="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::toTouch}">
 
                     <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="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: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"
-                        tools:text="未开启" />
+                        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"
+                        android:visibility="visible"
+                        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::toVoiceBroadcast}">
+
+                    <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"
+                        android:visibility="visible"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <View
                         android:layout_width="match_parent"
@@ -326,6 +380,7 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -376,6 +431,7 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -388,155 +444,6 @@
 
                 </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"
@@ -576,6 +483,7 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -598,7 +506,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:maxLines="1"
-                        android:text="系统其他设置"
+                        android:text="网络字体等设置"
                         android:textColor="@color/black"
                         android:textSize="22sp"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -626,6 +534,7 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -658,11 +567,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
                         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" />
@@ -675,6 +584,57 @@
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    android:onClick="@{click::openOta}">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="OTA更新"
+                        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_marginEnd="8dp"
+                        android:maxLines="1"
+                        android:text="检查"
+                        android:textColor="@color/setting_disable_color"
+                        android:textSize="23sp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/imageView14"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/imageView14"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />

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

@@ -2,13 +2,13 @@
 <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">
+    tools:context=".activity.settings.touch.TouchActivity">
 
     <data>
 
         <variable
             name="click"
-            type="com.xxpatx.os.activity.setting.TouchActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.touch.TouchActivity.BtnClick" />
 
         <variable
             name="disable_key"
@@ -21,6 +21,10 @@
         <variable
             name="disable_clock"
             type="Boolean" />
+
+        <variable
+            name="status_bar"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -40,7 +44,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:text="防止误触设置"
+                android:text="防误触设置"
                 android:textColor="@color/white"
                 android:textSize="23sp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -235,6 +239,47 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/setting_item_height"
+                    android:onClick="@{click::setStatusBar}">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="通知栏开关"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/settings_item_title_size"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/textView6"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <TextView
+                        android:id="@+id/textView6"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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="@dimen/settings_item_hint_size"
+                        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>

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

@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:text="设置闹钟"
                     android:textColor="@color/black"
-                    android:textSize="18sp"
+                    android:textSize="25sp"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/imageView12"
@@ -90,6 +90,7 @@
                         android:text="选择时间"
                         android:textColor="@color/black"
                         android:textSize="16sp"
+                        android:visibility="gone"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -172,88 +173,67 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="72dp"
                     android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/add_alarm_background">
+                    android:layout_marginEnd="8dp">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <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_constraintTop_toTopOf="parent">
+
+                            <RadioGroup
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <RadioButton
+                                    android:id="@+id/rb1"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:background="@drawable/alarm_checked_background"
+                                    android:button="@null"
+                                    android:gravity="center"
+                                    android:text="一次"
+                                    android:textColor="@color/white"
+                                    android:textSize="25sp" />
+
+                                <RadioButton
+                                    android:id="@+id/rb2"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="8dp"
+                                    android:layout_weight="1"
+                                    android:gravity="center"
+                                    android:background="@drawable/alarm_unchecked_background"
+                                    android:button="@null"
+                                    android:text="每天"
+                                    android:textColor="@color/black"
+                                    android:textSize="25sp" />
+                            </RadioGroup>
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <LinearLayout
                         android:id="@+id/ll_type"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
                         android:orientation="vertical"
+                        android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintTop_toTopOf="parent">
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/cl_type"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1">
-
-                            <TextView
-                                android:id="@+id/textView26"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:text="重复"
-                                android:textColor="@color/black"
-                                android:textSize="16sp"
-                                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"
-                                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">
-
-                                    <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>
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1px"
@@ -264,8 +244,8 @@
                         <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"
@@ -297,7 +277,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="72dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -316,14 +296,12 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_activation"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="@drawable/edit_background"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -331,17 +309,17 @@
 
                         <EditText
                             android:id="@+id/et_activation"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
                             android:layout_alignParentBottom="true"
                             android:background="@null"
                             android:hint="请输入标题"
-                            android:padding="4dp"
                             android:maxLength="13"
                             android:maxLines="1"
                             android:singleLine="true"
-                            android:textColorHint="@color/radio_botton_gray"
-                            android:textSize="18sp"
+                            android:textColor="@color/default_gray_text_color"
+                            android:textColorHint="@color/default_gray_text_color"
+                            android:textSize="25sp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -353,7 +331,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="160dp"
+                    android:layout_height="172dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -365,9 +343,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
+                        android:layout_marginTop="8dp"
                         android:text="选择图片或视频"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textColor="@color/default_gray_text_color"
+                        android:textSize="25sp"
                         app:layout_constraintBottom_toTopOf="@+id/cl_pic"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -419,7 +398,7 @@
         <TextView
             android:id="@+id/tv_add"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="64dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
@@ -429,7 +408,7 @@
             android:onClick="@{click::submit}"
             android:text="添加闹钟"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="25sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

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

@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:text="编辑闹钟"
                     android:textColor="@color/black"
-                    android:textSize="18sp"
+                    android:textSize="25sp"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/imageView12"
@@ -93,6 +93,7 @@
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="8dp"
                         android:text="选择时间"
+                        android:visibility="gone"
                         android:textColor="@color/black"
                         android:textSize="16sp"
                         app:layout_constraintStart_toStartOf="parent"
@@ -113,10 +114,57 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="72dp"
                     android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/add_alarm_background">
+                    android:layout_marginEnd="8dp">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_type"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <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_constraintTop_toTopOf="parent">
+
+                            <RadioGroup
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <RadioButton
+                                    android:id="@+id/rb1"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:background="@drawable/alarm_checked_background"
+                                    android:button="@null"
+                                    android:gravity="center"
+                                    android:text="一次"
+                                    android:textColor="@color/white"
+                                    android:textSize="25sp" />
+
+                                <RadioButton
+                                    android:id="@+id/rb2"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="8dp"
+                                    android:layout_weight="1"
+                                    android:background="@drawable/alarm_unchecked_background"
+                                    android:button="@null"
+                                    android:gravity="center"
+                                    android:text="每天"
+                                    android:textColor="@color/black"
+                                    android:textSize="25sp" />
+                            </RadioGroup>
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <LinearLayout
                         android:id="@+id/ll_type"
@@ -126,62 +174,6 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintTop_toTopOf="parent">
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/cl_type"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1">
-
-                            <TextView
-                                android:id="@+id/textView26"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:text="重复"
-                                android:textColor="@color/black"
-                                android:textSize="16sp"
-                                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"
-                                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">
-
-                                    <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>
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1px"
@@ -192,8 +184,8 @@
                         <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"
@@ -225,7 +217,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="72dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -247,11 +239,10 @@
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_activation"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="@drawable/edit_background"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -259,18 +250,19 @@
 
                         <EditText
                             android:id="@+id/et_activation"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
                             android:layout_alignParentBottom="true"
                             android:background="@null"
                             android:hint="请输入标题"
-                            android:text="@{alarmClockData.title}"
-                            android:padding="4dp"
                             android:maxLength="13"
                             android:maxLines="1"
+                            android:padding="4dp"
                             android:singleLine="true"
-                            android:textColorHint="@color/radio_botton_gray"
-                            android:textSize="18sp"
+                            android:text="@{alarmClockData.title}"
+                            android:textColor="@color/default_gray_text_color"
+                            android:textColorHint="@color/default_gray_text_color"
+                            android:textSize="25sp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -282,7 +274,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="160dp"
+                    android:layout_height="172dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginEnd="8dp"
@@ -294,9 +286,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
+                        android:layout_marginTop="8dp"
                         android:text="选择图片或视频"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textColor="@color/default_gray_text_color"
+                        android:textSize="25sp"
                         app:layout_constraintBottom_toTopOf="@+id/cl_pic"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -348,7 +341,7 @@
         <TextView
             android:id="@+id/tv_add"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="64dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
@@ -356,9 +349,9 @@
             android:background="@drawable/tv_add_alarm_background"
             android:gravity="center"
             android:onClick="@{click::submit}"
-            android:text="保存"
+            android:text="添加闹钟"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="25sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

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

@@ -58,7 +58,7 @@
                         android:layout_height="wrap_content"
                         android:text="我的闹钟"
                         android:textColor="@color/black"
-                        android:textSize="18sp"
+                        android:textSize="25sp"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/imageView12"

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

@@ -77,8 +77,8 @@
                         android:layout_gravity="center"
                         android:layout_marginTop="32dp"
                         android:layout_marginBottom="32dp"
-                        android:onClick="@{click::selectPic}"
                         android:adjustViewBounds="true"
+                        android:onClick="@{click::selectPic}"
                         android:scaleType="centerCrop"
                         android:src="@drawable/default_avatar"
                         app:is_circle="true"
@@ -132,6 +132,7 @@
                             android:ellipsize="end"
                             android:hint="请输入微信昵称"
                             android:inputType="text"
+                            android:maxLength="8"
                             android:maxLines="1"
                             android:singleLine="true"
                             android:textColor="@color/black"
@@ -190,6 +191,7 @@
                             android:ellipsize="end"
                             android:hint="请输入手机号码"
                             android:inputType="phone"
+                            android:maxLength="12"
                             android:maxLines="1"
                             android:singleLine="true"
                             android:textColor="@color/black"
@@ -248,6 +250,7 @@
                             android:ellipsize="end"
                             android:hint="请输入微信标签"
                             android:inputType="text"
+                            android:maxLength="8"
                             android:maxLines="1"
                             android:singleLine="true"
                             android:text="@string/app_name"
@@ -310,11 +313,11 @@
                             android:id="@+id/tb_show"
                             android:layout_width="48dp"
                             android:layout_height="24dp"
-                            app:tbAsDefaultOn="true"
                             android:layout_marginEnd="32dp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:tbAsDefaultOn="true" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -158,6 +158,7 @@
                             android:ellipsize="end"
                             android:hint="请输入微信昵称"
                             android:inputType="text"
+                            android:maxLength="8"
                             android:maxLines="1"
                             android:singleLine="true"
                             android:text="@{contact.name}"
@@ -219,6 +220,7 @@
                             android:inputType="phone"
                             android:maxLines="1"
                             android:singleLine="true"
+                            android:maxLength="12"
                             android:text="@{contact.mobile}"
                             android:textColor="@color/black"
                             android:textColorHint="@color/ok_button"
@@ -267,7 +269,7 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <EditText
-                            android:id="@+id/et_group"
+                            android:id="@+id/et_tag"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
@@ -275,6 +277,7 @@
                             android:background="@null"
                             android:ellipsize="end"
                             android:hint="请输入微信标签"
+                            android:maxLength="8"
                             android:inputType="text"
                             android:maxLines="1"
                             android:singleLine="true"

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

@@ -2,12 +2,12 @@
 <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.dock.DockActivity">
+    tools:context=".activity.settings.dock.DockActivity">
 
     <data>
         <variable
             name="click"
-            type="com.xxpatx.os.activity.dock.DockActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.dock.DockActivity.BtnClick" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -15,98 +15,86 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout12"
+        <LinearLayout
+            android:id="@+id/ll_main"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/bt_sos_bg"
+            android:gravity="center"
+            android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout12"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
                 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_marginTop="12dp"
-                    android:maxLines="1"
-                    android:text="SOS"
-                    android:textColor="@color/white"
-                    android:textSize="50sp" />
+                <!--                <ImageView-->
+                <!--                    android:id="@+id/imageView3"-->
+                <!--                    android:layout_width="100dp"-->
+                <!--                    android:layout_height="100dp"-->
+                <!--                    android:src="@drawable/ic_easy_mode_sos"-->
+                <!--                    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:layout_marginBottom="16dp"
-                    android:maxLines="1"
-                    android:text="紧急服务"
-                    android:textColor="@color/white"
-                    android:textSize="26sp" />
-            </LinearLayout>
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:src="@drawable/sos_banner"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintDimensionRatio="69:50"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/textView12"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="32dp"
-            android:gravity="center"
-            android:text="紧急呼叫功能已开启"
-            android:textColor="@color/sos_text_color"
-            android:textSize="32sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/constraintLayout12" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/tv_countdown"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="倒计时（3）秒"
-            android:textColor="@color/sos_text_color"
-            android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView12" />
+            <TextView
+                android:id="@+id/tv_countdown"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="倒计时（3）秒"
+                android:textColor="@color/white"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:layout_editor_absoluteY="323dp" />
 
-        <TextView
-            android:id="@+id/textView4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="将自动呼叫以下号码"
-            android:textColor="@color/sos_text_color"
-            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_countdown" />
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="将自动呼叫以下号码"
+                android:textColor="@color/white"
+                android:textSize="25sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_countdown" />
+
+        </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_contact"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/constraintLayout7"
-            app:layout_constraintTop_toBottomOf="@+id/textView4"
+            app:layout_constraintTop_toBottomOf="@+id/ll_main"
             tools:listitem="@layout/item_emergency_contact" />
 
         <ImageView
@@ -126,26 +114,40 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout7"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginStart="32dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="32dp"
+            android:layout_height="72dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="20dp"
             android:background="@drawable/sos_dialer_background"
             android:onClick="@{click::call}"
             app:layout_constraintBottom_toBottomOf="parent">
 
             <ImageView
                 android:id="@+id/imageView19"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
                 android:src="@drawable/icon_sos_dialer"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="取消"
+                android:textColor="@color/white"
+                android:textSize="26sp"
+                android:textStyle="bold"
+                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" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -10,17 +10,14 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="280dp"
-            android:layout_height="240dp"
+            android:layout_width="300dp"
+            android:layout_height="360dp"
             android:layout_centerInParent="true"
             android:background="@drawable/bg_dialog"
-            android:minWidth="240dp"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
+            android:minWidth="300dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -30,9 +27,9 @@
                 android:id="@+id/linearLayout2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 android:gravity="center"
                 android:orientation="horizontal"
-                app:layout_constraintBottom_toTopOf="@+id/message"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -55,55 +52,75 @@
                     android:gravity="center_vertical"
                     android:text="闹钟提醒"
                     android:textColor="@color/black"
-                    android:textSize="18sp"
+                    android:textSize="22sp"
                     android:textStyle="bold"
                     android:visibility="visible" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/message"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="20dp"
                 android:gravity="center"
-                android:lineSpacingExtra="3dp"
-                android:lineSpacingMultiplier="1.2"
-                android:minHeight="50dp"
-                android:text="您有新的闹钟,请查收"
-                android:textColor="#9a9a9a"
-                android:textSize="14sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.404" />
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/linearLayout3"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+
+                <ImageView
+                    android:layout_width="140dp"
+                    android:layout_height="140dp"
+                    android:src="@drawable/ic_alarm_clock" />
+
+                <TextView
+                    android:id="@+id/message"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:gravity="center"
+                    android:lineSpacingExtra="3dp"
+                    android:lineSpacingMultiplier="1.2"
+                    android:minHeight="50dp"
+                    android:text="您有新的闹钟,请查收"
+                    android:textColor="#9a9a9a"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.5" />
+
+            </LinearLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/linearLayout3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/message">
+                android:layout_marginStart="48dp"
+                android:layout_marginEnd="48dp"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintBottom_toBottomOf="parent">
 
                 <TextView
                     android:id="@+id/positive"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@drawable/view_clock_button_bg"
+                    android:background="@drawable/dailyapp_confirm_bg"
                     android:gravity="center"
                     android:singleLine="true"
                     android:text="查看"
                     android:textColor="@color/white"
-                    android:textSize="16sp"
+                    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>
+
 </layout>

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

@@ -0,0 +1,278 @@
+<?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.settings.other.OtherSettingsActivity">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.xxpatx.os.activity.settings.other.OtherSettingsActivity.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="64dp"
+            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="25sp"
+                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="@dimen/setting_item_height"
+                    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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    android:onClick="@{click::openSound}">
+
+                    <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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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/activity_setting.xml

@@ -2,22 +2,18 @@
 <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">
+    tools:context=".activity.settings.setting.SettingActivity">
 
     <data>
 
         <variable
             name="click"
-            type="com.xxpatx.os.activity.setting.SettingActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.setting.SettingActivity.BtnClick" />
 
         <variable
             name="float_window_enable"
             type="Boolean" />
 
-        <variable
-            name="voice_broadcast"
-            type="Boolean" />
-
         <variable
             name="auto_accept"
             type="Boolean" />
@@ -26,14 +22,6 @@
             name="auto_call"
             type="Boolean" />
 
-        <variable
-            name="dial_tone"
-            type="Boolean" />
-
-        <variable
-            name="status_bar"
-            type="Boolean" />
-
         <variable
             name="versionName"
             type="String" />
@@ -42,9 +30,6 @@
             name="hourly_time"
             type="Boolean" />
 
-        <variable
-            name="voiceSpeaker"
-            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -102,7 +87,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::openFloat}">
 
                     <TextView
@@ -112,7 +97,7 @@
                         android:maxLines="1"
                         android:text="悬浮按钮"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/textView1"
                         app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +112,7 @@
                         android:maxLines="1"
                         android:text='@{float_window_enable?"已开启":"未开启"}'
                         android:textColor="@{float_window_enable?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -142,49 +127,10 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::voiceBroadcast}">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="短信语音播报"
-                        android:textColor="@color/black"
-                        android:textSize="25sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView2"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        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="未开启" />
-
-                    <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:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::autoAccept}">
 
                     <TextView
@@ -194,7 +140,7 @@
                         android:maxLines="1"
                         android:text="微信自动接听"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/textView3"
                         app:layout_constraintStart_toStartOf="parent"
@@ -209,7 +155,7 @@
                         android:maxLines="1"
                         android:text='@{auto_accept?"已开启":"未开启"}'
                         android:textColor="@{auto_accept?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -225,18 +171,18 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::autoCall}">
 
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="微信自动拨打视频"
                         android:ellipsize="end"
+                        android:maxLines="1"
+                        android:text="微信自动拨打"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/textView4"
                         app:layout_constraintStart_toStartOf="parent"
@@ -251,7 +197,7 @@
                         android:maxLines="1"
                         android:text='@{auto_call?"已开启":"未开启"}'
                         android:textColor="@{auto_call?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -267,89 +213,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::setDialTone}">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="拨号提示音"
-                        android:textColor="@color/black"
-                        android:textSize="25sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView5"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:id="@+id/textView5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        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="未开启" />
-
-                    <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:onClick="@{click::setStatusBar}">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="通知栏开关"
-                        android:textColor="@color/black"
-                        android:textSize="25sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView6"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                    <TextView
-                        android:id="@+id/textView6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        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="未开启" />
-
-                    <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:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::setHourlyTimeSignal}">
 
                     <TextView
@@ -357,9 +221,9 @@
                         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="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/textView7"
                         app:layout_constraintStart_toStartOf="parent"
@@ -374,7 +238,7 @@
                         android:maxLines="1"
                         android:text='@{hourly_time?"已开启":"未开启"}'
                         android:textColor="@{hourly_time?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -390,247 +254,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:onClick="@{click::appSpeak}">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:maxLines="1"
-                        android:text="应用启动播报"
-                        android:textColor="@color/black"
-                        android:textSize="25sp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView8"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/textView8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:maxLines="1"
-                        android:text='@{voiceSpeaker?"已开启":"未开启"}'
-                        android:textColor="@{voiceSpeaker?@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="未开启" />
-
-                    <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:onClick="@{click::setBlacklist}">
-
-                    <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="25sp"
-                        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"
-                        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: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="25sp"
-                        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"
-                        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: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="25sp"
-                        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"
-                        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: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="25sp"
-                        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"
-                        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:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::toTouch}">
 
                     <TextView
@@ -640,7 +264,7 @@
                         android:maxLines="1"
                         android:text="防误触设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -653,19 +277,20 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         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_width="20dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -680,7 +305,160 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
+                    android:onClick="@{click::toVoiceBroadcast}">
+
+                    <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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    android:onClick="@{click::setBlacklist}">
+
+                    <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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    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="@dimen/settings_item_title_size"
+                        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="@dimen/settings_item_hint_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
                     android:onClick="@{click::toDockSetting}">
 
                     <TextView
@@ -690,7 +468,7 @@
                         android:maxLines="1"
                         android:text="快捷图标设置"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -703,19 +481,20 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         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_width="20dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -730,7 +509,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::toSettings}">
 
                     <TextView
@@ -738,9 +517,9 @@
                         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="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -753,19 +532,20 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         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_width="20dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -780,7 +560,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::checkupdate}">
 
                     <TextView
@@ -790,7 +570,7 @@
                         android:maxLines="1"
                         android:text="检测更新"
                         android:textColor="@color/black"
-                        android:textSize="25sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -798,23 +578,74 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
                         android:maxLines="1"
                         android:text="@{versionName}"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="23sp"
-                        android:layout_marginEnd="8dp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         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_width="20dp"
+                        android:layout_height="20dp"
                         android:layout_marginEnd="16dp"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/icon_more"
+                        android:visibility="visible"
+                        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="@dimen/setting_item_height"
+                    android:onClick="@{click::openOta}">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="OTA更新"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/settings_item_title_size"
+                        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_marginEnd="8dp"
+                        android:maxLines="1"
+                        android:text="检查"
+                        android:textColor="@color/setting_disable_color"
+                        android:textSize="@dimen/settings_item_hint_size"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/imageView14"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/imageView14"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="16dp"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/icon_more"
+                        android:visibility="visible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />

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

@@ -2,13 +2,13 @@
 <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.TimeActivity">
+    tools:context=".activity.settings.time.TimeActivity">
 
     <data>
 
         <variable
             name="click"
-            type="com.xxpatx.os.activity.setting.TimeActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.time.TimeActivity.BtnClick" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -2,13 +2,13 @@
 <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">
+    tools:context=".activity.settings.touch.TouchActivity">
 
     <data>
 
         <variable
             name="click"
-            type="com.xxpatx.os.activity.setting.TouchActivity.BtnClick" />
+            type="com.xxpatx.os.activity.settings.touch.TouchActivity.BtnClick" />
 
         <variable
             name="disable_key"
@@ -21,6 +21,10 @@
         <variable
             name="disable_clock"
             type="Boolean" />
+
+        <variable
+            name="status_bar"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -40,9 +44,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="24sp"
+                android:textSize="25sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +82,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::disableVolumeKey}">
 
                     <TextView
@@ -88,7 +92,7 @@
                         android:maxLines="1"
                         android:text="音量键禁用"
                         android:textColor="@color/black"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -102,7 +106,7 @@
                         android:maxLines="1"
                         android:text='@{disable_key?"已开启":"未开启"}'
                         android:textColor="@{disable_key?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -118,7 +122,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::disableContactModify}">
 
                     <TextView
@@ -128,7 +132,7 @@
                         android:maxLines="1"
                         android:text="修改联系人禁用"
                         android:textColor="@color/black"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -142,7 +146,7 @@
                         android:maxLines="1"
                         android:text='@{disable_contact?"已开启":"未开启"}'
                         android:textColor="@{disable_contact?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -158,7 +162,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:visibility="gone">
 
                     <TextView
@@ -168,7 +172,7 @@
                         android:maxLines="1"
                         android:text="设置访问禁用"
                         android:textColor="@color/black"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -182,7 +186,7 @@
                         android:maxLines="1"
                         android:text="未开启"
                         android:textColor="@color/setting_disable_color"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -197,7 +201,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="@dimen/setting_item_height"
                     android:onClick="@{click::disableClockModify}">
 
                     <TextView
@@ -207,7 +211,7 @@
                         android:maxLines="1"
                         android:text="闹钟设置禁用"
                         android:textColor="@color/black"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_title_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -221,7 +225,48 @@
                         android:maxLines="1"
                         android:text='@{disable_clock?"已开启":"未开启"}'
                         android:textColor="@{disable_clock?@color/setting_enable_color:@color/setting_disable_color}"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/settings_item_hint_size"
+                        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="@dimen/setting_item_height"
+                    android:onClick="@{click::setStatusBar}">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:maxLines="1"
+                        android:text="通知栏开关"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/settings_item_title_size"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/textView6"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+
+                    <TextView
+                        android:id="@+id/textView6"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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="@dimen/settings_item_hint_size"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -239,6 +284,5 @@
 
         </ScrollView>
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -125,7 +125,7 @@
                 app:layout_constraintBottom_toBottomOf="parent">
 
                 <TextView
-                    android:id="@+id/negtive"
+                    android:id="@+id/negative"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"