version:3.1

fix:
update:桌面布局优化，增加手动更新和手动绑定

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.uiuios.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 20
+        versionCode 22
-        versionName "2.9"
+        versionName "3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -117,7 +117,8 @@
             android:screenOrientation="sensorPortrait" />
         <activity
             android:name=".activity.weather.WeatherActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".activity.EmergencyActivity"
             android:launchMode="singleTask" />

app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java

@@ -95,7 +95,12 @@ public class NoticeActivity extends AppCompatActivity {
                 finish();
             }
             Log.e(TAG, "onCreate: " + alarmClockData);
-            showData(alarmClockData);
+            jz_video.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    showData(alarmClockData);
+                }
+            },1234);
         }
 
     }

app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java

@@ -102,10 +102,10 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
 
         is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 1) == 1;
         if (is_twoscreen) {
-//            appListIndex = 2;
+            appListIndex = 2;
-//            defaultCurrent = 1;
+            defaultCurrent = 1;
-//            mSecondFragment = new SecondFragment();
+            mSecondFragment = new SecondFragment();
-//            mFragments.add(mSecondFragment);
+            mFragments.add(mSecondFragment);
         }
         mCustomFragment = new CustomFragment();
         mFragments.add(mCustomFragment);

app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java

@@ -3,6 +3,7 @@ package com.uiuios.aios.adapter;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +18,7 @@ import com.bumptech.glide.Glide;
 import com.shehuan.niv.NiceImageView;
 import com.uiuios.aios.R;
 import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.utils.ToastUtil;
 
 import java.util.List;
 
@@ -44,6 +46,11 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
         contactHolder.root.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+//                int aole_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0);
+//                if (aole_call_forbid == 1) {
+//                    ToastUtil.show("电话功能被禁用");
+//                    return;
+//                }
                 Intent intent1 = new Intent(Intent.ACTION_CALL);
                 String phone = contact.getMobile();
                 if (DIALER_PACKAGE.equals(phone)) {

app/src/main/java/com/uiuios/aios/config/CommonConfig.java

@@ -8,4 +8,15 @@ public class CommonConfig {
     public static final String MAP_LATITUDE_KEY = "map_latitude_key";
     public static final String MAP_ADDRESS_KEY = "map_address_key";
     public static final String MAP_ERROR_KEY = "map_error_key";
+
+    /*是否激活接口请求缓存*/
+    public static final String ACTIVATION_BEAN_KEY = "AIOS_UIUI_ACTIVATION_BEAN_KEY";
+    /*是否激活*/
+    public static final String UIUI_ACTIVATION_KEY = "aios_uiui_activation";
+    /*激活码类型*/
+    public static final String UIUI_CODE_TYPE_KEY = "aios_uiui_code_type";
+    /*体验到期时间戳*/
+    public static final String UIUI_EXPIRE_TIME_KEY = "aios_uiui_expire_time";
+
+    public static final String SETTING_OTHER_APPINSTALLER_KEY = "setting_other_appInstaller";
 }

app/src/main/java/com/uiuios/aios/fragment/AppListFragment.java

@@ -27,6 +27,7 @@ import com.uiuios.aios.activity.code.FamilySpaceActivity;
 import com.uiuios.aios.base.BaseFragment;
 import com.uiuios.aios.bean.BaseResponse;
 import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.config.CommonConfig;
 import com.uiuios.aios.dialog.CustomDialog;
 import com.uiuios.aios.manager.AppStatusManager;
 import com.uiuios.aios.network.NetInterfaceManager;
@@ -155,7 +156,7 @@ public class AppListFragment extends BaseFragment {
                         int appSize = AppStatusManager.getInstance().getPackageList().size();
                         if (appSize == 0) {
                             bg.setVisibility(View.GONE);
-                        } else  {
+                        } else {
                             bg.setVisibility(View.VISIBLE);
                             bg.setText(String.valueOf(appSize));
                         }
@@ -203,23 +204,42 @@ public class AppListFragment extends BaseFragment {
 //                            startActivity(new Intent(mContext, FamilySpaceActivity.class));
                             ApkUtils.openApp(mContext, "com.uiui.videoplayer");
                             break;
+                        case "aios.appstore":
+                            ApkUtils.openApp(mContext, "com.uiuios.appstore");
+                            break;
                         case "com.android.dialer":
-                            int qch_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0);
+//                            int aole_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0);
-                            if (qch_call_forbid == 1) {
+//                            if (aole_call_forbid == 1) {
-                                ToastUtil.show("电话功能被禁用");
+//                                ToastUtil.show("电话功能被禁用");
-                                return;
+//                                return;
+//                            } else {
+                            ApkUtils.openPackage(v.getContext(), desktopIcon.getPackageName(), desktopIcon.getClassName());
+                            AppUsedTimeUtils.getInstance().setAppPackageName(desktopIcon.getPackageName());
+                            AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
+                            SendRunningApp(getActivity());
+//                            }
+                            break;
+                        case "com.uiuios.aios":
+                        case "com.uiuios.sn":
+                        case "com.uiuios.appstore":
+                        case "com.uiuios.browser":
+                            ApkUtils.openPackage(v.getContext(), desktopIcon.getPackageName(), desktopIcon.getClassName());
+                            AppUsedTimeUtils.getInstance().setAppPackageName(desktopIcon.getPackageName());
+                            AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
+                            SendRunningApp(getActivity());
+                            break;
+                        default:
+                            int setting_other_appInstaller = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.SETTING_OTHER_APPINSTALLER_KEY, 1);
+                            if (setting_other_appInstaller == 0
+                                    && !ApkUtils.isSystemApp(mContext, desktopIcon.getPackageName()
+                            )) {
+                                ToastUtil.show("已禁止应用打开");
                             } else {
                                 ApkUtils.openPackage(v.getContext(), desktopIcon.getPackageName(), desktopIcon.getClassName());
                                 AppUsedTimeUtils.getInstance().setAppPackageName(desktopIcon.getPackageName());
                                 AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
                                 SendRunningApp(getActivity());
                             }
-                            break;
-                        default:
-                            ApkUtils.openPackage(v.getContext(), desktopIcon.getPackageName(), desktopIcon.getClassName());
-                            AppUsedTimeUtils.getInstance().setAppPackageName(desktopIcon.getPackageName());
-                            AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
-                            SendRunningApp(getActivity());
                     }
                 }
             }

