diff --git a/app/build.gradle b/app/build.gradle
index e3eb19a..86c6b66 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 85
-        versionName "1.9.4"
+        versionCode 88
+        versionName "1.9.7"
 
         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 d170ed7..6945781 100644
--- a/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
@@ -72,19 +72,20 @@ public class ExitActivity extends BaseDataBindingActivity {
             }
         });
 
-        mBinding.btDel.setOnClickListener(new View.OnClickListener() {
+        mBinding.tvDel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mBinding.tvHint.setText("");
-                mBinding.icv.clearInputContent();
-            }
-        });
-        mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                checkPasswd();
+//                mBinding.tvHint.setText("");
+//                mBinding.icv.clearInputContent();
+                finish();
             }
         });
+//        mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                checkPasswd();
+//            }
+//        });
 
         mBinding.bt0.setOnClickListener(view1 -> add(mBinding.icv, "0"));
         mBinding.bt1.setOnClickListener(view1 -> add(mBinding.icv, "1"));
diff --git a/app/src/main/java/com/uiui/zyos/activity/PasswordActivity.java b/app/src/main/java/com/uiui/zyos/activity/PasswordActivity.java
index 1b03677..fee4e2c 100644
--- a/app/src/main/java/com/uiui/zyos/activity/PasswordActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/PasswordActivity.java
@@ -59,19 +59,20 @@ public class PasswordActivity extends BaseDataBindingActivity {
             }
         });
 
-        mBinding.btDel.setOnClickListener(new View.OnClickListener() {
+        mBinding.tvDel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mBinding.tvHint.setText("");
-                mBinding.icv.clearInputContent();
-            }
-        });
-        mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                checkPasswd();
+//                mBinding.tvHint.setText("");
+//                mBinding.icv.clearInputContent();
+                finish();
             }
         });
+//        mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                checkPasswd();
+//            }
+//        });
 
         mBinding.bt0.setOnClickListener(view1 -> add(mBinding.icv, "0"));
         mBinding.bt1.setOnClickListener(view1 -> add(mBinding.icv, "1"));
diff --git a/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkDetailsActivity.java b/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkDetailsActivity.java
index 9d5fcd7..705e40d 100644
--- a/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkDetailsActivity.java
+++ b/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkDetailsActivity.java
@@ -74,7 +74,7 @@ public class HomeworkDetailsActivity extends BaseMvvmActivity<HomeworkDetailsVie
                     default:
                     case 0:
                         mViewDataBinding.tvStatu.setBackground(getDrawable(R.drawable.homework_unfinished_background));
-                        mViewDataBinding.tvStatu.setTextColor(getColor(R.color.black));
+                        mViewDataBinding.tvStatu.setTextColor(getColor(R.color.unfinish_text));
                         mViewDataBinding.tvStatu.setText("未完成");
                         break;
                     case 1:
diff --git a/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkViewModel.java b/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkViewModel.java
index 4f1de80..7ea5e4f 100644
--- a/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkViewModel.java
+++ b/app/src/main/java/com/uiui/zyos/activity/homework/HomeworkViewModel.java
@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
-import com.trello.rxlifecycle4.android.FragmentEvent;
+import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.base.mvvm.BaseViewModel;
 import com.uiui.zyos.bean.BaseResponse;
 import com.uiui.zyos.bean.HomeworkBean;
@@ -16,7 +16,6 @@ import com.uiui.zyos.utils.ActivationUtil;
 import com.uiui.zyos.utils.TimeUtils;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -56,13 +55,16 @@ public class HomeworkViewModel extends BaseViewModel<ActivityHomeworkBinding, Ac
                         Log.e("getHomework", "onNext: " + listBaseResponse);
                         ArrayList<HomeworkBean> homeworkBeans = listBaseResponse.data;
 
-                        ArrayList<HomeworkBean> filter = (ArrayList<HomeworkBean>) homeworkBeans.stream().filter(new Predicate<HomeworkBean>() {
-                            @Override
-                            public boolean test(HomeworkBean homeworkBean) {
-                                return TimeUtils.isHomeworkToday(homeworkBean.getCreated_at());
-                            }
-                        }).collect(Collectors.toList());
-                        mHomeworkBeanListData.setValue(filter);
+                        if (!BuildConfig.DEBUG) {
+                            homeworkBeans = (ArrayList<HomeworkBean>) homeworkBeans.stream().filter(new Predicate<HomeworkBean>() {
+                                @Override
+                                public boolean test(HomeworkBean homeworkBean) {
+                                    return TimeUtils.isHomeworkToday(homeworkBean.getCreated_at());
+                                }
+                            }).collect(Collectors.toList());
+                        }
+
+                        mHomeworkBeanListData.setValue(homeworkBeans);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java b/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
index 7b8558b..a86c2ec 100644
--- a/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
+++ b/app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
@@ -85,8 +85,12 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
         if (!activation) {
             return;
         }
+
         AppUsedTimeUtils.getInstance().setEndTime(System.currentTimeMillis());
         String packagename = AppUsedTimeUtils.getInstance().getAppPackageName();
+        if (BuildConfig.APPLICATION_ID.equals(packagename)) {
+            return;
+        }
         Log.e(TAG, "onRestart  packagename == " + packagename);
         if (!TextUtils.isEmpty(packagename)) {
             Log.e(TAG, "onRestart: " + ApkUtils.getAppNameByPackage(getCtx(), packagename));
diff --git a/app/src/main/java/com/uiui/zyos/adapter/HomeworkAdapter.java b/app/src/main/java/com/uiui/zyos/adapter/HomeworkAdapter.java
index f8fa3cb..ef30a1a 100644
--- a/app/src/main/java/com/uiui/zyos/adapter/HomeworkAdapter.java
+++ b/app/src/main/java/com/uiui/zyos/adapter/HomeworkAdapter.java
@@ -19,6 +19,7 @@ import com.uiui.zyos.activity.homework.HomeworkDetailsActivity;
 import com.uiui.zyos.bean.HomeworkBean;
 import com.uiui.zyos.utils.ScreenUtils;
 import com.uiui.zyos.utils.TimeUtils;
+import com.uiui.zyos.view.HorizontalDecorationWithoutFirst;
 import com.uiui.zyos.view.HorizontalItemDecoration;
 
 import java.util.List;
@@ -115,7 +116,7 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.Holder
             LinearLayoutManager linearLayoutManager = new LinearLayoutManager(root.getContext());
             linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
             rv_pic.setLayoutManager(linearLayoutManager);
-            rv_pic.addItemDecoration(new HorizontalItemDecoration(ScreenUtils.dp2px(root.getContext().getResources(), 8), root.getContext()));
+            rv_pic.addItemDecoration(new HorizontalDecorationWithoutFirst(8, root.getContext()));
         }
     }
 }
diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
index e99e909..e2c5875 100644
--- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
+++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
@@ -47,7 +47,9 @@ import com.uiui.zyos.utils.ScreenUtils;
 import com.uiui.zyos.utils.TimeUtils;
 import com.uiui.zyos.utils.Utils;
 import com.uiui.zyos.view.EquallyDividedItemDecoration;
+import com.uiui.zyos.view.HorizontalDecorationWithoutFirst;
 import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration;
+import com.uiui.zyos.view.VerticalDecorationWithoutFirst;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -181,7 +183,8 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
         mHomeworkAdapter = new HomeworkAdapter();
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext);
         linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
-        mViewDataBinding.rvHomework.addItemDecoration(new EquallyDividedItemDecoration(1, ScreenUtils.dp2px(getResources(), 4)));
+//        mViewDataBinding.rvHomework.addItemDecoration(new EquallyDividedItemDecoration(1, ScreenUtils.dp2px(getResources(), 4)));
+        mViewDataBinding.rvHomework.addItemDecoration(new VerticalDecorationWithoutFirst(0, 16, mContext));
         mViewDataBinding.rvHomework.setLayoutManager(linearLayoutManager);
         mViewDataBinding.rvHomework.setAdapter(mHomeworkAdapter);
     }
diff --git a/app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java b/app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java
index f91ed50..f42d84a 100644
--- a/app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java
@@ -13,6 +13,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.mmkv.MMKV;
+import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.bean.BaseResponse;
 import com.uiui.zyos.config.CommonConfig;
 import com.uiui.zyos.network.NetInterfaceManager;
@@ -184,6 +185,9 @@ public class AppUsedTimeUtils {
             return;
         }
         String packageName = getAppPackageName();
+        if (BuildConfig.APPLICATION_ID.equals(packageName)) {
+            return;
+        }
         long time = getStartTime();
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("app_package", packageName);
@@ -201,7 +205,7 @@ public class AppUsedTimeUtils {
 
                     @Override
                     public void onNext(BaseResponse baseResponse) {
-                        Log.e("SendRunningApp", "onSubscribe: " + baseResponse);
+                        Log.e("SendRunningApp", "onNext: " + baseResponse);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/uiui/zyos/utils/TimeUtils.java b/app/src/main/java/com/uiui/zyos/utils/TimeUtils.java
index a9d85d9..6bf59e2 100644
--- a/app/src/main/java/com/uiui/zyos/utils/TimeUtils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/TimeUtils.java
@@ -63,7 +63,7 @@ public class TimeUtils {
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
         return sdf.format(date);
     }
 
diff --git a/app/src/main/java/com/uiui/zyos/view/HorizontalDecorationWithoutFirst.java b/app/src/main/java/com/uiui/zyos/view/HorizontalDecorationWithoutFirst.java
new file mode 100644
index 0000000..88572a0
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyos/view/HorizontalDecorationWithoutFirst.java
@@ -0,0 +1,41 @@
+package com.uiui.zyos.view;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 定义水平方向的距离
+ */
+public class HorizontalDecorationWithoutFirst extends RecyclerView.ItemDecoration {
+    private int space;//定义2个Item之间的距离
+
+    public HorizontalDecorationWithoutFirst(int space, Context mContext) {
+        this.space = dip2px(space, mContext);
+    }
+
+    @Override
+    public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view);
+        int totalCount = parent.getAdapter().getItemCount();
+        if (position == 0) {//第一个
+            outRect.left = 0;
+            outRect.right = space / 2;
+        } else if (position == totalCount - 1) {//最后一个
+            outRect.left = space / 2;
+            outRect.right = 0;
+        } else {//中间其它的
+            outRect.left = space / 2;
+            outRect.right = space / 2;
+        }
+    }
+
+    public int dip2px(float dpValue, Context context) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+}
+
diff --git a/app/src/main/java/com/uiui/zyos/view/VerticalDecorationWithoutFirst.java b/app/src/main/java/com/uiui/zyos/view/VerticalDecorationWithoutFirst.java
new file mode 100644
index 0000000..4bceb1a
--- /dev/null
+++ b/app/src/main/java/com/uiui/zyos/view/VerticalDecorationWithoutFirst.java
@@ -0,0 +1,45 @@
+package com.uiui.zyos.view;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 定义水平方向的距离
+ */
+public class VerticalDecorationWithoutFirst extends RecyclerView.ItemDecoration {
+    private int space;//定义2个Item之间的距离
+    private int marginSpace = 0;//定义2个Item之间的距离
+
+    public VerticalDecorationWithoutFirst(int marginSpace, int space, Context mContext) {
+        this.space = dip2px(space, mContext);
+        this.marginSpace = dip2px(marginSpace, mContext);
+    }
+
+    @Override
+    public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view);
+        int totalCount = parent.getAdapter().getItemCount();
+        if (position == 0) {//第一个
+            outRect.top = 0;
+            outRect.bottom = space / 2;
+        } else if (position == totalCount - 1) {//最后一个
+            outRect.top = space / 2;
+            outRect.bottom = 0;
+        } else {//中间其它的
+            outRect.top = space / 2;
+            outRect.bottom = space / 2;
+        }
+        outRect.left = marginSpace;
+        outRect.right = marginSpace;
+    }
+
+    public int dip2px(float dpValue, Context context) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+}
+
diff --git a/app/src/main/res/drawable-hdpi/com_android_appstore.png b/app/src/main/res/drawable-hdpi/com_android_appstore.png
index a5f54a7..9114f6c 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_appstore.png and b/app/src/main/res/drawable-hdpi/com_android_appstore.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_browser.png b/app/src/main/res/drawable-hdpi/com_android_browser.png
index 56d702b..88c6727 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_browser.png and b/app/src/main/res/drawable-hdpi/com_android_browser.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_calculator2.png b/app/src/main/res/drawable-hdpi/com_android_calculator2.png
index dfb3348..f0c70af 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_calculator2.png and b/app/src/main/res/drawable-hdpi/com_android_calculator2.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_camera.png b/app/src/main/res/drawable-hdpi/com_android_camera.png
index bbeb62c..9a86f9d 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_camera.png and b/app/src/main/res/drawable-hdpi/com_android_camera.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_dialer.png b/app/src/main/res/drawable-hdpi/com_android_dialer.png
index 78cb04f..c80fb2b 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_dialer.png and b/app/src/main/res/drawable-hdpi/com_android_dialer.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png
index a5177c3..e5fa2be 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png and b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png
index 6f8d6e4..40e2e1b 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png and b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_settings.png b/app/src/main/res/drawable-hdpi/com_android_settings.png
index ad4e3a7..8b9a273 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_settings.png and b/app/src/main/res/drawable-hdpi/com_android_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png b/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png
index ead9ec7..4a38648 100644
Binary files a/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png and b/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png
index 2c5128a..0efa11e 100644
Binary files a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png and b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_system_huyan.png b/app/src/main/res/drawable-hdpi/com_system_huyan.png
index d81a835..d3ce237 100644
Binary files a/app/src/main/res/drawable-hdpi/com_system_huyan.png and b/app/src/main/res/drawable-hdpi/com_system_huyan.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_system_youer.png b/app/src/main/res/drawable-hdpi/com_system_youer.png
index 4a570eb..ff006f8 100644
Binary files a/app/src/main/res/drawable-hdpi/com_system_youer.png and b/app/src/main/res/drawable-hdpi/com_system_youer.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_uiui_sn.png b/app/src/main/res/drawable-hdpi/com_uiui_sn.png
index d80fb6e..09f4b7f 100644
Binary files a/app/src/main/res/drawable-hdpi/com_uiui_sn.png and b/app/src/main/res/drawable-hdpi/com_uiui_sn.png differ
diff --git a/app/src/main/res/drawable-hdpi/exit_icon.png b/app/src/main/res/drawable-hdpi/exit_icon.png
index 264678f..180d8d3 100644
Binary files a/app/src/main/res/drawable-hdpi/exit_icon.png and b/app/src/main/res/drawable-hdpi/exit_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_dict.png b/app/src/main/res/drawable-hdpi/icon_dict.png
index 6eb5f11..9e07b22 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_dict.png and b/app/src/main/res/drawable-hdpi/icon_dict.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_homework_back.png b/app/src/main/res/drawable-hdpi/icon_homework_back.png
new file mode 100644
index 0000000..33e77f2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon_homework_back.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_homework_refresh.png b/app/src/main/res/drawable-hdpi/icon_homework_refresh.png
index 71e4222..de376ed 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_homework_refresh.png and b/app/src/main/res/drawable-hdpi/icon_homework_refresh.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_update.png b/app/src/main/res/drawable-hdpi/icon_update.png
index 6872dfd..30cfe7d 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_update.png and b/app/src/main/res/drawable-hdpi/icon_update.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_video.png b/app/src/main/res/drawable-hdpi/icon_video.png
index 974ee14..2704e3e 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_video.png and b/app/src/main/res/drawable-hdpi/icon_video.png differ
diff --git a/app/src/main/res/drawable-hdpi/jxw_update.png b/app/src/main/res/drawable-hdpi/jxw_update.png
index d69aae3..32be015 100644
Binary files a/app/src/main/res/drawable-hdpi/jxw_update.png and b/app/src/main/res/drawable-hdpi/jxw_update.png differ
diff --git a/app/src/main/res/drawable-hdpi/service_icon.png b/app/src/main/res/drawable-hdpi/service_icon.png
index 5c45820..ccedb9e 100644
Binary files a/app/src/main/res/drawable-hdpi/service_icon.png and b/app/src/main/res/drawable-hdpi/service_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/status_download.png b/app/src/main/res/drawable-hdpi/status_download.png
index d838532..b9a349b 100644
Binary files a/app/src/main/res/drawable-hdpi/status_download.png and b/app/src/main/res/drawable-hdpi/status_download.png differ
diff --git a/app/src/main/res/drawable-hdpi/uiui_zybrowser.png b/app/src/main/res/drawable-hdpi/uiui_zybrowser.png
index 5c3f354..f0ed38d 100644
Binary files a/app/src/main/res/drawable-hdpi/uiui_zybrowser.png and b/app/src/main/res/drawable-hdpi/uiui_zybrowser.png differ
diff --git a/app/src/main/res/drawable-xhdpi/main_background.png b/app/src/main/res/drawable-xhdpi/main_background.png
index 3e806f0..c3cf345 100644
Binary files a/app/src/main/res/drawable-xhdpi/main_background.png and b/app/src/main/res/drawable-xhdpi/main_background.png differ
diff --git a/app/src/main/res/drawable-xhdpi/wallpaper_land.png b/app/src/main/res/drawable-xhdpi/wallpaper_land.png
new file mode 100644
index 0000000..5474d6a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/wallpaper_land.png differ
diff --git a/app/src/main/res/drawable/bt_dialer_color.xml b/app/src/main/res/drawable/bt_dialer_color.xml
index 3a9cbf1..30926ce 100644
--- a/app/src/main/res/drawable/bt_dialer_color.xml
+++ b/app/src/main/res/drawable/bt_dialer_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:color="@color/white" />
-    <item android:state_focused="true" android:color="@color/black" />
-    <item android:color="@color/black" />
+    <item android:state_focused="true" android:color="@color/white" />
+    <item android:color="@color/white" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/homework_finish_background.xml b/app/src/main/res/drawable/homework_finish_background.xml
index 656db72..48228d8 100644
--- a/app/src/main/res/drawable/homework_finish_background.xml
+++ b/app/src/main/res/drawable/homework_finish_background.xml
@@ -17,9 +17,9 @@
 
     <!-- padding：Button里面的文字与Button边界的间隔 -->
         <padding
