From 9c2f01d215fa2c78bbb82dfd237f063745371477 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Tue, 9 Jan 2024 09:26:45 +0800
Subject: [PATCH] =?UTF-8?q?version:1.7.2=20fix:=20update:=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 .../com/uiui/zyos/activity/ExitActivity.java  |   3 +-
 .../main/res/layout-land/activity_exit.xml    | 236 ++++++++++++++++++
 .../main/res/layout-land/fragment_chinese.xml |   8 +-
 .../main/res/layout-land/fragment_complex.xml |   6 +-
 .../main/res/layout-land/fragment_math.xml    |   7 +-
 .../main/res/layout-land/fragment_user.xml    |   3 +-
 .../main/res/layout-sw800dp/activity_exit.xml | 236 ++++++++++++++++++
 .../res/layout-sw800dp/fragment_chinese.xml   | 137 ++--------
 .../res/layout-sw800dp/fragment_complex.xml   | 130 ++--------
 .../main/res/layout-sw800dp/fragment_math.xml | 136 ++--------
 .../main/res/layout-sw800dp/fragment_user.xml |   7 +-
 app/src/main/res/layout/activity_exit.xml     |   3 +-
 app/src/main/res/layout/activity_notice.xml   |   1 -
 app/src/main/res/layout/activity_passwd.xml   |   1 +
 15 files changed, 564 insertions(+), 354 deletions(-)
 create mode 100644 app/src/main/res/layout-land/activity_exit.xml
 create mode 100644 app/src/main/res/layout-sw800dp/activity_exit.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8f062fc..5f253ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 63