app/src/main/java/com/uiuios/aios/fragment/custom/CustomFragment.java

@@ -561,7 +561,8 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
         cl_appstore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ApkUtils.openPackage(mContext, "com.uiuios.appstore");
+//                ApkUtils.openPackage(mContext, "com.uiuios.appstore");
+                ApkUtils.openPackage(mContext, "com.uiui.videoplayer", "com.uiui.videoplayer.activity.main.MainActivity");
             }
         });
         cl_wifi.setOnClickListener(new View.OnClickListener() {
@@ -663,6 +664,11 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
     }
 
     private void checkContact() {
+//        int aole_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0);
+//        if (aole_call_forbid == 1) {
+//            ToastUtil.show("电话功能被禁用");
+//            return;
+//        }
         startActivity(new Intent(mContext, ContactActivity.class));
     }
 
@@ -719,7 +725,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
     }
 
     private void checkActivation() {
-        int activation = Settings.Global.getInt(mContext.getContentResolver(), "uiui_activation", 0);
+        int activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0);
         if (activation == 0) {
             tv_name.setText("未激活");
         } else {
@@ -731,6 +737,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
 
     private void setQuickApp() {
         quickAppPackagesName = Settings.Global.getString(mCRv, QuickAppActivity.QUICK_APP_KEY);
+        Log.e(TAG, "setQuickApp: " + quickAppPackagesName);
         if (!TextUtils.isEmpty(quickAppPackagesName)) {
             ApplicationInfo applicationInfo = null;
             PackageManager pm = mContext.getPackageManager();
@@ -742,6 +749,8 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
             if (applicationInfo != null) {
                 iv_app.setImageDrawable(applicationInfo.loadIcon(pm));
             }
+        } else {
+            iv_app.setImageDrawable(mContext.getDrawable(R.drawable.home_quick_app));
         }
     }
 

app/src/main/java/com/uiuios/aios/utils/ApkUtils.java

@@ -59,6 +59,11 @@ public class ApkUtils {
         this.add("com.tencent.android.qqdownloader");
 //        this.add("com.uiuios.appstore");
         this.add("com.joytv.live");
+        this.add("com.uiuios.appstore");
+        this.add("com.teclast.zyos");
+        this.add("com.teclast.zy");
+        this.add("com.teclast.zyappstore");
+        this.add("com.teclast.zybrowser");
     }};
 
     private static HashSet<String> excludeClassName = new HashSet<String>() {{
@@ -171,7 +176,6 @@ public class ApkUtils {
         if (!TextUtils.isEmpty(appListString)) {
             packageList = new ArrayList<>(Arrays.asList(appListString.split(",")));
         }
-        int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1);
         for (ResolveInfo resolveInfo : resolveinfoList) {
             String pkg = resolveInfo.activityInfo.packageName;
             if (appIsDisable(context, pkg)) {
@@ -184,15 +188,16 @@ public class ApkUtils {
                     resolveInfos.add(resolveInfo);
                 }
             } else {
-                if (setting_other_appInstaller == 0) {//不显示自己安装的
+//                int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1);
-                    if (packageList.contains(pkg)) {
+//                if (setting_other_appInstaller == 0) {//不显示自己安装的
-                        resolveInfos.add(resolveInfo);
+//                    if (packageList.contains(pkg)) {
-                    }
+//                        resolveInfos.add(resolveInfo);
-                } else {
+//                    }
+//                } else {
                     if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) {
                         resolveInfos.add(resolveInfo);
                     }
-                }
+//                }
             }
         }
         if (Settings.Global.getInt(context.getContentResolver(), "is_activity", 0) == 0) {
@@ -235,9 +240,9 @@ public class ApkUtils {
         desktopIcons.add(0, dailyIcon);
 
         DesktopIcon familyIcon = new DesktopIcon();
-        familyIcon.setIcon(context.getDrawable(R.drawable.icon_family_space));
+        familyIcon.setIcon(context.getDrawable(R.drawable.com_android_appstore));
-        familyIcon.setLable("家庭空间");
+        familyIcon.setLable("应用市场");
-        familyIcon.setPackageName("aios.family");
+        familyIcon.setPackageName("aios.appstore");
         desktopIcons.add(1, familyIcon);
 
         return desktopIcons;

app/src/main/java/com/uiuios/aios/utils/IconUtils.java

@@ -9,6 +9,7 @@ public class IconUtils {
     public static List<String> appClassNameList = new ArrayList<String>() {{
         this.add("com.uiuios.sn");//设别信息
         this.add("com.uiuios.appstore");//应用市场
+        this.add("aios.appstore");//应用市场
         this.add("com.uiui.weather");//天气
         this.add("com.android.browser");//浏览器
         this.add("com.uiuios.browser");//浏览器
@@ -47,6 +48,7 @@ public class IconUtils {
     public static List<String> appIconList = new ArrayList<String>() {{
         this.add("com_uiui_sn");
         this.add("com_android_appstore");
+        this.add("com_android_appstore");
         this.add("com_uiui_weather");
         this.add("com_android_browser");
         this.add("com_android_browser");

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 内部颜色 -->
-    <solid android:color="#162136" />
+    <solid android:color="#33162136" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="@dimen/dp_8"

app/src/main/res/drawable/custom_bg_app.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/app_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="@color/ok_button" />
+    <solid android:color="@color/default_blue" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="100dp"

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

@@ -12,7 +12,7 @@
             <!--                android:width="1dp"-->
             <!--                android:color="#fff" />-->
             <corners android:radius="@dimen/dp_8" />
-            <solid android:color="#162136" />
+            <solid android:color="#32162136" />
         </shape>
     </item>
 

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

@@ -8,5 +8,5 @@
     <stroke
         android:width="@dimen/dp_2"
         android:color="#e1e8f0" />
-    <solid android:color="#162136" />
+    <solid android:color="#33162136" />
 </shape>

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 内部颜色 -->
-    <solid android:color="@color/noti_color" />
+    <solid android:color="@color/default_blue" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="24dp"

app/src/main/res/layout-land/activity_contact.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/control_background"
     tools:context=".activity.contact.ContactActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout-land/activity_control.xml

@@ -33,10 +33,21 @@
             android:singleLine="true"
             android:text="返回桌面"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/iv_back"
             app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="控制中心"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:textColor="@color/white" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout

app/src/main/res/layout-land/activity_dailyapp.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/control_background"
     tools:context=".activity.DailyAppActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout-land/fragment_custom.xml

@@ -7,7 +7,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/sp_16">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout5"
@@ -153,7 +154,7 @@
                     android:maxEms="8"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:text="快捷设置"
+                    android:text="控制中心"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_11"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -161,7 +162,6 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -302,8 +302,8 @@
                             android:layout_height="@dimen/dp_68"
                             android:adjustViewBounds="true"
                             android:scaleType="centerInside"
-                            android:visibility="visible"
                             android:src="@drawable/home_reminder_icon"
+                            android:visibility="visible"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -450,8 +450,8 @@
                             android:layout_height="@dimen/dp_20"
                             android:layout_marginStart="@dimen/dp_8"
                             android:layout_marginTop="@dimen/dp_8"
-                            android:visibility="gone"
                             android:src="@drawable/home_icon_clean"
+                            android:visibility="gone"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -532,7 +532,7 @@
                         android:layout_marginEnd="@dimen/dp_2"
                         android:layout_marginBottom="@dimen/dp_4"
                         android:layout_weight="1"
-                        android:background="@drawable/custom_bg_health">
+                        android:background="@drawable/custom_bg_app">
 
                         <TextView
                             android:id="@+id/tv_app"
@@ -562,7 +562,7 @@
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_contact"
+                        android:id="@+id/cl_appstore"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_2"
@@ -570,6 +570,77 @@
                         android:layout_marginEnd="@dimen/dp_2"
                         android:layout_marginBottom="@dimen/dp_4"
                         android:layout_weight="1"
+                        android:background="@drawable/custom_bg_appstore"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_8"
+                            android:layout_marginTop="@dimen/dp_8"
+                            android:text="家庭空间"
+                            android:textColor="@color/default_text_color"
+                            android:textSize="@dimen/sp_15"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_68"
+                            android:layout_height="@dimen/dp_68"
+                            android:adjustViewBounds="true"
+                            android:scaleType="centerInside"
+                            android:src="@drawable/icon_family_space"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_ai"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="@dimen/dp_2"
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:layout_marginEnd="@dimen/dp_2"
+                        android:layout_marginBottom="@dimen/dp_4"
+                        android:layout_weight="1"
+                        android:background="@drawable/custom_bg_ai">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_8"
+                            android:layout_marginTop="@dimen/dp_8"
+                            android:text="AI问诊"
+                            android:textColor="@color/default_text_color"
+                            android:textSize="@dimen/sp_15"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_68"
+                            android:layout_height="@dimen/dp_68"
+                            android:adjustViewBounds="true"
+                            android:scaleType="centerInside"
+                            android:src="@drawable/home_clinical_hand"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_contact"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="@dimen/dp_2"
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:layout_marginEnd="@dimen/dp_4"
+                        android:layout_marginBottom="@dimen/dp_4"
+                        android:layout_weight="1"
                         android:background="@drawable/custom_bg_contact">
 
                         <TextView
@@ -597,148 +668,6 @@
                             app:layout_constraintTop_toTopOf="parent" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_appstore"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_2"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:layout_marginBottom="@dimen/dp_4"
-                        android:layout_weight="1"
-                        android:background="@drawable/custom_bg_appstore"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:text="应用市场"
-                            android:textColor="@color/default_text_color"
-                            android:textSize="@dimen/sp_15"
-                            android:textStyle="bold"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <ImageView
-                            android:layout_width="@dimen/dp_68"
-                            android:layout_height="@dimen/dp_68"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/systemapp_icon"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_ai"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_2"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:layout_marginBottom="@dimen/dp_4"
-                        android:layout_weight="1"
-                        android:background="@drawable/custom_bg_ai">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:text="AI问诊"
-                            android:textColor="@color/default_text_color"
-                            android:textSize="@dimen/sp_15"
-                            android:textStyle="bold"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <ImageView
-                            android:layout_width="@dimen/dp_68"
-                            android:layout_height="@dimen/dp_68"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerInside"
-                            android:src="@drawable/home_clinical_hand"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <!--                    <androidx.constraintlayout.widget.ConstraintLayout-->
-                    <!--                        android:id="@+id/cl_control"-->
-                    <!--                        android:layout_width="0dp"-->
-                    <!--                        android:layout_height="match_parent"-->
-                    <!--                        android:layout_marginStart="@dimen/dp_2"-->
-                    <!--                        android:layout_marginTop="@dimen/dp_2"-->
-                    <!--                        android:layout_marginEnd="@dimen/dp_4"-->
-                    <!--                        android:layout_marginBottom="@dimen/dp_4"-->
-                    <!--                        android:layout_weight="1"-->
-                    <!--                        android:background="@drawable/custom_bg_health">-->
-
-                    <!--                        <TextView-->
-                    <!--                            android:id="@+id/textView6"-->
-                    <!--                            android:layout_width="wrap_content"-->
-                    <!--                            android:layout_height="wrap_content"-->
-                    <!--                            android:layout_marginStart="@dimen/dp_8"-->
-                    <!--                            android:layout_marginTop="@dimen/dp_8"-->
-                    <!--                            android:text="快捷设置"-->
-                    <!--                            android:textColor="@color/white"-->
-                    <!--                            android:textSize="@dimen/sp_17"-->
-                    <!--                            android:textStyle="bold"-->
-                    <!--                            app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                            app:layout_constraintTop_toTopOf="parent" />-->
-
-                    <!--                        <ImageView-->
-                    <!--                            android:layout_width="@dimen/dp_68"-->
-                    <!--                            android:layout_height="@dimen/dp_68"-->
-                    <!--                            android:adjustViewBounds="true"-->
-                    <!--                            android:scaleType="fitCenter"-->
-                    <!--                            android:src="@drawable/home_clinical_hand"-->
-                    <!--                            app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                            app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                            app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                            app:layout_constraintTop_toTopOf="parent" />-->
-
-                    <!--                    </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-                    <!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-                    <!--                android:id="@+id/cl_exit"-->
-                    <!--                android:layout_width="0dp"-->
-                    <!--                android:layout_height="match_parent"-->
-                    <!--                android:layout_marginStart="@dimen/dp_2"-->
-                    <!--                android:layout_marginTop="@dimen/dp_2"-->
-                    <!--                android:layout_marginEnd="@dimen/dp_4"-->
-                    <!--                android:layout_marginBottom="@dimen/dp_4"-->
-                    <!--                android:layout_weight="1"-->
-                    <!--                android:background="@drawable/custom_bg_ai">-->
-
-                    <!--                <TextView-->
-                    <!--                    android:layout_width="wrap_content"-->
-                    <!--                    android:layout_height="wrap_content"-->
-                    <!--                    android:layout_marginStart="@dimen/dp_4"-->
-                    <!--                    android:layout_marginTop="@dimen/dp_4"-->
-                    <!--                    android:text="切换系统"-->
-                    <!--                    android:textColor="@color/title_gray"-->
-                    <!--                    android:textSize="@dimen/sp_15"-->
-                    <!--                    android:textStyle="bold"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-                    <!--                <ImageView-->
-                    <!--                    android:layout_width="@dimen/dp_68"-->
-                    <!--                    android:layout_height="@dimen/dp_68"-->
-                    <!--                    android:adjustViewBounds="true"-->
-                    <!--                    android:scaleType="fitCenter"-->
-                    <!--                    android:src="@drawable/app_exit"-->
-                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-                    <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
                 </LinearLayout>
             </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-land/item_notification.xml

@@ -47,7 +47,7 @@
             android:maxLines="1"
             android:singleLine="true"
             android:text="提醒时间"
-            android:textColor="@color/title_gray"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout-port/activity_contact.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/control_background"
     tools:context=".activity.contact.ContactActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout-port/activity_control.xml

@@ -33,10 +33,21 @@
             android:singleLine="true"
             android:text="返回桌面"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/iv_back"
             app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="控制中心"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:textColor="@color/white" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout

app/src/main/res/layout-port/activity_dailyapp.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/control_background"
     tools:context=".activity.DailyAppActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout-port/fragment_custom.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_margin="@dimen/sp_16">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -56,9 +57,9 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_wifi"
-                android:layout_width="@dimen/dp_150"
+                android:layout_width="@dimen/dp_128"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/cl_activation"
                 app:layout_constraintTop_toTopOf="parent">
@@ -97,6 +98,7 @@
                 android:layout_width="@dimen/dp_68"
                 android:layout_height="wrap_content"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/cl_control"
                 app:layout_constraintStart_toEndOf="@+id/cl_wifi"
                 app:layout_constraintTop_toTopOf="parent">
 
@@ -155,7 +157,7 @@
                     android:maxEms="8"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:text="快捷设置"
+                    android:text="控制中心"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_11"
                     android:visibility="gone"
@@ -216,7 +218,7 @@
                             android:layout_marginStart="@dimen/dp_16"
                             android:layout_marginTop="@dimen/dp_16"
                             android:text="天气预报"
-                            android:textColor="@color/white"
+                            android:textColor="@color/title_gray"
                             android:textSize="@dimen/sp_17"
                             android:textStyle="bold"
                             app:layout_constraintStart_toStartOf="parent"
@@ -229,7 +231,7 @@
                             android:layout_marginEnd="@dimen/dp_48"
                             android:gravity="center_vertical"
                             android:text="10℃"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/sp_38"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -243,7 +245,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_4"
                             android:text="位置"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/sp_18"
                             android:textStyle="bold"
                             app:layout_constraintStart_toStartOf="@+id/tv_temp"
@@ -256,7 +258,7 @@
                             android:layout_marginStart="@dimen/dp_4"
                             android:layout_marginTop="@dimen/dp_4"
                             android:text="天气"
-                            android:textColor="@color/white"
+                            android:textColor="@color/black"
                             android:textSize="@dimen/sp_18"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="@+id/tv_location"
@@ -314,8 +316,8 @@
                             android:layout_height="@dimen/dp_68"
                             android:adjustViewBounds="true"
                             android:scaleType="centerInside"
-                            android:visibility="visible"
                             android:src="@drawable/home_reminder_icon"
+                            android:visibility="visible"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -347,7 +349,7 @@
                             android:layout_marginEnd="@dimen/dp_4"
                             android:layout_marginBottom="@dimen/dp_2"
                             android:layout_weight="1"
-                            android:background="@drawable/custom_bg_alarm">
+                            android:background="@drawable/custom_bg_sos">
 
                             <TextView
                                 android:id="@+id/textView7"
@@ -407,7 +409,7 @@
                             android:layout_marginEnd="@dimen/dp_4"
                             android:layout_marginBottom="@dimen/dp_2"
                             android:layout_weight="1"
-                            android:background="@drawable/custom_bg_alarm"
+                            android:background="@drawable/custom_bg_clean"
                             tools:ignore="NestedWeights">
 
                             <ImageView
@@ -415,8 +417,8 @@
                                 android:layout_height="@dimen/dp_20"
                                 android:layout_marginStart="@dimen/dp_8"
                                 android:layout_marginTop="@dimen/dp_16"
-                                android:visibility="gone"
                                 android:src="@drawable/home_icon_clean"
+                                android:visibility="gone"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -604,7 +606,7 @@
                         android:layout_marginEnd="@dimen/dp_2"
                         android:layout_marginBottom="@dimen/dp_4"
                         android:layout_weight="1"
-                        android:background="@drawable/custom_bg_health">
+                        android:background="@drawable/custom_bg_app">
 
                         <TextView
                             android:id="@+id/tv_app"
@@ -654,49 +656,13 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_contact"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_2"
-                        android:layout_marginTop="@dimen/dp_2"
-                        android:layout_marginEnd="@dimen/dp_2"
-                        android:layout_marginBottom="@dimen/dp_4"
-                        android:layout_weight="1"
-                        android:background="@drawable/custom_bg_alarm">
-
-                        <TextView
-                            android:id="@+id/textView2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_16"
-                            android:text="通讯录"
-                            android:textColor="@color/title_gray"
-                            android:textSize="@dimen/sp_17"
-                            android:textStyle="bold"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <ImageView
-                            android:layout_width="@dimen/dp_52"
-                            android:layout_height="@dimen/dp_52"
-                            android:adjustViewBounds="true"
-                            android:scaleType="fitCenter"
-                            android:src="@drawable/home_contact_icon"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_appstore"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_2"
                         android:layout_marginTop="@dimen/dp_2"
-                        android:layout_marginEnd="@dimen/dp_4"
+                        android:layout_marginEnd="@dimen/dp_2"
                         android:layout_marginBottom="@dimen/dp_4"
                         android:layout_weight="1"
                         android:background="@drawable/custom_bg_ai"
@@ -706,7 +672,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_16"
-                            android:text="应用市场"
+                            android:text="家庭空间"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_17"
                             android:textStyle="bold"
@@ -719,7 +685,7 @@
                             android:layout_height="@dimen/dp_52"
                             android:adjustViewBounds="true"
                             android:scaleType="fitCenter"
-                            android:src="@drawable/systemapp_icon"
+                            android:src="@drawable/icon_family_space"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -732,7 +698,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_2"
                         android:layout_marginTop="@dimen/dp_2"
-                        android:layout_marginEnd="@dimen/dp_4"
+                        android:layout_marginEnd="@dimen/dp_2"
                         android:layout_marginBottom="@dimen/dp_4"
                         android:layout_weight="1"
                         android:background="@drawable/custom_bg_ai"
@@ -763,80 +729,41 @@
                             app:layout_constraintTop_toTopOf="parent" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <!--                        <androidx.constraintlayout.widget.ConstraintLayout-->
+                    <androidx.constraintlayout.widget.ConstraintLayout
-                    <!--                            android:id="@+id/cl_control"-->
+                        android:id="@+id/cl_contact"
-                    <!--                            android:layout_width="match_parent"-->
+                        android:layout_width="0dp"
-                    <!--                            android:layout_height="0dp"-->
+                        android:layout_height="match_parent"
-                    <!--                            android:layout_marginStart="@dimen/dp_2"-->
+                        android:layout_marginStart="@dimen/dp_2"
-                    <!--                            android:layout_marginTop="@dimen/dp_2"-->
+                        android:layout_marginTop="@dimen/dp_2"
-                    <!--                            android:layout_marginEnd="@dimen/dp_4"-->
+                        android:layout_marginEnd="@dimen/dp_4"
-                    <!--                            android:layout_marginBottom="@dimen/dp_4"-->
+                        android:layout_marginBottom="@dimen/dp_4"
-                    <!--                            android:layout_weight="1"-->
+                        android:layout_weight="1"
-                    <!--                            android:background="@drawable/custom_bg_health">-->
+                        android:background="@drawable/custom_bg_contact">
 
-                    <!--                            <TextView-->
+                        <TextView
-                    <!--                                android:id="@+id/textView6"-->
+                            android:id="@+id/textView2"
-                    <!--                                android:layout_width="wrap_content"-->
+                            android:layout_width="wrap_content"
-                    <!--                                android:layout_height="wrap_content"-->
+                            android:layout_height="wrap_content"
-                    <!--                                android:layout_marginBottom="@dimen/dp_16"-->
+                            android:layout_marginTop="@dimen/dp_16"
-                    <!--                                android:text="快捷设置"-->
+                            android:text="通讯录"
-                    <!--                                android:textColor="@color/white"-->
+                            android:textColor="@color/title_gray"
-                    <!--                                android:textSize="@dimen/sp_17"-->
+                            android:textSize="@dimen/sp_17"
-                    <!--                                android:textStyle="bold"-->
+                            android:textStyle="bold"
-                    <!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+                            app:layout_constraintEnd_toEndOf="parent"
-                    <!--                                app:layout_constraintEnd_toEndOf="parent"-->
+                            app:layout_constraintStart_toStartOf="parent"
-                    <!--                                app:layout_constraintStart_toStartOf="parent" />-->
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    <!--                            <ImageView-->
+                        <ImageView
-                    <!--                                android:layout_width="@dimen/dp_52"-->
+                            android:layout_width="@dimen/dp_52"
-                    <!--                                android:layout_height="@dimen/dp_52"-->
+                            android:layout_height="@dimen/dp_52"
-                    <!--                                android:adjustViewBounds="true"-->
+                            android:adjustViewBounds="true"
-                    <!--                                android:scaleType="fitCenter"-->
+                            android:scaleType="fitCenter"
-                    <!--                                android:src="@drawable/home_clinical_hand"-->
+                            android:src="@drawable/home_contact_icon"
-                    <!--                                app:layout_constraintBottom_toBottomOf="parent"-->
+                            app:layout_constraintBottom_toBottomOf="parent"
-                    <!--                                app:layout_constraintEnd_toEndOf="parent"-->
+                            app:layout_constraintEnd_toEndOf="parent"
-                    <!--                                app:layout_constraintStart_toStartOf="parent"-->
+                            app:layout_constraintStart_toStartOf="parent"
-                    <!--                                app:layout_constraintTop_toTopOf="parent" />-->
+                            app:layout_constraintTop_toTopOf="parent" />
-
+                    </androidx.constraintlayout.widget.ConstraintLayout>
-                    <!--                        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-                    <!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-                    <!--                android:id="@+id/cl_exit"-->
-                    <!--                android:layout_width="0dp"-->
-                    <!--                android:layout_height="match_parent"-->
-                    <!--                android:layout_marginStart="@dimen/dp_2"-->
-                    <!--                android:layout_marginTop="@dimen/dp_2"-->
-                    <!--                android:layout_marginEnd="@dimen/dp_4"-->
-                    <!--                android:layout_marginBottom="@dimen/dp_4"-->
-                    <!--                android:layout_weight="1"-->
-                    <!--                android:background="@drawable/custom_bg_health">-->
-
-                    <!--                <TextView-->
-                    <!--                    android:layout_width="wrap_content"-->
-                    <!--                    android:layout_height="wrap_content"-->
-                    <!--                    android:layout_marginStart="@dimen/dp_8"-->
-                    <!--                    android:layout_marginTop="@dimen/dp_8"-->
-                    <!--                    android:layout_marginBottom="@dimen/dp_16"-->
-                    <!--                    android:text="切换系统"-->
-                    <!--                    android:textColor="@color/white"-->
-                    <!--                    android:textSize="@dimen/sp_17"-->
-                    <!--                    android:textStyle="bold"-->
-                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent" />-->
-
-                    <!--                <ImageView-->
-                    <!--                    android:layout_width="@dimen/dp_52"-->
-                    <!--                    android:layout_height="@dimen/dp_52"-->
-                    <!--                    android:adjustViewBounds="true"-->
-                    <!--                    android:scaleType="fitCenter"-->
-                    <!--                    android:src="@drawable/app_exit"-->
-                    <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-                    <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
 
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/values/colors.xml

@@ -20,14 +20,15 @@
     <color name="default_background_color">#8e6afb</color>
 
     <color name="voice_color">#00D56B</color>
-    <color name="weathet_bg_color">#3b6ab9</color>
+    <color name="weathet_bg_color">#ffffff</color>
     <color name="health_bg_color">#ecfafd</color>
-    <color name="alarm_bg_color">#e1e5fa</color>
+    <color name="alarm_bg_color">#ffeeee</color>
-    <color name="sos_bg_color">#fadfdf</color>
+    <color name="sos_bg_color">#e1e1ff</color>
-    <color name="clean_bg_color">#e0fbf3</color>
+    <color name="clean_bg_color">#d8fdfd</color>
     <color name="guard_bg_color">#e08c61</color>
-    <color name="contact_bg_color">#e8eafc</color>
+    <color name="contact_bg_color">#47e08e</color>
     <color name="appstore_bg_color">#fcf3e7</color>
+    <color name="app_bg_color">#fdf6dc</color>
 
     <color name="noti_color">#eae8e8</color>
     <color name="noti_font_color">#bbbaba</color>