-            android:bottom="@dimen/dp_4"
+            android:bottom="@dimen/dp_2"
             android:left="@dimen/dp_8"
             android:right="@dimen/dp_8"
-            android:top="@dimen/dp_4" />
+            android:top="@dimen/dp_2" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/homework_unfinished_background.xml b/app/src/main/res/drawable/homework_unfinished_background.xml
index 85b3c94..70a98d4 100644
--- a/app/src/main/res/drawable/homework_unfinished_background.xml
+++ b/app/src/main/res/drawable/homework_unfinished_background.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <!-- 填充的颜色：这里设置背景透明 -->
-    <solid android:color="#DCDCDC" />
+    <solid android:color="#f1dda5" />
     <!-- 边框的颜色 ：不能和窗口背景色一样 -->
 
     <!-- 设置按钮的四个角为弧形 -->
@@ -17,9 +17,9 @@
 
     <!-- padding：Button里面的文字与Button边界的间隔 -->
     <padding
-        android:bottom="@dimen/dp_4"
+        android:bottom="@dimen/dp_2"
         android:left="@dimen/dp_8"
         android:right="@dimen/dp_8"
-        android:top="@dimen/dp_4" />
+        android:top="@dimen/dp_2" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/item_homework_background.xml b/app/src/main/res/drawable/item_homework_background.xml
index 2b6061e..dc56081 100644
--- a/app/src/main/res/drawable/item_homework_background.xml
+++ b/app/src/main/res/drawable/item_homework_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid android:color="#ffffff" />
+    <solid android:color="#f8f4e9" />
     <!-- 圆角的幅度 -->
     <corners
         android:bottomLeftRadius="@dimen/dp_8"
diff --git a/app/src/main/res/drawable/user_box_bg.xml b/app/src/main/res/drawable/user_box_bg.xml
index bda9504..f95ec72 100644
--- a/app/src/main/res/drawable/user_box_bg.xml
+++ b/app/src/main/res/drawable/user_box_bg.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="45"
-        android:endColor="#8282EB"
-        android:startColor="#8282EB" />
+
+    <solid android:color="#4D000000" />
 
     <!-- 圆角的幅度 -->
     <corners