-        versionName "1.7.1"
+        versionCode 64
+        versionName "1.7.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java b/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
index ea20116..5f7c1d7 100644
--- a/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
@@ -26,7 +26,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class ExitActivity extends BaseActivity {
-
     private static final String TAG = ExitActivity.class.getSimpleName();
 
     @BindView(R.id.bt_0)
@@ -174,7 +173,7 @@ public class ExitActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (soundPool!=null) {
+        if (soundPool != null) {
             soundPool.release();
             soundPool = null;
         }
diff --git a/app/src/main/res/layout-land/activity_exit.xml b/app/src/main/res/layout-land/activity_exit.xml
new file mode 100644
index 0000000..41756d9
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_exit.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/control_background"
+    tools:context=".activity.ExitActivity">
+
+    <ImageView
+        android:id="@+id/imageView5"
+        android:layout_width="@dimen/dp_20"
+        android:layout_height="@dimen/dp_20"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/icon_lock"
+        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.03" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
+        app:layout_constraintTop_toBottomOf="@+id/imageView5"
+        app:layout_constraintVertical_bias="0.347"
+        tools:layout_editor_absoluteX="0dp">
+
+        <com.tuo.customview.VerificationCodeView
+            android:id="@+id/icv"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/sp_26"
+            android:layout_centerHorizontal="true"
+            app:icv_et_bg_focus="@color/transparent"
+            app:icv_et_bg_normal="@color/transparent"
+            app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
+            app:icv_et_number="6"
+            app:icv_et_pwd="true"
+            app:icv_et_pwd_radius="@dimen/dp_4"
+            app:icv_et_text_color="@color/transparent"
+            app:icv_et_width="@dimen/sp_32"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_11"
+            app:layout_constraintEnd_toEndOf="@+id/icv"
+            app:layout_constraintStart_toStartOf="@+id/icv"
+            app:layout_constraintTop_toBottomOf="@+id/icv" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_48"
+            android:layout_marginEnd="@dimen/dp_48"
+            android:gravity="center"
+            android:maxLines="2"
+            android:minLines="2"
+            android:text="退出系统"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_keyboard"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_160"
+        android:orientation="vertical"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="1"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="2"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="3"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_4"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="4"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_5"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="5"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_6"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="6"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_7"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="7"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_8"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="8"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_9"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="9"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_0"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_del"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="清除"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/bt_confirm"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="确认"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/fragment_chinese.xml b/app/src/main/res/layout-land/fragment_chinese.xml
index 38e3800..bbcc69e 100644
--- a/app/src/main/res/layout-land/fragment_chinese.xml
+++ b/app/src/main/res/layout-land/fragment_chinese.xml
@@ -16,8 +16,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_bias="0.35"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
@@ -111,17 +111,17 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/dp_4"
                                 android:text="查看更多…"
-                                android:visibility="gone"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/sp_7"
+                                android:visibility="gone"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
-                                android:layout_marginBottom="@dimen/dp_8"
                                 android:layout_marginTop="@dimen/dp_8"
+                                android:layout_marginBottom="@dimen/dp_8"
                                 android:orientation="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintTop_toBottomOf="@+id/tv_more_app"
diff --git a/app/src/main/res/layout-land/fragment_complex.xml b/app/src/main/res/layout-land/fragment_complex.xml
index 6d4a89e..fc83ba5 100644
--- a/app/src/main/res/layout-land/fragment_complex.xml
+++ b/app/src/main/res/layout-land/fragment_complex.xml
@@ -15,9 +15,9 @@
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintVertical_bias="0.35"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout6"
@@ -52,8 +52,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_16"
-                        android:layout_marginBottom="@dimen/dp_16"
                         android:layout_marginEnd="@dimen/dp_16"
+                        android:layout_marginBottom="@dimen/dp_16"
                         android:orientation="horizontal">
 
                         <LinearLayout
diff --git a/app/src/main/res/layout-land/fragment_math.xml b/app/src/main/res/layout-land/fragment_math.xml
index 1058cfe..b1706b8 100644
--- a/app/src/main/res/layout-land/fragment_math.xml
+++ b/app/src/main/res/layout-land/fragment_math.xml
@@ -13,11 +13,11 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintVertical_bias="0.35"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
@@ -99,8 +99,7 @@
                                 android:layout_marginBottom="@dimen/dp_8"
                                 android:orientation="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                              >
+                                app:layout_constraintTop_toTopOf="parent">
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-land/fragment_user.xml b/app/src/main/res/layout-land/fragment_user.xml
index 383b62e..d1c594b 100644
--- a/app/src/main/res/layout-land/fragment_user.xml
+++ b/app/src/main/res/layout-land/fragment_user.xml
@@ -172,6 +172,7 @@
                             android:text="小程序绑定"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_6"
+                            android:visibility="gone"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -343,7 +344,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_10"
                             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw800dp/activity_exit.xml b/app/src/main/res/layout-sw800dp/activity_exit.xml
new file mode 100644
index 0000000..41756d9
--- /dev/null
+++ b/app/src/main/res/layout-sw800dp/activity_exit.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/control_background"
+    tools:context=".activity.ExitActivity">
+
+    <ImageView
+        android:id="@+id/imageView5"
+        android:layout_width="@dimen/dp_20"
+        android:layout_height="@dimen/dp_20"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/icon_lock"
+        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.03" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
+        app:layout_constraintTop_toBottomOf="@+id/imageView5"
+        app:layout_constraintVertical_bias="0.347"
+        tools:layout_editor_absoluteX="0dp">
+
+        <com.tuo.customview.VerificationCodeView
+            android:id="@+id/icv"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/sp_26"
+            android:layout_centerHorizontal="true"
+            app:icv_et_bg_focus="@color/transparent"
+            app:icv_et_bg_normal="@color/transparent"
+            app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
+            app:icv_et_number="6"
+            app:icv_et_pwd="true"
+            app:icv_et_pwd_radius="@dimen/dp_4"
+            app:icv_et_text_color="@color/transparent"
+            app:icv_et_width="@dimen/sp_32"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_11"
+            app:layout_constraintEnd_toEndOf="@+id/icv"
+            app:layout_constraintStart_toStartOf="@+id/icv"
+            app:layout_constraintTop_toBottomOf="@+id/icv" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_48"
+            android:layout_marginEnd="@dimen/dp_48"
+            android:gravity="center"
+            android:maxLines="2"
+            android:minLines="2"
+            android:text="退出系统"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_keyboard"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_160"
+        android:orientation="vertical"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="1"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="2"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="3"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_4"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="4"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_5"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="5"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_6"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="6"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_7"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="7"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_8"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="8"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_9"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="9"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bt_0"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="0"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/bt_del"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="清除"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/bt_confirm"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="确认"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw800dp/fragment_chinese.xml b/app/src/main/res/layout-sw800dp/fragment_chinese.xml
index 76bc85d..56e0f7a 100644
--- a/app/src/main/res/layout-sw800dp/fragment_chinese.xml
+++ b/app/src/main/res/layout-sw800dp/fragment_chinese.xml
@@ -16,8 +16,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_bias="0.35"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
@@ -111,17 +111,17 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/dp_4"
                                 android:text="查看更多…"
-                                android:visibility="gone"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/sp_7"
+                                android:visibility="gone"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
-                                android:layout_marginBottom="@dimen/dp_8"
                                 android:layout_marginTop="@dimen/dp_8"
+                                android:layout_marginBottom="@dimen/dp_8"
                                 android:orientation="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintTop_toBottomOf="@+id/tv_more_app"
@@ -151,8 +151,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_synchronous_tutoring"
@@ -160,16 +160,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -189,8 +179,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_near_antonyms"
@@ -198,16 +188,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="近反义词"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -227,8 +207,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_read_composition"
@@ -236,16 +216,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="阅读写作"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -275,8 +245,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_featured_reading"
@@ -284,17 +254,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="精选阅读"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -315,8 +274,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_character"
@@ -324,16 +283,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="汉字学习"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -354,8 +303,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_classical"
@@ -363,16 +312,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="文言文"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
@@ -401,8 +340,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_rhetoric"
@@ -410,17 +349,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="修辞手法"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -441,8 +369,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_treasure"
@@ -450,16 +378,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="中华宝典"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -477,11 +395,10 @@
                                             app:layout_constraintStart_toStartOf="parent"
                                             app:layout_constraintTop_toTopOf="parent">
 
-
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_punctuation"
@@ -489,16 +406,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="标点符号"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
diff --git a/app/src/main/res/layout-sw800dp/fragment_complex.xml b/app/src/main/res/layout-sw800dp/fragment_complex.xml
index efb64ed..9f2b695 100644
--- a/app/src/main/res/layout-sw800dp/fragment_complex.xml
+++ b/app/src/main/res/layout-sw800dp/fragment_complex.xml
@@ -15,9 +15,9 @@
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintVertical_bias="0.35"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout6"
@@ -52,8 +52,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_16"
-                        android:layout_marginBottom="@dimen/dp_16"
                         android:layout_marginEnd="@dimen/dp_16"
+                        android:layout_marginBottom="@dimen/dp_16"
                         android:orientation="horizontal">
 
                         <LinearLayout
@@ -105,23 +105,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView14"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView14" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -140,23 +130,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView15"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView15" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -206,23 +187,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView16"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView16" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -241,23 +212,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView17"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView17" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -316,23 +278,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView18"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView18" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -351,23 +303,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView19"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView19" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
@@ -419,23 +362,13 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView20"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView20" />
+                                                        app:layout_constraintTop_toTopOf="parent" />
 
 
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -454,23 +387,14 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView21"
-                                                        android:layout_width="@dimen/dp_25"
-                                                        android:layout_height="@dimen/dp_25"
+                                                        android:layout_width="@dimen/dp_28"
+                                                        android:layout_height="@dimen/dp_28"
                                                         android:src="@drawable/complex_book"
+                                                        app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
                                                         app:layout_constraintTop_toTopOf="parent" />
 
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_6"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView21" />
                                                 </androidx.constraintlayout.widget.ConstraintLayout>
                                             </androidx.constraintlayout.widget.ConstraintLayout>
                                         </LinearLayout>
diff --git a/app/src/main/res/layout-sw800dp/fragment_math.xml b/app/src/main/res/layout-sw800dp/fragment_math.xml
index 1666004..f6b3f2c 100644
--- a/app/src/main/res/layout-sw800dp/fragment_math.xml
+++ b/app/src/main/res/layout-sw800dp/fragment_math.xml
@@ -13,11 +13,11 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintVertical_bias="0.35"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.35">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
@@ -99,8 +99,7 @@
                                 android:layout_marginBottom="@dimen/dp_8"
                                 android:orientation="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                              >
+                                app:layout_constraintTop_toTopOf="parent">
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
@@ -126,8 +125,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_synchronous_tutoring"
@@ -135,16 +134,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -164,8 +153,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_problem_training"
@@ -173,16 +162,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="应用题训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -202,8 +181,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_olympiad_training"
@@ -211,16 +190,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="奥数训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -250,8 +219,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_equation_solution"
@@ -259,17 +228,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="方程精解"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -290,8 +248,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/mathematical_basis"
@@ -299,16 +257,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学基础"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -329,8 +277,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_arithmetic"
@@ -338,16 +286,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="四则运算"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
@@ -376,8 +314,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_encyclopedia"
@@ -385,17 +323,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="公式大全"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
                                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -416,8 +343,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_number"
@@ -425,16 +352,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="认识数字"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -452,11 +369,10 @@
                                             app:layout_constraintStart_toStartOf="parent"
                                             app:layout_constraintTop_toTopOf="parent">
 
-
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_25"
-                                                android:layout_height="@dimen/dp_25"
+                                                android:layout_width="@dimen/dp_28"
+                                                android:layout_height="@dimen/dp_28"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_formula"
@@ -464,16 +380,6 @@
                                                 app:layout_constraintStart_toStartOf="parent"
                                                 app:layout_constraintTop_toTopOf="parent" />
 
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学公式"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_5"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
                                         </androidx.constraintlayout.widget.ConstraintLayout>
                                     </androidx.constraintlayout.widget.ConstraintLayout>
                                 </LinearLayout>
diff --git a/app/src/main/res/layout-sw800dp/fragment_user.xml b/app/src/main/res/layout-sw800dp/fragment_user.xml
index e7888b8..3c58450 100644
--- a/app/src/main/res/layout-sw800dp/fragment_user.xml
+++ b/app/src/main/res/layout-sw800dp/fragment_user.xml
@@ -171,6 +171,7 @@
                             android:text="小程序绑定"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_5"
+                            android:visibility="gone"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -305,7 +306,7 @@
                         android:id="@+id/cl_activation"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:visibility="gone">
+                        android:visibility="visible">
 
                         <TextView
                             android:id="@+id/tv_date1"
@@ -342,7 +343,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_7"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -422,7 +423,7 @@
                         android:id="@+id/cl_app"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:visibility="visible">
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/tv_date2"
diff --git a/app/src/main/res/layout/activity_exit.xml b/app/src/main/res/layout/activity_exit.xml
index 402718e..284396d 100644
--- a/app/src/main/res/layout/activity_exit.xml
+++ b/app/src/main/res/layout/activity_exit.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/control_background">
+    android:background="@drawable/control_background"
+    tools:context=".activity.ExitActivity">
 
     <ImageView
         android:id="@+id/imageView5"
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index 0b9bd2f..cdb7d11 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".activity.NoticeActivity">
 
-
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_passwd.xml b/app/src/main/res/layout/activity_passwd.xml
index 350f725..8264ff9 100644
--- a/app/src/main/res/layout/activity_passwd.xml
+++ b/app/src/main/res/layout/activity_passwd.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context=".activity.PasswordActivity"
     android:background="@drawable/control_background">
 
     <ImageView