diff --git a/app/build.gradle b/app/build.gradle
index aac9c21..1515613 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.uiui.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 38
-        versionName "4.7"
+        versionCode 40
+        versionName "4.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java
index d9753f1..b04f28a 100644
--- a/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java
+++ b/app/src/main/java/com/uiui/aios/fragment/CustomFragment.java
@@ -94,7 +94,7 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
 
     @BindView(R.id.cl_weather)
     ConstraintLayout cl_weather;
-    @BindView(R.id.cl_shared_space)
+    @BindView(R.id.cl_clean)
     ConstraintLayout cl_shared_space;
     @BindView(R.id.cl_sos)
     ConstraintLayout cl_soso;
@@ -117,6 +117,8 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
 //    TextView tv_battery;
     @BindView(R.id.tv_location)
     TextView tv_location;
+    @BindView(R.id.tv_weather)
+    TextView tv_weather;
     @BindView(R.id.iv_pic)
     ImageView iv_pic;
     @BindView(R.id.tv_temp)
@@ -139,12 +141,12 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
     ImageView iv_note_nodata;
     //    @BindView(R.id.iv_head)
 //    ImageView iv_head;
-    @BindView(R.id.tv_name)
-    TextView tv_name;
+//    @BindView(R.id.tv_name)
+//    TextView tv_name;
 
     private String TAG = CustomFragment.class.getSimpleName();
     //    private int[] mShaderColors = new int[]{0xFFfa3db5, 0xFFF8867E, 0xFFF79F6B, 0xFFF79F6B, 0xFFF79F6B, 0xFFF8867E, 0xFFfa3db5};
-    private int[] mShaderColors = new int[]{0xFF3984f6, 0xFF3984f6, 0xFF3984f6, 0xFF3984f6, 0xFF3984f6, 0xFF3984f6, 0xFF3984f6};
+    private int[] mShaderColors = new int[]{0xFF27602f, 0xFF27602f, 0xFF27602f, 0xFF27602f, 0xFF27602f, 0xFF27602f, 0xFF27602f};
     private int[] mShaderColorsRed = new int[]{0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000, 0xFFFF0000};
     private View rootView;
     private List<AlarmItem> alarmItemList;
@@ -776,6 +778,7 @@ public class CustomFragment extends Fragment implements NetworkUtils.OnNetworkSt
 //                    int resId = getResources().getIdentifier(imageName, "drawable", mContext.getPackageName());
 //                    iv_pic.setImageDrawable(mContext.getDrawable(resId));
                     tv_temp.setText(now.getTemp() + "℃");