diff --git a/app/src/main/res/drawable/user_box_bg_gradient.xml b/app/src/main/res/drawable/user_box_bg_gradient.xml
new file mode 100644
index 0000000..bda9504
--- /dev/null
+++ b/app/src/main/res/drawable/user_box_bg_gradient.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="45"
+        android:endColor="#8282EB"
+        android:startColor="#8282EB" />
+
+    <!-- 圆角的幅度 -->
+    <corners
+        android:bottomLeftRadius="@dimen/dp_8"
+        android:bottomRightRadius="@dimen/dp_8"
+        android:topLeftRadius="@dimen/dp_8"
+        android:topRightRadius="@dimen/dp_8" />
+
+    <padding
+        android:bottom="@dimen/dp_4"
+        android:left="@dimen/dp_4"
+        android:right="@dimen/dp_4"
+        android:top="@dimen/dp_4" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_exit.xml b/app/src/main/res/layout-land/activity_exit.xml
index ba7274f..e1f599d 100644
--- a/app/src/main/res/layout-land/activity_exit.xml
+++ b/app/src/main/res/layout-land/activity_exit.xml
@@ -10,408 +10,384 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginEnd="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/imageView2"
-                android:layout_width="@dimen/dp_80"
-                android:layout_height="@dimen/dp_80"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/applet_qrcode"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_8"
-                android:maxLines="1"
-                android:text="找回密码"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_9"
-                app:layout_constraintEnd_toEndOf="@+id/imageView2"
-                app:layout_constraintStart_toStartOf="@+id/imageView2"
-                app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
+        android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/imageView5"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:visibility="gone"
-            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" />
+            android:src="@drawable/wallpaper_land" />
 
         <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.35">
+            android:layout_height="match_parent">
 
-            <com.tuo.customview.VerificationCodeView
-                android:id="@+id/icv"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 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"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_8"
+                android:layout_marginEnd="@dimen/dp_8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="@dimen/dp_80"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/applet_qrcode"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:maxLines="1"
+                    android:text="找回密码"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_9"
+                    app:layout_constraintEnd_toEndOf="@+id/imageView2"
+                    app:layout_constraintStart_toStartOf="@+id/imageView2"
+                    app:layout_constraintTop_toBottomOf="@+id/imageView2" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <ImageView
+                android:id="@+id/imageView5"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:layout_marginTop="@dimen/dp_8"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_lock"
+                android:visibility="visible"
                 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/black"
-                android:textSize="@dimen/sp_11"
-                android:layout_marginTop="@dimen/dp_8"
-                app:layout_constraintEnd_toEndOf="@+id/icv"
-                app:layout_constraintStart_toStartOf="@+id/icv"
-                app:layout_constraintTop_toBottomOf="@+id/icv" />
-
-            <TextView
-                android:id="@+id/textView"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_48"
-                android:layout_marginEnd="@dimen/dp_48"
-                android:layout_marginTop="@dimen/dp_8"
-                android:gravity="center"
-                android:maxLines="2"
-                android:minLines="2"
-                android:text="退出系统"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                android:layout_marginTop="@dimen/dp_16"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.tuo.customview.VerificationCodeView
+                    android:id="@+id/icv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/sp_32"
+                    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_16"
+                    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="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_12"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_keyboard"
+                android:layout_width="@dimen/dp_220"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout5"
+                app:layout_constraintVertical_bias="0.4">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_1"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="1"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_2"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="2"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_3"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="3"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_4"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="4"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_5"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="5"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_6"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="6"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_7"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="7"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_8"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="8"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_9"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="9"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_0"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_del"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="取消"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <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"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5"
-            app:layout_constraintVertical_bias="0.9">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="1"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="2"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="3"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="4"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="5"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="6"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="7"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="8"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_9"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="9"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="0"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_del"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_cancel"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_confirm"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_confirm"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-land/activity_homework.xml b/app/src/main/res/layout-land/activity_homework.xml
index ae64d70..9b213fe 100644
--- a/app/src/main/res/layout-land/activity_homework.xml
+++ b/app/src/main/res/layout-land/activity_homework.xml
@@ -18,7 +18,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#8282EB">
+            android:background="#30534d">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/bannerLayout"
@@ -33,11 +33,11 @@
                     android:id="@+id/iv_back"
                     android:layout_width="@dimen/dp_20"
                     android:layout_height="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginStart="@dimen/dp_32"
                     android:adjustViewBounds="true"
                     android:onClick="@{click::exit}"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/bt_back"
+                    android:src="@drawable/icon_homework_back"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -76,7 +76,7 @@
                     android:id="@+id/imageView24"
                     android:layout_width="@dimen/dp_12"
                     android:layout_height="@dimen/dp_12"
-                    android:layout_marginEnd="@dimen/dp_8"
+                    android:layout_marginEnd="@dimen/dp_32"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_homework_pull"
diff --git a/app/src/main/res/layout-land/activity_homework_details.xml b/app/src/main/res/layout-land/activity_homework_details.xml
index 39db965..468901a 100644
--- a/app/src/main/res/layout-land/activity_homework_details.xml
+++ b/app/src/main/res/layout-land/activity_homework_details.xml
@@ -36,7 +36,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout10"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_32"
+                android:layout_height="@dimen/dp_36"
+                android:background="#30534d"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -46,8 +47,9 @@
                     android:layout_height="@dimen/dp_16"
                     android:layout_marginStart="@dimen/dp_8"
                     android:adjustViewBounds="true"
+                    android:onClick="@{click::exit}"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/icon_homework_detail_back"
+                    android:src="@drawable/bt_back"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +58,7 @@
                     android:id="@+id/tv_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -69,12 +71,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/dp_8"
-                    android:background="@drawable/homework_finish_background"
+                    android:background="@drawable/homework_unfinished_background"
                     android:maxLines="1"
                     android:onClick="@{click::updateHomework}"
                     android:singleLine="true"
-                    android:text="已完成"
-                    android:textColor="@color/white"
+                    android:text="未完成"
+                    android:textColor="@color/unfinish_text"
+                    android:textSize="@dimen/sp_10"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -84,6 +87,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:background="#f8f4e9"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -104,8 +108,9 @@
                             android:id="@+id/tv_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginEnd="@dimen/dp_8"
+                            android:layout_marginStart="@dimen/dp_32"
+                            android:layout_marginEnd="@dimen/dp_32"
+                            android:layout_marginTop="@dimen/dp_8"
                             android:text="@{homeworkBean.content}"
                             android:textColor="@color/text_hint_color"
                             android:textSize="@dimen/sp_12"
@@ -122,9 +127,10 @@
                                 android:id="@+id/rv_pic"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/dp_100"
+                                android:layout_marginStart="@dimen/dp_32"
                                 android:layout_marginTop="@dimen/dp_8"
-                                android:layout_marginEnd="@dimen/dp_100"
+                                android:layout_marginBottom="@dimen/dp_8"
+                                android:layout_marginEnd="@dimen/dp_32"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout-land/activity_passwd.xml b/app/src/main/res/layout-land/activity_passwd.xml
index d87e1a3..148a5ee 100644
--- a/app/src/main/res/layout-land/activity_passwd.xml
+++ b/app/src/main/res/layout-land/activity_passwd.xml
@@ -10,373 +10,350 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/imageView5"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/icon_lock"
-            android:visibility="gone"
-            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" />
+            android:src="@drawable/wallpaper_land" />
 
         <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.35">
+            android:layout_height="match_parent">
 
-            <com.tuo.customview.VerificationCodeView
-                android:id="@+id/icv"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/sp_32"
-                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"
+            <ImageView
+                android:id="@+id/imageView5"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:layout_marginTop="@dimen/dp_8"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_lock"
+                android:visibility="visible"
                 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:layout_marginTop="@dimen/dp_8"
-                android:text=""
-                android:textColor="@color/black"
-                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"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_48"
                 android:layout_marginTop="@dimen/dp_8"
-                android:layout_marginEnd="@dimen/dp_48"
-                android:gravity="center"
-                android:maxLines="2"
-                android:minLines="2"
-                android:text="输入密码后添加应用到桌面"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.tuo.customview.VerificationCodeView
+                    android:id="@+id/icv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/sp_32"
+                    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_16"
+                    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="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_12"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_keyboard"
+                android:layout_width="@dimen/dp_220"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout5"
+                app:layout_constraintVertical_bias="0.5">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_1"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="1"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_2"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="2"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_3"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="3"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_4"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="4"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_5"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="5"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_6"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="6"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_7"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="7"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_8"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="8"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_9"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="9"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_0"
+                            android:layout_width="@dimen/dp_44"
+                            android:layout_height="@dimen/dp_44"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_del"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="取消"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <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"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5"
-            app:layout_constraintVertical_bias="0.9">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="1"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="2"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="3"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="4"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="5"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="6"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="7"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="8"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_9"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="9"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="0"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_del"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_cancel"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_confirm"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_confirm"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-land/fragment_user.xml b/app/src/main/res/layout-land/fragment_user.xml
index 7f965f3..308fdef 100644
--- a/app/src/main/res/layout-land/fragment_user.xml
+++ b/app/src/main/res/layout-land/fragment_user.xml
@@ -103,7 +103,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="2"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:onClick="@{click::openUser}"
                             android:visibility="visible">
 
@@ -167,7 +167,7 @@
                             android:layout_height="0dp"
                             android:layout_marginTop="@dimen/dp_9"
                             android:layout_weight="1"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:visibility="visible">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
@@ -451,48 +451,75 @@
                             android:id="@+id/cl_homework"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_marginTop="@dimen/dp_2"
+                            android:layout_marginEnd="@dimen/dp_6"
                             android:onClick="@{click::openHomework}"
                             android:visibility="visible">
 
-                            <TextView
-                                android:id="@+id/tv_date3"
-                                android:layout_width="wrap_content"
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/constraintLayout12"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:maxLines="1"
-                                android:text="2月14日 星期二"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_9"
                                 app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                app:layout_constraintTop_toTopOf="parent">
 
-                            <ImageView
-                                android:id="@+id/imageView14"
-                                android:layout_width="@dimen/dp_16"
-                                android:layout_height="@dimen/dp_16"
-                                android:adjustViewBounds="true"
-                                android:onClick="@{click::refreshHomework}"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/icon_homework_refresh"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                <TextView
+                                    android:id="@+id/tv_date3"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/dp_4"
+                                    android:maxLines="1"
+                                    android:text="2月14日 星期二"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/sp_9"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:id="@+id/imageView14"
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:adjustViewBounds="true"
+                                    android:layout_marginStart="@dimen/dp_8"
+                                    android:onClick="@{click::refreshHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_homework_refresh"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toEndOf="@+id/tv_date3"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::openHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/user_more"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
 
                             <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/rv_homework"
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
+                                android:layout_marginTop="@dimen/dp_2"
                                 android:fadeScrollbars="false"
                                 android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3" />
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:id="@+id/ll_nodata"
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
                                 android:fadeScrollbars="false"
-                                android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3">
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12">
 
                                 <ImageView
                                     android:id="@+id/imageView23"
diff --git a/app/src/main/res/layout-land/item_homework.xml b/app/src/main/res/layout-land/item_homework.xml
index b1e2383..a4fe2fa 100644
--- a/app/src/main/res/layout-land/item_homework.xml
+++ b/app/src/main/res/layout-land/item_homework.xml
@@ -10,7 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/item_homework_background"
-        android:padding="@dimen/dp_4"
+        android:paddingTop="@dimen/dp_8"
+        android:paddingEnd="@dimen/dp_16"
+        android:paddingStart="@dimen/dp_16"
+        android:paddingBottom="@dimen/dp_8"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,7 +21,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout11"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_20"
+            android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -30,7 +33,7 @@
                 android:maxLines="1"
                 android:text="暂时没有作业"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/sp_8"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -42,9 +45,10 @@
                 android:layout_height="wrap_content"
                 android:maxEms="8"
                 android:maxLines="1"
+                android:layout_marginTop="@dimen/dp_2"
                 android:text="2024-09-12 17:57:42"
                 android:textColor="@color/gray_text"
-                android:textSize="@dimen/sp_8"
+                android:textSize="@dimen/sp_7"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -58,25 +62,26 @@
             android:maxLines="1"
             android:singleLine="true"
             android:text="文字"
+            android:layout_marginEnd="@dimen/dp_80"
             android:textColor="@color/gray_text"
-            android:textSize="@dimen/sp_8"
+            android:textSize="@dimen/sp_6"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/constraintLayout11" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_pic"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_44"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/dp_2"
+            android:layout_height="@dimen/dp_40"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_type" />
 
         <ImageView
             android:id="@+id/iv_statu"
-            android:layout_width="@dimen/dp_48"
-            android:layout_height="@dimen/dp_48"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="@dimen/dp_40"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             android:src="@drawable/icon_hw_statu_unfinished"
diff --git a/app/src/main/res/layout-land/item_homework_pic.xml b/app/src/main/res/layout-land/item_homework_pic.xml
index 75f4da4..d3a3d87 100644
--- a/app/src/main/res/layout-land/item_homework_pic.xml
+++ b/app/src/main/res/layout-land/item_homework_pic.xml
@@ -15,8 +15,8 @@
 
         <com.shehuan.niv.NiceImageView
             android:id="@+id/nv_pic"