+                    tv_weather.setText(now.getText());
                 } else {
                     //在此查看返回数据失败的原因
                     Code code = weatherBean.getCode();
diff --git a/app/src/main/res/drawable-hdpi/appstore_icon.png b/app/src/main/res/drawable-hdpi/appstore_icon.png
deleted file mode 100644
index b761f60..0000000
Binary files a/app/src/main/res/drawable-hdpi/appstore_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/contact_icon.png b/app/src/main/res/drawable-hdpi/contact_icon.png
deleted file mode 100644
index 759569e..0000000
Binary files a/app/src/main/res/drawable-hdpi/contact_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/health_code.png b/app/src/main/res/drawable-hdpi/health_code.png
deleted file mode 100644
index f27a8bd..0000000
Binary files a/app/src/main/res/drawable-hdpi/health_code.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/home_appstore_icon.png b/app/src/main/res/drawable-hdpi/home_appstore_icon.png
new file mode 100644
index 0000000..69cc9c8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_appstore_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_clean_icon.png b/app/src/main/res/drawable-hdpi/home_clean_icon.png
new file mode 100644
index 0000000..8d6e541
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_clean_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_contact_icon.png b/app/src/main/res/drawable-hdpi/home_contact_icon.png
new file mode 100644
index 0000000..784bc19
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_contact_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_health_code.png b/app/src/main/res/drawable-hdpi/home_health_code.png
new file mode 100644
index 0000000..df8ba69
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_health_code.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_reminder_icon.png b/app/src/main/res/drawable-hdpi/home_reminder_icon.png
new file mode 100644
index 0000000..d7ef6f0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_reminder_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_sos_icon.png b/app/src/main/res/drawable-hdpi/home_sos_icon.png
new file mode 100644
index 0000000..4d0f991
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/home_sos_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/sos_icon.png b/app/src/main/res/drawable-hdpi/sos_icon.png
deleted file mode 100644
index e44e6c2..0000000
Binary files a/app/src/main/res/drawable-hdpi/sos_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable/custom_background.xml b/app/src/main/res/drawable/custom_bg.xml
similarity index 100%
rename from app/src/main/res/drawable/custom_background.xml
rename to app/src/main/res/drawable/custom_bg.xml
diff --git a/app/src/main/res/drawable/custom_bg_ai.xml b/app/src/main/res/drawable/custom_bg_ai.xml
new file mode 100644
index 0000000..7e885b0
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_ai.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/appstore_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_clean.xml b/app/src/main/res/drawable/custom_bg_clean.xml
new file mode 100644
index 0000000..8fd9491
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_clean.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/clean_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_contact.xml b/app/src/main/res/drawable/custom_bg_contact.xml
new file mode 100644
index 0000000..4983222
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_contact.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/contact_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_guard.xml b/app/src/main/res/drawable/custom_bg_guard.xml
new file mode 100644
index 0000000..cb53167
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_guard.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/guard_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_health.xml b/app/src/main/res/drawable/custom_bg_health.xml
new file mode 100644
index 0000000..0bfd56f
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_health.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/health_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_sos.xml b/app/src/main/res/drawable/custom_bg_sos.xml
new file mode 100644
index 0000000..d9a8d07
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_sos.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/sos_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_bg_weather.xml b/app/src/main/res/drawable/custom_bg_weather.xml
new file mode 100644
index 0000000..217e796
--- /dev/null
+++ b/app/src/main/res/drawable/custom_bg_weather.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/weathet_bg_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tv_bg_noti.xml b/app/src/main/res/drawable/tv_bg_noti.xml
new file mode 100644
index 0000000..755f4dd
--- /dev/null
+++ b/app/src/main/res/drawable/tv_bg_noti.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 内部颜色 -->
+    <solid android:color="@color/noti_color" />
+    <!-- 圆角的幅度 -->
+    <corners
+        android:bottomLeftRadius="24dp"
+        android:bottomRightRadius="24dp"
+        android:topLeftRadius="24dp"
+        android:topRightRadius="24dp" />
+
+    <padding
+        android:bottom="4dp"
+        android:left="20dp"
+        android:right="20dp"
+        android:top="4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml
index 6ce2ae4..6bf77c8 100644
--- a/app/src/main/res/layout-land/fragment_custom.xml
+++ b/app/src/main/res/layout-land/fragment_custom.xml
@@ -25,7 +25,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="3"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_weather">
 
                 <ImageView
                     android:id="@+id/iv_pic"
@@ -45,8 +45,8 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="天气预报"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -58,8 +58,8 @@
                     android:layout_marginStart="16dp"
                     android:gravity="center_vertical"
                     android:text="10℃"
-                    android:textColor="@color/black"
-                    android:textSize="40sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_30"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
                     app:layout_constraintStart_toEndOf="@+id/iv_pic"
@@ -72,14 +72,28 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:text="位置"
-                    android:textColor="@color/black"
+                    android:textSize="@dimen/sp_16"
+                    android:textColor="@color/white"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="@+id/tv_temp"
                     app:layout_constraintTop_toBottomOf="@+id/tv_temp" />
+
+                <TextView
+                    android:id="@+id/tv_weather"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_4"
+                    android:text="天气"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_location"
+                    app:layout_constraintStart_toEndOf="@+id/tv_location"
+                    app:layout_constraintTop_toTopOf="@+id/tv_location" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_shared_space"
+                android:id="@+id/cl_clean"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginStart="4dp"
@@ -87,7 +101,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="3"
-                android:background="@drawable/custom_background"
+                android:background="@drawable/custom_bg_clean"
                 tools:ignore="NestedWeights">
 
                 <TextView
@@ -97,23 +111,23 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="一键加速"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <!--                <ImageView-->
-                <!--                    android:id="@+id/iv_head"-->
-                <!--                    android:layout_width="100dp"-->
-                <!--                    android:layout_height="100dp"-->
-                <!--                    android:adjustViewBounds="true"-->
-                <!--                    android:scaleType="fitCenter"-->
-                <!--                    android:src="@drawable/gallery_icon"-->
-                <!--                    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_head"-->
+<!--                    android:layout_width="@dimen/dp_68"-->
+<!--                    android:layout_height="@dimen/dp_68"-->
+<!--                    android:adjustViewBounds="true"-->
+<!--                    android:scaleType="fitCenter"-->
+<!--                    android:src="@drawable/home_clean_icon"-->
+<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                    app:layout_constraintEnd_toEndOf="parent"-->
+<!--                    app:layout_constraintStart_toStartOf="parent"-->
+<!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
                 <com.king.view.circleprogressview.CircleProgressView
                     android:id="@+id/cpv"
@@ -121,9 +135,11 @@
                     android:layout_height="144dp"
                     app:cpvDuration="1000"
                     app:cpvLabelTextSize="26sp"
-                    app:cpvNormalColor="#D8D6D7"
+                    app:cpvProgressColor="#27602f"
+                    app:cpvLabelTextColor="@color/white"
+                    app:cpvNormalColor="#c1d4c4"
                     app:cpvShowTick="false"
-                    app:cpvStrokeWidth="20dp"
+                    app:cpvStrokeWidth="@dimen/dp_8"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -140,7 +156,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="2"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_sos">
 
                 <TextView
                     android:id="@+id/textView7"
@@ -149,19 +165,19 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="紧急呼叫"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
                     android:id="@+id/iv_sos"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
                     android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/sos_icon"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/home_sos_icon"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -191,7 +207,7 @@
             <!--                android:layout_height="match_parent"-->
             <!--                android:layout_margin="8dp"-->
             <!--                android:layout_weight="1"-->
-            <!--                android:background="@drawable/custom_background"-->
+            <!--                android:background="@drawable/custom_bg"-->
             <!--                tools:ignore="NestedWeights">-->
 
             <!--                <TextView-->
@@ -201,8 +217,8 @@
             <!--                    android:layout_marginStart="8dp"-->
             <!--                    android:layout_marginTop="8dp"-->
             <!--                    android:text="我的闹钟"-->
-            <!--                    android:textColor="@color/black"-->
-            <!--                    android:textSize="20sp"-->
+            <!--                    android:textColor="@color/white"-->
+            <!--                    android:textSize="@dimen/sp_16"-->
             <!--                    android:textStyle="bold"-->
             <!--                    app:layout_constraintStart_toStartOf="parent"-->
             <!--                    app:layout_constraintTop_toTopOf="parent" />-->
@@ -242,7 +258,7 @@
                 android:layout_marginBottom="8dp"
 
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_guard">
 
                 <TextView
                     android:id="@+id/textView4"
@@ -251,8 +267,8 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="爱心提醒"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -263,7 +279,7 @@
                     android:layout_height="150dp"
                     android:adjustViewBounds="true"
                     android:scaleType="centerInside"
-                    android:src="@drawable/note_nodata"
+                    android:src="@drawable/home_reminder_icon"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -289,7 +305,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_health">
 
                 <TextView
                     android:id="@+id/textView"
@@ -298,19 +314,19 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="健康码"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
                     android:id="@+id/iv_health"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/health_code"
+                    android:src="@drawable/home_health_code"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -321,7 +337,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_2"
-                    android:textColor="@color/black"
+                    android:textColor="@color/white"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="@+id/iv_health"
                     app:layout_constraintStart_toStartOf="@+id/iv_health"
@@ -338,7 +354,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_contact">
 
                 <TextView
                     android:id="@+id/textView2"
@@ -347,18 +363,18 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="通讯录"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/contact_icon"
+                    android:src="@drawable/home_contact_icon"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -374,7 +390,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background"
+                android:background="@drawable/custom_bg_ai"
                 android:visibility="gone">
 
                 <TextView
@@ -383,18 +399,18 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="应用市场"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/appstore_icon"
+                    android:src="@drawable/home_appstore_icon"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -410,7 +426,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_ai">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -418,15 +434,15 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
                     android:text="AI问诊"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_68"
+                    android:layout_height="@dimen/dp_68"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
                     android:src="@drawable/home_clinical_hand"
diff --git a/app/src/main/res/layout-land/fragment_custom_back.xml b/app/src/main/res/layout-land/fragment_custom_back.xml
index a23ea7a..fd9325d 100644
--- a/app/src/main/res/layout-land/fragment_custom_back.xml
+++ b/app/src/main/res/layout-land/fragment_custom_back.xml
@@ -24,7 +24,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="3"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <ImageView
                     android:id="@+id/iv_pic"
@@ -83,7 +83,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="3"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:id="@+id/textView4"
@@ -126,7 +126,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="2"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:id="@+id/textView7"
@@ -147,7 +147,7 @@
                     android:layout_height="100dp"
                     android:adjustViewBounds="true"
                     android:scaleType="centerInside"
-                    android:src="@drawable/sos_icon"
+                    android:src="@drawable/home_sos_icon"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -177,7 +177,7 @@
             <!--                android:layout_height="match_parent"-->
             <!--                android:layout_margin="8dp"-->
             <!--                android:layout_weight="1"-->
-            <!--                android:background="@drawable/custom_background"-->
+            <!--                android:background="@drawable/custom_bg"-->
             <!--                tools:ignore="NestedWeights">-->
 
             <!--                <TextView-->
@@ -220,12 +220,12 @@
 
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_shared_space"
+                android:id="@+id/cl_clean"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background"
+                android:background="@drawable/custom_bg"
                 tools:ignore="NestedWeights">
 
                 <TextView
@@ -246,7 +246,7 @@
                     android:layout_height="100dp"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/health_code"
+                    android:src="@drawable/home_health_code"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -259,7 +259,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:id="@+id/textView"
@@ -354,7 +354,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <com.king.view.circleprogressview.CircleProgressView
                     android:id="@+id/cpv"
@@ -390,7 +390,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout-land/fragment_second.xml b/app/src/main/res/layout-land/fragment_second.xml
index fa04543..864d397 100644
--- a/app/src/main/res/layout-land/fragment_second.xml
+++ b/app/src/main/res/layout-land/fragment_second.xml
@@ -24,7 +24,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:id="@+id/textView9"
@@ -186,7 +186,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:id="@+id/textView13"
@@ -275,7 +275,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -489,7 +489,7 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="8dp"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background"
+                android:background="@drawable/custom_bg"
                 android:visibility="gone">
 
                 <ImageView
diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml
index bbc2451..a535d1c 100644
--- a/app/src/main/res/layout-port/fragment_custom.xml
+++ b/app/src/main/res/layout-port/fragment_custom.xml
@@ -12,7 +12,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:orientation="horizontal">
 
@@ -20,33 +20,34 @@
                 android:id="@+id/cl_weather"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginStart="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginEnd="@dimen/dp_4"
+                android:layout_marginBottom="@dimen/dp_2"
                 android:layout_weight="3"
-                android:background="@drawable/custom_background">
+                android:background="@drawable/custom_bg_weather">
 
                 <ImageView
                     android:id="@+id/iv_pic"
-                    android:layout_width="180dp"
-                    android:layout_height="180dp"
+                    android:layout_width="@dimen/dp_100"
+                    android:layout_height="@dimen/dp_100"
                     android:adjustViewBounds="true"
+                    android:layout_marginEnd="@dimen/dp_16"
                     android:scaleType="centerCrop"
                     android:src="@drawable/he100"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_temp"
                     app:layout_constraintTop_toBottomOf="@+id/textView3" />
 
                 <TextView
                     android:id="@+id/textView3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_16"
                     android:text="天气预报"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_17"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -55,221 +56,320 @@
                     android:id="@+id/tv_temp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="88dp"
                     android:gravity="center_vertical"
                     android:text="10℃"
-                    android:textColor="@color/black"
-                    android:textSize="40sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_38"
                     android:textStyle="bold"
-                    app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
-                    app:layout_constraintStart_toEndOf="@+id/iv_pic"
-                    app:layout_constraintTop_toTopOf="@+id/iv_pic"
-                    app:layout_constraintVertical_bias="0.296" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_location"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="@dimen/dp_4"
                     android:text="位置"
-                    android:textColor="@color/black"
+                    android:textSize="@dimen/sp_18"
+                    android:textColor="@color/white"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="@+id/tv_temp"
                     app:layout_constraintTop_toBottomOf="@+id/tv_temp" />
+
+                <TextView
+                    android:id="@+id/tv_weather"
+                    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/white"
+                    android:textSize="@dimen/sp_18"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_location"
+                    app:layout_constraintStart_toEndOf="@+id/tv_location"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_temp" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:orientation="horizontal">
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_shared_space"
+                android:id="@+id/cl_health"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginStart="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_2"
+                android:layout_marginEnd="@dimen/dp_2"
+                android:layout_marginBottom="@dimen/dp_2"
                 android:layout_weight="1"
-                android:background="@drawable/custom_background"
-                tools:ignore="NestedWeights">
+                android:background="@drawable/custom_bg_health">
 
                 <TextView
-                    android:id="@+id/textView5"
+                    android:id="@+id/textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:text="一键加速"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_20"
+                    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:id="@+id/iv_head"-->
-                <!--                    android:layout_width="100dp"-->
-                <!--                    android:layout_height="100dp"-->
-                <!--                    android:adjustViewBounds="true"-->
-                <!--                    android:scaleType="fitCenter"-->
-                <!--                    android:src="@drawable/gallery_icon"-->
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="绿码同行更畅快"
+                    android:layout_marginTop="@dimen/dp_2"
+                    android:textColor="@color/white"
+                    app:layout_constraintStart_toStartOf="@+id/textView"
+                    app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+                <ImageView
+                    android:id="@+id/iv_health"
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/home_health_code"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.6" />
+
+
+                <!--                <TextView-->
+<!--                    android:id="@+id/tv_name"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="@dimen/dp_2"-->
+<!--                    android:textColor="@color/black"-->
+<!--                    android:textStyle="bold"-->
+<!--                    app:layout_constraintEnd_toEndOf="@+id/iv_health"-->
+<!--                    app:layout_constraintStart_toStartOf="@+id/iv_health"-->
+<!--                    app:layout_constraintTop_toBottomOf="@+id/iv_health" />-->
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_sos"
+                    android:layout_width="match_parent"
+                    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_2"
+                    android:layout_weight="1"
+                    android:background="@drawable/custom_bg_sos">
+
+                    <TextView
+                        android:id="@+id/textView7"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_8"
+                        android:text="紧急呼叫"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_17"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.286" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="危险请按我"
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:textColor="@color/white"
+                        app:layout_constraintStart_toStartOf="@+id/textView7"
+                        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+
+                    <ImageView
+                        android:id="@+id/iv_sos"
+                        android:layout_width="@dimen/dp_52"
+                        android:layout_height="@dimen/dp_52"
+                        android:layout_marginEnd="@dimen/dp_16"
+                        android:adjustViewBounds="true"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/home_sos_icon"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_sos"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_clean"
+                    android:layout_width="match_parent"
+                    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_2"
+                    android:layout_weight="1"
+                    android:background="@drawable/custom_bg_clean"
+                    tools:ignore="NestedWeights">
+
+                    <TextView
+                        android:id="@+id/textView5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_8"
+                        android:text="一键加速"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_17"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.286" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:text="卡顿就按我"
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:textColor="@color/white"
+                        app:layout_constraintStart_toStartOf="@+id/textView5"
+                        app:layout_constraintTop_toBottomOf="@+id/textView5" />
+
+<!--                    <ImageView-->
+<!--                        android:id="@+id/iv_head"-->
+<!--                        android:layout_width="@dimen/dp_52"-->
+<!--                        android:layout_height="@dimen/dp_52"-->
+<!--                        android:layout_marginEnd="24dp"-->
+<!--                        android:adjustViewBounds="true"-->
+<!--                        android:scaleType="fitCenter"-->
+<!--                        android:src="@drawable/home_clean_icon"-->
+<!--                        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                        app:layout_constraintEnd_toEndOf="parent"-->
+<!--                        app:layout_constraintTop_toTopOf="parent" />-->
+
+                    <com.king.view.circleprogressview.CircleProgressView
+                        android:id="@+id/cpv"
+                        android:layout_width="@dimen/dp_64"
+                        android:layout_height="@dimen/dp_64"
+                        android:layout_marginEnd="@dimen/dp_8"
+                        app:cpvDuration="1000"
+                        app:cpvLabelTextSize="26sp"
+                        app:cpvLabelTextColor="@color/white"
+                        app:cpvProgressColor="#27602f"
+                        app:cpvNormalColor="#c1d4c4"
+                        app:cpvShowTick="false"
+                        app:cpvStrokeWidth="@dimen/dp_4"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                <!--            <androidx.constraintlayout.widget.ConstraintLayout-->
+                <!--                android:id="@+id/cl_alarm"-->
+                <!--                android:layout_width="0dp"-->
+                <!--                android:layout_height="match_parent"-->
+                <!--                android:layout_margin="@dimen/dp_8"-->
+                <!--                android:layout_weight="1"-->
+                <!--                android:background="@drawable/custom_bg"-->
+                <!--                tools:ignore="NestedWeights">-->
+
+                <!--                <TextView-->
+                <!--                    android:id="@+id/textView5"-->
+                <!--                    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/black"-->
+                <!--                    android:textSize="@dimen/sp_17"-->
+                <!--                    android:textStyle="bold"-->
+                <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
+
+                <!--                <TextView-->
+                <!--                    android:id="@+id/tv_add"-->
+                <!--                    android:layout_width="wrap_content"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:background="@drawable/tv_background"-->
+                <!--                    android:gravity="center_horizontal"-->
+                <!--                    android:text="添加闹钟"-->
+                <!--                    android:textColor="@color/white"-->
+                <!--                    android:textSize="15sp"-->
                 <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
                 <!--                    app:layout_constraintEnd_toEndOf="parent"-->
                 <!--                    app:layout_constraintStart_toStartOf="parent"-->
                 <!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
-                <com.king.view.circleprogressview.CircleProgressView
-                    android:id="@+id/cpv"
-                    android:layout_width="144dp"
-                    android:layout_height="144dp"
-                    app:cpvDuration="1000"
-                    app:cpvLabelTextSize="26sp"
-                    app:cpvNormalColor="#D8D6D7"
-                    app:cpvShowTick="false"
-                    app:cpvStrokeWidth="20dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                <!--                <androidx.recyclerview.widget.RecyclerView-->
+                <!--                    android:id="@+id/rv_clock"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="wrap_content"-->
+                <!--                    android:overScrollMode="never"-->
+                <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--                    app:layout_constraintEnd_toEndOf="parent"-->
+                <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                <!--                    app:layout_constraintTop_toBottomOf="@+id/textView5" />-->
+                <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_sos"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:background="@drawable/custom_background">
 
-                <TextView
-                    android:id="@+id/textView7"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:text="紧急呼叫"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/iv_sos"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/sos_icon"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_sos"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView7" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:orientation="horizontal">
 
-            <!--            <androidx.constraintlayout.widget.ConstraintLayout-->
-            <!--                android:id="@+id/cl_alarm"-->
-            <!--                android:layout_width="0dp"-->
-            <!--                android:layout_height="match_parent"-->
-            <!--                android:layout_margin="8dp"-->
-            <!--                android:layout_weight="1"-->
-            <!--                android:background="@drawable/custom_background"-->
-            <!--                tools:ignore="NestedWeights">-->
-
-            <!--                <TextView-->
-            <!--                    android:id="@+id/textView5"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:layout_marginStart="8dp"-->
-            <!--                    android:layout_marginTop="8dp"-->
-            <!--                    android:text="我的闹钟"-->
-            <!--                    android:textColor="@color/black"-->
-            <!--                    android:textSize="20sp"-->
-            <!--                    android:textStyle="bold"-->
-            <!--                    app:layout_constraintStart_toStartOf="parent"-->
-            <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-            <!--                <TextView-->
-            <!--                    android:id="@+id/tv_add"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:background="@drawable/tv_background"-->
-            <!--                    android:gravity="center_horizontal"-->
-            <!--                    android:text="添加闹钟"-->
-            <!--                    android:textColor="@color/white"-->
-            <!--                    android:textSize="15sp"-->
-            <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-            <!--                    app:layout_constraintStart_toStartOf="parent"-->
-            <!--                    app:layout_constraintTop_toTopOf="parent" />-->
-
-            <!--                <androidx.recyclerview.widget.RecyclerView-->
-            <!--                    android:id="@+id/rv_clock"-->
-            <!--                    android:layout_width="match_parent"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:overScrollMode="never"-->
-            <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-            <!--                    app:layout_constraintStart_toStartOf="parent"-->
-            <!--                    app:layout_constraintTop_toBottomOf="@+id/textView5" />-->
-            <!--            </androidx.constraintlayout.widget.ConstraintLayout>-->
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_guard"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_marginBottom="4dp"
-
+                android:layout_marginStart="@dimen/dp_4"
+                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_background">
-
-                <TextView
-                    android:id="@+id/textView4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:text="爱心提醒"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                android:background="@drawable/custom_bg_guard">
 
                 <ImageView
                     android:id="@+id/iv_note_nodata"
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
                     android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/note_nodata"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/home_reminder_icon"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -282,96 +382,54 @@
                     android:layout_height="wrap_content"
                     android:overScrollMode="never"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView4" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_health"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:background="@drawable/custom_background">
-
-                <TextView
-                    android:id="@+id/textView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:text="健康码"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <ImageView
-                    android:id="@+id/iv_health"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:adjustViewBounds="true"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/health_code"
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    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"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_2"
-                    android:textColor="@color/black"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="@+id/iv_health"
-                    app:layout_constraintStart_toStartOf="@+id/iv_health"
-                    app:layout_constraintTop_toBottomOf="@+id/iv_health" />
-
+                    app:layout_constraintStart_toStartOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_contact"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_marginBottom="8dp"
+                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_background">
+                android:background="@drawable/custom_bg_contact">
 
                 <TextView
                     android:id="@+id/textView2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginBottom="@dimen/dp_16"
                     android:text="通讯录"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_17"
                     android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/contact_icon"
+                    android:src="@drawable/home_contact_icon"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -382,65 +440,68 @@
                 android:id="@+id/cl_appstore"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
+                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_background"
+                android:background="@drawable/custom_bg_ai"
                 android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginBottom="@dimen/dp_16"
                     android:text="应用市场"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_17"
                     android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/appstore_icon"
+                    android:src="@drawable/home_appstore_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="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
+                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_background">
+                android:background="@drawable/custom_bg_ai">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginBottom="@dimen/dp_16"
                     android:text="AI问诊"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_17"
                     android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dp_52"
+                    android:layout_height="@dimen/dp_52"
                     android:adjustViewBounds="true"
                     android:scaleType="fitCenter"
                     android:src="@drawable/home_clinical_hand"
diff --git a/app/src/main/res/layout-port/fragment_second.xml b/app/src/main/res/layout-port/fragment_second.xml
index 6015be7..93f82b2 100644
--- a/app/src/main/res/layout-port/fragment_second.xml
+++ b/app/src/main/res/layout-port/fragment_second.xml
@@ -19,7 +19,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:layout_weight="3"
-            android:background="@drawable/custom_background">
+            android:background="@drawable/custom_bg">
 
             <TextView
                 android:id="@+id/textView9"
@@ -174,7 +174,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:layout_weight="1"
-            android:background="@drawable/custom_background">
+            android:background="@drawable/custom_bg">
 
             <TextView
                 android:id="@+id/textView13"
@@ -263,7 +263,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
             android:layout_weight="2"
-            android:background="@drawable/custom_background">
+            android:background="@drawable/custom_bg">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -478,7 +478,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
             android:layout_weight="1"
-            android:background="@drawable/custom_background"
+            android:background="@drawable/custom_bg"
             android:visibility="gone">
 
             <ImageView
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index d262ad6..afdaf03 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -30,7 +30,7 @@
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/tv_background"
+            android:background="@drawable/tv_bg_noti"
             android:maxLines="1"
             android:singleLine="true"
             android:text="提醒时间"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 8834ccf..b924a46 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 8834ccf..b924a46 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 8834ccf..b924a46 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 8834ccf..b924a46 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 8834ccf..b924a46 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1fdada..100d2b3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,4 +19,14 @@
     <color name="default_background_color">#8e6afb</color>
 
     <color name="voice_color">#00D56B</color>
+    <color name="weathet_bg_color">#3b6ab9</color>
+    <color name="health_bg_color">#2a886c</color>
+    <color name="sos_bg_color">#b25353</color>
+    <color name="clean_bg_color">#3f8f4b</color>
+    <color name="guard_bg_color">#e08c61</color>
+    <color name="contact_bg_color">#536fae</color>
+    <color name="appstore_bg_color">#2c77ba</color>
+
+    <color name="noti_color">#f4bea3</color>
+
 </resources>