-            android:layout_width="@dimen/dp_44"
-            android:layout_height="@dimen/dp_44"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="@dimen/dp_40"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
             app:corner_radius="@dimen/dp_8"
diff --git a/app/src/main/res/layout-sw800dp/activity_passwd.xml b/app/src/main/res/layout-sw800dp/activity_passwd.xml
index d87e1a3..2c7ec10 100644
--- a/app/src/main/res/layout-sw800dp/activity_passwd.xml
+++ b/app/src/main/res/layout-sw800dp/activity_passwd.xml
@@ -10,373 +10,352 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/imageView5"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/icon_lock"
-            android:visibility="gone"
-            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" />
+            android:src="@drawable/wallpaper_land" />
 
         <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.35">
+            android:layout_height="match_parent">
 
-            <com.tuo.customview.VerificationCodeView
-                android:id="@+id/icv"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/sp_32"
-                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"
+            <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"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.06" />
 
-            <TextView
-                android:id="@+id/tv_hint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_8"
-                android:text=""
-                android:textColor="@color/black"
-                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"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_48"
-                android:layout_marginTop="@dimen/dp_8"
-                android:layout_marginEnd="@dimen/dp_48"
-                android:gravity="center"
-                android:maxLines="2"
-                android:minLines="2"
-                android:text="输入密码后添加应用到桌面"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                android:layout_marginTop="@dimen/dp_32"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.tuo.customview.VerificationCodeView
+                    android:id="@+id/icv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/sp_32"
+                    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_16"
+                    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="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_12"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_keyboard"
+                android:layout_width="@dimen/dp_220"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout5"
+                app:layout_constraintVertical_bias="0.4">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_1"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="1"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_2"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="2"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_3"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="3"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_4"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="4"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_5"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="5"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_6"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="6"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_7"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="7"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_8"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="8"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_9"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="9"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_0"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_del"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="取消"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <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"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5"
-            app:layout_constraintVertical_bias="0.9">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="1"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="2"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="3"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="4"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="5"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="6"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="7"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="8"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_9"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="9"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="0"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_del"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_cancel"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_confirm"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_confirm"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-sw800dp/fragment_user.xml b/app/src/main/res/layout-sw800dp/fragment_user.xml
index 0783176..5b17cde 100644
--- a/app/src/main/res/layout-sw800dp/fragment_user.xml
+++ b/app/src/main/res/layout-sw800dp/fragment_user.xml
@@ -87,7 +87,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="2"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:onClick="@{click::openUser}"
                             android:visibility="visible">
 
@@ -152,7 +152,7 @@
                             android:layout_height="0dp"
                             android:layout_marginTop="@dimen/dp_8"
                             android:layout_weight="1"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:visibility="visible">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
@@ -436,40 +436,67 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/cl_homework"
                             android:layout_width="match_parent"
-                            android:onClick="@{click::openHomework}"
                             android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_marginTop="@dimen/dp_2"
+                            android:layout_marginEnd="@dimen/dp_6"
+                            android:onClick="@{click::openHomework}"
                             android:visibility="visible">
 
-                            <TextView
-                                android:id="@+id/tv_date3"
-                                android:layout_width="wrap_content"
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/constraintLayout12"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:maxLines="1"
-                                android:text="2月14日 星期二"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_7"
                                 app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                app:layout_constraintTop_toTopOf="parent">
 
-                            <ImageView
-                                android:id="@+id/imageView14"
-                                android:layout_width="@dimen/dp_14"
-                                android:layout_height="@dimen/dp_14"
-                                android:adjustViewBounds="true"
-                                android:onClick="@{click::refreshHomework}"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/icon_homework_refresh"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                <TextView
+                                    android:id="@+id/tv_date3"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:maxLines="1"
+                                    android:text="2月14日 星期二"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/sp_9"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:id="@+id/imageView14"
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:layout_marginStart="@dimen/dp_8"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::refreshHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_homework_refresh"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toEndOf="@+id/tv_date3"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::openHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/user_more"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
 
                             <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/rv_homework"
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
+                                android:layout_marginTop="@dimen/dp_2"
                                 android:fadeScrollbars="false"
                                 android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3" />
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:id="@+id/ll_nodata"
@@ -478,7 +505,7 @@
                                 android:fadeScrollbars="false"
                                 android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3">
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12">
 
                                 <ImageView
                                     android:id="@+id/imageView23"
diff --git a/app/src/main/res/layout/activity_exit.xml b/app/src/main/res/layout/activity_exit.xml
index 5152be6..282c07f 100644
--- a/app/src/main/res/layout/activity_exit.xml
+++ b/app/src/main/res/layout/activity_exit.xml
@@ -10,407 +10,385 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/wallpaper_land" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginEnd="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <ImageView
-                android:id="@+id/imageView2"
-                android:layout_width="@dimen/dp_80"
-                android:layout_height="@dimen/dp_80"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/applet_qrcode"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_8"
-                android:maxLines="1"
-                android:text="找回密码"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_9"
-                app:layout_constraintEnd_toEndOf="@+id/imageView2"
-                app:layout_constraintStart_toStartOf="@+id/imageView2"
-                app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <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"
-            android:visibility="gone"
-            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.11" />
-
-        <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.35">
-
-            <com.tuo.customview.VerificationCodeView
-                android:id="@+id/icv"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/sp_32"
-                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"
+                android:layout_marginEnd="@dimen/dp_8"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/tv_hint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_16"
-                android:text=""
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_11"
-                app:layout_constraintEnd_toEndOf="@+id/icv"
-                app:layout_constraintStart_toStartOf="@+id/icv"
-                app:layout_constraintTop_toBottomOf="@+id/icv" />
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="@dimen/dp_80"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/applet_qrcode"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_48"
-                android:layout_marginTop="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_48"
-                android:gravity="center"
-                android:maxLines="2"
-                android:minLines="2"
-                android:text="退出系统"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:maxLines="1"
+                    android:text="找回密码"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_9"
+                    app:layout_constraintEnd_toEndOf="@+id/imageView2"
+                    app:layout_constraintStart_toStartOf="@+id/imageView2"
+                    app:layout_constraintTop_toBottomOf="@+id/imageView2" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <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"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.11" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_28"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.tuo.customview.VerificationCodeView
+                    android:id="@+id/icv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/sp_32"
+                    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_16"
+                    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="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_12"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_keyboard"
+                android:layout_width="@dimen/dp_220"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout5"
+                app:layout_constraintVertical_bias="0.4">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_1"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="1"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_2"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="2"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_3"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="3"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_4"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="4"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_5"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="5"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_6"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="6"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_7"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="7"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_8"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="8"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_9"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="9"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_0"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_del"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="取消"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <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"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5"
-            app:layout_constraintVertical_bias="0.8">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="1"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="2"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="3"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="4"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="5"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="6"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="7"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="8"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_9"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="9"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="0"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_del"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_cancel"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_confirm"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_confirm"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/activity_homework.xml b/app/src/main/res/layout/activity_homework.xml
index a42804b..11e6e83 100644
--- a/app/src/main/res/layout/activity_homework.xml
+++ b/app/src/main/res/layout/activity_homework.xml
@@ -18,7 +18,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#8282EB">
+            android:background="#30534d">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/bannerLayout"
@@ -33,11 +33,11 @@
                     android:id="@+id/iv_back"
                     android:layout_width="@dimen/dp_20"
                     android:layout_height="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_8"
+                    android:layout_marginStart="@dimen/dp_16"
                     android:adjustViewBounds="true"
                     android:onClick="@{click::exit}"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/bt_back"
+                    android:src="@drawable/icon_homework_back"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -67,7 +67,7 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/sp_9"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/imageView24"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -76,7 +76,7 @@
                     android:id="@+id/imageView24"
                     android:layout_width="@dimen/dp_12"
                     android:layout_height="@dimen/dp_12"
-                    android:layout_marginEnd="@dimen/dp_8"
+                    android:layout_marginEnd="@dimen/dp_16"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_homework_pull"
diff --git a/app/src/main/res/layout/activity_homework_details.xml b/app/src/main/res/layout/activity_homework_details.xml
index 1b19eb1..4b5ccff 100644
--- a/app/src/main/res/layout/activity_homework_details.xml
+++ b/app/src/main/res/layout/activity_homework_details.xml
@@ -36,7 +36,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout10"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_32"
+                android:layout_height="@dimen/dp_36"
+                android:background="#30534d"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -46,8 +47,9 @@
                     android:layout_height="@dimen/dp_16"
                     android:layout_marginStart="@dimen/dp_8"
                     android:adjustViewBounds="true"
+                    android:onClick="@{click::exit}"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/icon_homework_detail_back"
+                    android:src="@drawable/bt_back"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +58,7 @@
                     android:id="@+id/tv_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_14"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -69,12 +71,13 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/dp_8"
-                    android:background="@drawable/homework_finish_background"
+                    android:background="@drawable/homework_unfinished_background"
                     android:maxLines="1"
                     android:onClick="@{click::updateHomework}"
                     android:singleLine="true"
-                    android:text="已完成"
-                    android:textColor="@color/white"
+                    android:text="未完成"
+                    android:textColor="@color/unfinish_text"
+                    android:textSize="@dimen/sp_10"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -84,6 +87,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:background="#f8f4e9"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -104,8 +108,9 @@
                             android:id="@+id/tv_content"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginEnd="@dimen/dp_8"
+                            android:layout_marginStart="@dimen/dp_16"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:layout_marginTop="@dimen/dp_16"
                             android:text="@{homeworkBean.content}"
                             android:textColor="@color/text_hint_color"
                             android:textSize="@dimen/sp_12"
@@ -122,9 +127,7 @@
                                 android:id="@+id/rv_pic"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/dp_8"
-                                android:layout_marginTop="@dimen/dp_8"
-                                android:layout_marginEnd="@dimen/dp_8"
+                                android:layout_margin="@dimen/dp_16"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout/activity_homework_update.xml b/app/src/main/res/layout/activity_homework_update.xml
index 35045ff..3f010c3 100644
--- a/app/src/main/res/layout/activity_homework_update.xml
+++ b/app/src/main/res/layout/activity_homework_update.xml
@@ -16,7 +16,7 @@
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="@dimen/dp_330"
+            android:layout_width="@dimen/dp_260"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:background="@drawable/dialog_background"
@@ -26,19 +26,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
-                android:id="@+id/imageView"
-                android:layout_width="@dimen/dp_24"
-                android:layout_height="@dimen/dp_24"
-                android:layout_marginTop="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_16"
-                android:adjustViewBounds="true"
-                android:onClick="@{click::exit}"
-                android:scaleType="centerCrop"
-                android:src="@drawable/icon_close"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -49,10 +36,23 @@
                 app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
+                    android:id="@+id/imageView"
+                    android:layout_width="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginEnd="@dimen/dp_8"
+                    android:adjustViewBounds="true"
+                    android:onClick="@{click::exit}"
+                    android:layout_gravity="right"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_close"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:layout_width="@dimen/dp_48"
+                    android:layout_height="@dimen/dp_48"
                     android:layout_gravity="center"
-                    android:layout_marginTop="@dimen/dp_32"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_hw_statu_finish" />
@@ -64,20 +64,20 @@
                     android:layout_marginTop="@dimen/dp_16"
                     android:text="你确定已经完成作业了吗?"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_16" />
+                    android:textSize="@dimen/sp_10" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/linearLayout3"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/dp_32"
+                    android:layout_marginBottom="@dimen/dp_16"
                     app:layout_constraintBottom_toBottomOf="parent">
 
                     <TextView
                         android:id="@+id/positive"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_32"
+                        android:layout_marginTop="@dimen/dp_24"
                         android:layout_weight="1"
                         android:background="@drawable/update_finish_background"
                         android:gravity="center"
@@ -85,7 +85,7 @@
                         android:singleLine="true"
                         android:text="已完成"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_11"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e2808ee..f7022cb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -78,7 +78,9 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_0"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_4"
+                        android:layout_marginEnd="@dimen/dp_4"
                         android:onClick="@{click::open0}">
 
                         <ImageView
@@ -173,7 +175,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_2"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_4"
                         android:layout_marginEnd="@dimen/dp_4"
                         android:onClick="@{click::open2}">
@@ -238,7 +240,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_4"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_4"
                         android:layout_marginEnd="@dimen/dp_4"
                         android:onClick="@{click::open4}"
@@ -272,7 +274,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_6"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_4"
                         android:layout_marginEnd="@dimen/dp_4"
                         android:onClick="@{click::open6}">
@@ -305,7 +307,7 @@
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_7"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_4"
                         android:layout_marginEnd="@dimen/dp_4"
                         android:onClick="@{click::open7}">
diff --git a/app/src/main/res/layout/activity_passwd.xml b/app/src/main/res/layout/activity_passwd.xml
index 2c243ab..2c7ec10 100644
--- a/app/src/main/res/layout/activity_passwd.xml
+++ b/app/src/main/res/layout/activity_passwd.xml
@@ -10,373 +10,352 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/gray">
+        android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/imageView5"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/icon_lock"
-            android:visibility="gone"
-            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.11" />
+            android:src="@drawable/wallpaper_land" />
 
         <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.35">
+            android:layout_height="match_parent">
 
-            <com.tuo.customview.VerificationCodeView
-                android:id="@+id/icv"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/sp_32"
-                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"
+            <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"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.06" />
 
-            <TextView
-                android:id="@+id/tv_hint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_16"
-                android:text=""
-                android:textColor="@color/black"
-                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"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_48"
-                android:layout_marginTop="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_48"
-                android:gravity="center"
-                android:maxLines="2"
-                android:minLines="2"
-                android:text="输入密码后添加应用到桌面"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                android:layout_marginTop="@dimen/dp_32"
+                app:layout_constraintTop_toBottomOf="@+id/imageView5">
+
+                <com.tuo.customview.VerificationCodeView
+                    android:id="@+id/icv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/sp_32"
+                    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_16"
+                    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="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_12"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/icv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_keyboard"
+                android:layout_width="@dimen/dp_220"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout5"
+                app:layout_constraintVertical_bias="0.4">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_1"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="1"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_2"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="2"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_3"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="3"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_4"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="4"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_5"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="5"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_6"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="6"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_7"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="7"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_8"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="8"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_9"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="9"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/bt_0"
+                            android:layout_width="@dimen/dp_56"
+                            android:layout_height="@dimen/dp_56"
+                            android:background="@drawable/bt_dialer_selector"
+                            android:gravity="center"
+                            android:text="0"
+                            android:textColor="@drawable/bt_dialer_color"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:id="@+id/tv_del"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="取消"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </LinearLayout>
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <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"
-            app:layout_constraintTop_toBottomOf="@+id/imageView5"
-            app:layout_constraintVertical_bias="0.8">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="1"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="2"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="3"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="4"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="5"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="6"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="7"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_8"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="8"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_9"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="9"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:id="@+id/bt_0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:minWidth="@dimen/dp_30"
-                        android:text="0"
-                        android:textColor="@drawable/bt_dialer_color"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_del"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_cancel"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ImageView
-                        android:id="@+id/bt_confirm"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:background="@drawable/bt_dialer_selector"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_8"
-                        android:src="@drawable/icon_dialer_confirm"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_user.xml b/app/src/main/res/layout/fragment_user.xml
index 7f965f3..308fdef 100644
--- a/app/src/main/res/layout/fragment_user.xml
+++ b/app/src/main/res/layout/fragment_user.xml
@@ -103,7 +103,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="2"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:onClick="@{click::openUser}"
                             android:visibility="visible">
 
@@ -167,7 +167,7 @@
                             android:layout_height="0dp"
                             android:layout_marginTop="@dimen/dp_9"
                             android:layout_weight="1"
-                            android:background="@drawable/user_box_bg_transparent"
+                            android:background="@drawable/user_box_bg"
                             android:visibility="visible">
 
                             <androidx.constraintlayout.widget.ConstraintLayout
@@ -451,48 +451,75 @@
                             android:id="@+id/cl_homework"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_marginTop="@dimen/dp_2"
+                            android:layout_marginEnd="@dimen/dp_6"
                             android:onClick="@{click::openHomework}"
                             android:visibility="visible">
 
-                            <TextView
-                                android:id="@+id/tv_date3"
-                                android:layout_width="wrap_content"
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:id="@+id/constraintLayout12"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:maxLines="1"
-                                android:text="2月14日 星期二"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_9"
                                 app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                app:layout_constraintTop_toTopOf="parent">
 
-                            <ImageView
-                                android:id="@+id/imageView14"
-                                android:layout_width="@dimen/dp_16"
-                                android:layout_height="@dimen/dp_16"
-                                android:adjustViewBounds="true"
-                                android:onClick="@{click::refreshHomework}"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/icon_homework_refresh"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
+                                <TextView
+                                    android:id="@+id/tv_date3"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="@dimen/dp_4"
+                                    android:maxLines="1"
+                                    android:text="2月14日 星期二"
+                                    android:textColor="@color/white"
+                                    android:textSize="@dimen/sp_9"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:id="@+id/imageView14"
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:adjustViewBounds="true"
+                                    android:layout_marginStart="@dimen/dp_8"
+                                    android:onClick="@{click::refreshHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_homework_refresh"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toEndOf="@+id/tv_date3"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="@dimen/dp_16"
+                                    android:layout_height="@dimen/dp_16"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::openHomework}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/user_more"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
 
                             <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/rv_homework"
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
+                                android:layout_marginTop="@dimen/dp_2"
                                 android:fadeScrollbars="false"
                                 android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3" />
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:id="@+id/ll_nodata"
                                 android:layout_width="match_parent"
                                 android:layout_height="0dp"
                                 android:fadeScrollbars="false"
-                                android:scrollbars="vertical"
                                 app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_date3">
+                                app:layout_constraintTop_toBottomOf="@+id/constraintLayout12">
 
                                 <ImageView
                                     android:id="@+id/imageView23"
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index be8656f..af8cd7d 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -10,7 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/item_homework_background"
-        android:padding="@dimen/dp_8"
+        android:paddingTop="@dimen/dp_8"
+        android:paddingEnd="@dimen/dp_16"
+        android:paddingStart="@dimen/dp_16"
+        android:paddingBottom="@dimen/dp_8"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -18,7 +21,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout11"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_20"
+            android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -29,8 +32,8 @@
                 android:layout_height="wrap_content"
                 android:maxLines="1"
                 android:text="暂时没有作业"
-                android:textColor="@color/black"
-                android:textSize="@dimen/sp_10"
+                android:textColor="@color/homework_title"
+                android:textSize="@dimen/sp_8"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -43,8 +46,8 @@
                 android:maxEms="8"
                 android:maxLines="1"
                 android:text="2024-09-12 17:57:42"
-                android:textColor="@color/gray_text"
-                android:textSize="@dimen/sp_8"
+                android:textColor="@color/homework_text"
+                android:textSize="@dimen/sp_7"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -57,18 +60,21 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             android:singleLine="true"
+            android:layout_marginTop="@dimen/dp_4"
             android:text="文字"
-            android:textColor="@color/gray_text"
-            android:textSize="@dimen/sp_8"
+            android:textColor="@color/homework_text"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="@dimen/dp_80"
+            android:textSize="@dimen/sp_6"
             app:layout_constraintTop_toBottomOf="@+id/constraintLayout11" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_pic"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_90"
-            android:layout_marginTop="@dimen/dp_8"
+            android:layout_marginTop="@dimen/dp_4"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_type" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bf9c68c..b76b382 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -46,4 +46,8 @@
     <color name="default_radio_color">#EFEFEF</color>
 
     <color name="user_name_color">#80000000</color>
+
+    <color name="homework_title">#3a3a3a</color>
+    <color name="homework_text">#646464</color>
+    <color name="unfinish_text">#ab9452</color>
 </resources>
diff --git a/verification-view/src/main/res/values/colors.xml b/verification-view/src/main/res/values/colors.xml
index 3290900..8e76477 100644
--- a/verification-view/src/main/res/values/colors.xml
+++ b/verification-view/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="circle_bg">#C6C5C5</color>
-    <color name="circle_f">#0480ff</color>
+    <color name="circle_bg">#4DFFFFFF</color>
+    <color name="circle_f">#B3FFFFFF</color>
 
 </resources>
\ No newline at end of file