From 08b6a0d6a89a969bede7c84262a1fbc278c7cba7 Mon Sep 17 00:00:00 2001
From: YunLei <waitshan@163.com>
Date: Tue, 15 Nov 2022 14:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=87=E6=8D=A2=E5=92=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   4 +
 app/build.gradle                              |   4 +-
 .../yzx/escreen/adapter/ChangeListAdapter.kt  |   2 +-
 .../yzx/escreen/adapter/HomeListAdapter.kt    |   4 +-
 .../yzx/escreen/adapter/VisitorListAdapter.kt |   2 +-
 .../yzx/escreen/fragment/ChangeFragment.kt    |  38 +-
 .../com/yzx/escreen/fragment/HomeFragment.kt  |  29 +-
 .../yzx/escreen/fragment/VisitorFragment.kt   |  38 +-
 .../yzx/escreen/fragment/base/BaseFragment.kt |   3 +-
 app/src/main/res/color/s_app_color_blue.xml   |   6 +
 .../res/color/s_app_color_gray2_to_blue.xml   |   6 +
 .../res/color/s_app_color_gray_to_blue.xml    |   6 +
 .../main/res/color/s_app_color_status_bg.xml  |   6 +
 .../res/color/s_app_color_status_border.xml   |   6 +
 .../res/color/s_app_color_status_text.xml     |   6 +
 app/src/main/res/drawable/ripple_water.xml    |   5 +
 app/src/main/res/drawable/s_app_btn_bule.xml  |   7 +
 app/src/main/res/layout/fragment_change.xml   | 481 ++++++++--------
 app/src/main/res/layout/fragment_home.xml     |  48 +-
 app/src/main/res/layout/fragment_visitor.xml  | 534 +++++++++---------
 .../main/res/layout/layout_change_table.xml   |   4 +-
 .../main/res/layout/layout_leave_table.xml    |   4 +-
 app/src/main/res/layout/layout_loading.xml    |   3 +-
 .../main/res/layout/layout_visitor_table.xml  |   4 +-
 app/src/main/res/values/colors.xml            |   2 +
 25 files changed, 688 insertions(+), 564 deletions(-)
 create mode 100644 app/src/main/res/color/s_app_color_blue.xml
 create mode 100644 app/src/main/res/color/s_app_color_gray2_to_blue.xml
 create mode 100644 app/src/main/res/color/s_app_color_gray_to_blue.xml
 create mode 100644 app/src/main/res/color/s_app_color_status_bg.xml
 create mode 100644 app/src/main/res/color/s_app_color_status_border.xml
 create mode 100644 app/src/main/res/color/s_app_color_status_text.xml
 create mode 100644 app/src/main/res/drawable/ripple_water.xml
 create mode 100644 app/src/main/res/drawable/s_app_btn_bule.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2fcbc16..97bec18 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,11 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/work/escreen/app/src/main/res/drawable/btn_select.xml" value="0.321" />
+        <entry key="..\:/work/escreen/app/src/main/res/drawable/ripple_water.xml" value="0.3255" />
+        <entry key="..\:/work/escreen/app/src/main/res/drawable/s_app_btn_bule.xml" value="0.161" />
+        <entry key="..\:/work/escreen/app/src/main/res/drawable/seekbar_bg.xml" value="0.2335" />
         <entry key="..\:/work/escreen/app/src/main/res/drawable/selector_btn_read_setting.xml" value="0.321" />
+        <entry key="..\:/work/escreen/app/src/main/res/drawable/selector_category_unload.xml" value="0.2335" />
         <entry key="..\:/work/escreen/app/src/main/res/drawable/shape_corner.xml" value="0.268" />
         <entry key="..\:/work/escreen/app/src/main/res/drawable/shape_corner_plain.xml" value="0.331" />
         <entry key="..\:/work/escreen/app/src/main/res/drawable/switch_ios_thumb.xml" value="0.372" />
diff --git a/app/build.gradle b/app/build.gradle
index 81a1260..d7f13cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
 //        minSdkVersion 26
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 18
-        versionName "2.1.3"
+        versionCode 20
+        versionName "2.1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 //        ndk {
diff --git a/app/src/main/java/com/yzx/escreen/adapter/ChangeListAdapter.kt b/app/src/main/java/com/yzx/escreen/adapter/ChangeListAdapter.kt
index b5cd395..446cfaa 100644
--- a/app/src/main/java/com/yzx/escreen/adapter/ChangeListAdapter.kt
+++ b/app/src/main/java/com/yzx/escreen/adapter/ChangeListAdapter.kt
@@ -17,7 +17,7 @@ class ChangeListAdapter(list: MutableList<StuChange>) :
     BaseQuickAdapter<StuChange, BaseViewHolder>(R.layout.layout_change_table, list) {
 
     init {
-        addChildClickViewIds(R.id.cancelBtn)
+        addChildClickViewIds(R.id.cancelBtn,R.id.faceEmpty)
     }
 
     @SuppressLint("SetTextI18n")
diff --git a/app/src/main/java/com/yzx/escreen/adapter/HomeListAdapter.kt b/app/src/main/java/com/yzx/escreen/adapter/HomeListAdapter.kt
index 752898f..3bb6498 100644
--- a/app/src/main/java/com/yzx/escreen/adapter/HomeListAdapter.kt
+++ b/app/src/main/java/com/yzx/escreen/adapter/HomeListAdapter.kt
@@ -17,7 +17,8 @@ class HomeListAdapter(list: MutableList<StuLeave>) :
     BaseQuickAdapter<StuLeave, BaseViewHolder>(R.layout.layout_leave_table, list) {
 
     init {
-        addChildClickViewIds(R.id.cancelBtn)
+        addChildClickViewIds(R.id.cancelBtn,R.id.faceEmpty)
+
     }
 
     @SuppressLint("SetTextI18n")
@@ -68,5 +69,6 @@ class HomeListAdapter(list: MutableList<StuLeave>) :
             holder.itemView.placeHolder.visibility = View.VISIBLE
             View.GONE
         }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt b/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt
index ce4abf2..ee29b4f 100644
--- a/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt
+++ b/app/src/main/java/com/yzx/escreen/adapter/VisitorListAdapter.kt
@@ -16,7 +16,7 @@ class VisitorListAdapter(list: MutableList<Visitor>) :
     BaseQuickAdapter<Visitor, BaseViewHolder>(R.layout.layout_visitor_table, list) {
 
     init {
-        addChildClickViewIds(R.id.cancelBtn)
+        addChildClickViewIds(R.id.faceEmpty,R.id.nucleinEmpty,R.id.tripCodeEmpty,R.id.healthCodeEmpty)
     }
 
     @SuppressLint("SetTextI18n", "Range")
diff --git a/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt
index dc0bc7e..cfc22a5 100644
--- a/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt
+++ b/app/src/main/java/com/yzx/escreen/fragment/ChangeFragment.kt
@@ -3,7 +3,6 @@ package com.yzx.escreen.fragment
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.text.Editable
 import android.text.TextWatcher
@@ -107,11 +106,19 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
 
         mAdapter.setOnItemChildClickListener { adapter, view, position ->
             LogUtils.d("setOnItemChildClickListener", position)
-            when (view.id) {
-                R.id.cancelBtn -> {
+            val curr = TimeUtils.getNowMills()
+            if(curr - lastClickTime > 500){
+                lastClickTime = curr
+                when (view.id) {
+                    R.id.cancelBtn -> {
 
+                    }
+                    R.id.faceEmpty -> {
+                        mPresenter?.getDetail(mAdapter.getItem(position).id)
+                    }
                 }
             }
+
         }
 
 
@@ -150,8 +157,18 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
         }
         btnRefresh.setOnClickListener {
             isRefresh = true
+            showLayoutLoading()
             initData()
         }
+        changeStatusBtn(0)
+    }
+
+    private fun showLayoutLoading(){
+        loadingLayout.visibility = View.VISIBLE
+    }
+
+    private fun hideLayoutLoading(){
+        loadingLayout.visibility = View.GONE
     }
 
 
@@ -170,15 +187,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
 
     private fun changeStatusBtn(idx: Int) {
         statusBtnList.forEachIndexed { index, button ->
-            if (index == idx) {
-                button.textColor = Color.parseColor("#ffffff")
-                button.setBackgroundColor(Color.parseColor("#3ca0e9"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#3ca0e9")))
-            } else {
-                button.textColor = Color.parseColor("#808080")
-                button.setBackgroundColor(Color.parseColor("#ffffff"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#dcdee0")))
-            }
+            button.isSelected = index == idx
         }
     }
 
@@ -193,6 +202,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
         } else {
             "${status}"
         }
+        showLayoutLoading()
         initData()
     }
 
@@ -252,6 +262,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
         if (mPager.page_no <= 1) {
         } else {
             isLoading = true
+            showLayoutLoading()
             mPresenter?.getList(mPager.page_no - 1, keyword, status)
         }
     }
@@ -264,6 +275,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
         if (mPager.page_no >= mPager.total_pages) {
         } else {
             isLoading = true
+            showLayoutLoading()
             mPresenter?.getList(mPager.page_no + 1, keyword, status)
         }
     }
@@ -297,6 +309,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
             }
             isLoading = false
             showEmpty(3)
+            hideLayoutLoading()
             pageTv.postDelayed({
                 refreshData()
             }, 30 * 1000)
@@ -321,6 +334,7 @@ class ChangeFragment : BaseFragment<ChangePresenter>(), ChangeView,
             toast("刷新失败，请重试！")
             isRefresh = false
         }
+        hideLayoutLoading()
         showEmpty(3)
     }
 
diff --git a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt
index 6da58f7..0fcdd4b 100644
--- a/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/yzx/escreen/fragment/HomeFragment.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.text.Editable
 import android.text.TextWatcher
@@ -134,6 +133,9 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
                         mCancelItem = mAdapter.getItem(position)
                         showCancelDialog()
                     }
+                    R.id.faceEmpty -> {
+                        mPresenter?.getDetail(mAdapter.getItem(position).id)
+                    }
                 }
             }
         }
@@ -177,8 +179,18 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
 
         btnRefresh.setOnClickListener {
             isRefresh = true
+            showLayoutLoading()
             initData()
         }
+        changeStatusBtn(0)
+    }
+    
+    private fun showLayoutLoading(){
+        loadingLayout.visibility = View.VISIBLE
+    }
+    
+    private fun hideLayoutLoading(){
+        loadingLayout.visibility = View.GONE 
     }
 
     @SuppressLint("SetTextI18n")
@@ -270,15 +282,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
 
     private fun changeStatusBtn(idx: Int) {
         statusBtnList.forEachIndexed { index, button ->
-            if (index == idx) {
-                button.textColor = Color.parseColor("#ffffff")
-                button.setBackgroundColor(Color.parseColor("#3ca0e9"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#3ca0e9")))
-            } else {
-                button.textColor = Color.parseColor("#808080")
-                button.setBackgroundColor(Color.parseColor("#ffffff"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#dcdee0")))
-            }
+            button.isSelected = index == idx
         }
     }
 
@@ -293,6 +297,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
         } else {
             "${status}"
         }
+        showLayoutLoading()
         initData()
     }
 
@@ -352,6 +357,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
         if (mPager.page_no <= 1) {
         } else {
             isLoading = true
+            showLayoutLoading()
             mPresenter?.getLeaveList(mPager.page_no - 1, keyword, status)
         }
     }
@@ -364,6 +370,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
         if (mPager.page_no >= mPager.total_pages) {
         } else {
             isLoading = true
+            showLayoutLoading()
             mPresenter?.getLeaveList(mPager.page_no + 1, keyword, status)
         }
     }
@@ -397,6 +404,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
             }
             isLoading = false
             showEmpty(3)
+            hideLayoutLoading()
             pageTv.postDelayed({
                 refreshData()
             }, 30 * 1000)
@@ -411,6 +419,7 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeView,
 
     override fun onLeaveListError(error: String) {
         isLoading = false
+        hideLayoutLoading()
         if(isRefresh){
             toast("刷新失败，请重试！")
             isRefresh = false
diff --git a/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt
index 98d8a0b..b1a83e5 100644
--- a/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt
+++ b/app/src/main/java/com/yzx/escreen/fragment/VisitorFragment.kt
@@ -3,7 +3,6 @@ package com.yzx.escreen.fragment
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.text.Editable
 import android.text.TextWatcher
@@ -97,6 +96,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
             keyword = ""
             keywordInput.setText("")
             KeyboardUtils.hideSoftInput(keywordInput)
+            showLayoutLoading()
             initData()
         }
         var lastClickTime = TimeUtils.getNowMills()
@@ -110,14 +110,20 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
 
         mAdapter.setOnItemChildClickListener { adapter, view, position ->
             LogUtils.d("setOnItemChildClickListener", position)
-            when (view.id) {
-                R.id.cancelBtn -> {
-
+            val curr = TimeUtils.getNowMills()
+            if (curr - lastClickTime > 500) {
+                lastClickTime = curr
+                when (view.id) {
+                    R.id.faceEmpty, R.id.nucleinEmpty, R.id.tripCodeEmpty, R.id.healthCodeEmpty -> {
+                        mPresenter?.getDetail(mAdapter.getItem(position).id)
+                    }
                 }
             }
+
         }
         btnRefresh.setOnClickListener {
             isRefresh = true
+            showLayoutLoading()
             initData()
         }
 
@@ -159,6 +165,15 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
         codeBtn.setOnClickListener {
             showVisitorQRCode()
         }
+        changeStatusBtn(0)
+    }
+
+    private fun showLayoutLoading(){
+        loadingLayout.visibility = View.VISIBLE
+    }
+
+    private fun hideLayoutLoading(){
+        loadingLayout.visibility = View.GONE
     }
 
     private fun showVisitorQRCode() {
@@ -187,15 +202,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
 
     private fun changeStatusBtn(idx: Int) {
         statusBtnList.forEachIndexed { index, button ->
-            if (index == idx) {
-                button.textColor = Color.parseColor("#ffffff")
-                button.setBackgroundColor(Color.parseColor("#3ca0e9"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#3ca0e9")))
-            } else {
-                button.textColor = Color.parseColor("#808080")
-                button.setBackgroundColor(Color.parseColor("#ffffff"))
-                button.setStrokeColors(ColorStateList.valueOf(Color.parseColor("#dcdee0")))
-            }
+            button.isSelected = index == idx
         }
     }
 
@@ -204,6 +211,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
         if (isLoading) {
             return
         }
+        showLayoutLoading()
         changeStatusBtn(index)
         this.status = "${status}"
         initData()
@@ -265,6 +273,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
         if (mPager.page_no <= 1) {
         } else {
             isLoading = true
+            hideLayoutLoading()
             mPresenter?.getList(mPager.page_no - 1, keyword, status)
         }
     }
@@ -277,6 +286,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
         if (mPager.page_no >= mPager.total_pages) {
         } else {
             isLoading = true
+            hideLayoutLoading()
             mPresenter?.getList(mPager.page_no + 1, keyword, status)
         }
     }
@@ -310,6 +320,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
             }
             isLoading = false
             showEmpty(3)
+            hideLayoutLoading()
             pageTv.postDelayed({
                 refreshData()
             }, 30 * 1000)
@@ -334,6 +345,7 @@ class VisitorFragment : BaseFragment<VisitorPresenter>(), VisitorView,
             toast("刷新失败，请重试！")
             isRefresh = false
         }
+        hideLayoutLoading()
         showEmpty(3)
     }
 
diff --git a/app/src/main/java/com/yzx/escreen/fragment/base/BaseFragment.kt b/app/src/main/java/com/yzx/escreen/fragment/base/BaseFragment.kt
index aed0751..426da64 100644
--- a/app/src/main/java/com/yzx/escreen/fragment/base/BaseFragment.kt
+++ b/app/src/main/java/com/yzx/escreen/fragment/base/BaseFragment.kt
@@ -9,7 +9,6 @@ import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog
 import com.yzx.escreen.presenter.base.BasePresenter
 import com.yzx.escreen.utils.hideNavigationBar
-import org.greenrobot.eventbus.EventBus
 
 /**
  * fragment 基类
@@ -86,7 +85,7 @@ abstract class BaseFragment<out P : BasePresenter<*>> : Fragment() {
         }, duration)
     }
 
-    fun showLoading(msg: String = "加载中") {
+    fun showLoading(msg: String = "加载中...") {
         mLoadingDialog = QMUITipDialog.Builder(activity)
             .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
             .setTipWord(msg)
diff --git a/app/src/main/res/color/s_app_color_blue.xml b/app/src/main/res/color/s_app_color_blue.xml
new file mode 100644
index 0000000..67a1661
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorPrimary88" android:state_enabled="false"/>
+    <item android:color="@color/colorPrimary88" android:state_pressed="true"/>
+    <item android:color="@color/colorPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/s_app_color_gray2_to_blue.xml b/app/src/main/res/color/s_app_color_gray2_to_blue.xml
new file mode 100644
index 0000000..467de3c
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_gray2_to_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorPrimary" android:state_enabled="false"/>
+    <item android:color="@color/colorPrimary" android:state_pressed="true"/>
+    <item android:color="@color/colorGrayBorder"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/s_app_color_gray_to_blue.xml b/app/src/main/res/color/s_app_color_gray_to_blue.xml
new file mode 100644
index 0000000..297e5d1
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_gray_to_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorPrimary" android:state_enabled="false"/>
+    <item android:color="@color/colorPrimary" android:state_pressed="true"/>
+    <item android:color="@color/gray_80"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/s_app_color_status_bg.xml b/app/src/main/res/color/s_app_color_status_bg.xml
new file mode 100644
index 0000000..4459290
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_status_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorPrimary" android:state_selected="true"/>
+    <item android:color="@color/white" android:state_pressed="true"/>
+    <item android:color="@color/white"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/s_app_color_status_border.xml b/app/src/main/res/color/s_app_color_status_border.xml
new file mode 100644
index 0000000..859d7c1
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_status_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorPrimary" android:state_selected="true"/>
+    <item android:color="@color/colorPrimary" android:state_pressed="true"/>
+    <item android:color="@color/colorGrayBorder"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/s_app_color_status_text.xml b/app/src/main/res/color/s_app_color_status_text.xml
new file mode 100644
index 0000000..8d58d8e
--- /dev/null
+++ b/app/src/main/res/color/s_app_color_status_text.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_selected="true"/>
+    <item android:color="@color/colorPrimary88" android:state_pressed="true"/>
+    <item android:color="@color/colorBlack80"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple_water.xml b/app/src/main/res/drawable/ripple_water.xml
new file mode 100644
index 0000000..0fca801
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_water.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/gray_2"><!--点击时波纹的颜色-->
+    <item android:drawable="@android:color/white" /> <!--未点击时控件的背景（可以是图片，可以是颜色，也可以是drawable里的xml背景（比如圆角））-->
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/s_app_btn_bule.xml b/app/src/main/res/drawable/s_app_btn_bule.xml
new file mode 100644
index 0000000..5499b25
--- /dev/null
+++ b/app/src/main/res/drawable/s_app_btn_bule.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"
+        android:drawable="@color/colorPrimary88"/>
+    <item android:drawable="@color/colorPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_change.xml b/app/src/main/res/layout/fragment_change.xml
index 5c2b34a..888fae3 100644
--- a/app/src/main/res/layout/fragment_change.xml
+++ b/app/src/main/res/layout/fragment_change.xml
@@ -1,277 +1,288 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundColor"
-    android:orientation="vertical"
     tools:context=".fragment.ChangeFragment">
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="30dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="学生学籍异动列表"
-            android:textColor="@color/black"
-            android:textSize="@dimen/d_28"
-            android:textStyle="bold" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <com.yzx.escreen.widget.TimeView
-            android:id="@+id/timeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/filterLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_40"
-        android:paddingVertical="30dp">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/d_10"
-            android:paddingEnd="@dimen/dp_10"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="#dcdee0"
-            app:qmui_borderWidth="1px"
-            app:qmui_radius="@dimen/d_30">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/d_25"
-                android:layout_height="@dimen/d_25"
-                android:src="@mipmap/search" />
-
-            <EditText
-                android:id="@+id/keywordInput"
-                android:layout_width="300dp"
-                android:layout_height="60dp"
-                android:background="@color/transparent"
-                android:hint="输入学生姓名"
-                android:imeOptions="actionSearch"
-                android:maxLength="5"
-                android:padding="@dimen/d_5"
-                android:paddingTop="@dimen/d_5"
-                android:paddingBottom="@dimen/d_5"
-                android:singleLine="true"
-                android:textColorHint="#8e8e8e"
-                android:textSize="@dimen/sp20" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/clearBtn"
-                android:layout_width="@dimen/d_25"
-                android:layout_height="@dimen/d_25"
-                android:src="@mipmap/ic_clear"
-                android:visibility="invisible" />
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/allBtn"
-            style="@style/home_status_btn"
-            android:layout_marginStart="50dp"
-            android:text="全部"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="#3ca0e9"
-            app:qmui_borderColor="@color/colorPrimary" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status1Btn"
-            style="@style/home_status_btn"
-            android:text="待处理"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status2Btn"
-            style="@style/home_status_btn"
-            android:text="已确认"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status3Btn"
-            style="@style/home_status_btn"
-            android:text="已拒绝"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1px"
-            android:layout_weight="1" />
-
-        <Switch
-            android:id="@+id/switchBtn"
-            android:layout_width="48dp"
-            android:layout_height="@dimen/d_28"
-            android:checked="true"
-            android:thumb="@drawable/switch_ios_thumb"
-            android:track="@drawable/switch_ios_track_selector"
-            tools:ignore="UseSwitchCompatOrMaterialXml" />
-
-        <TextView
-            android:id="@+id/switchBtnTxt"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/d_28"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/d_10"
-            android:gravity="center"
-            android:text="自动弹出异动单"
-            android:textColor="#53a051" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/white"
+        android:layout_height="match_parent"
+        android:background="@color/backgroundColor"
         android:orientation="vertical"
-        android:paddingStart="@dimen/dp_10"
-        android:paddingEnd="@dimen/dp_10">
+        tools:context=".fragment.ChangeFragment">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center_vertical"
             android:orientation="horizontal"
-            android:paddingTop="@dimen/d_20"
-            android:paddingBottom="@dimen/d_20">
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1.5"
-                android:paddingStart="@dimen/dp_40"
-                android:text="异动学生" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="人脸" />
+            android:padding="30dp">
 
             <TextView
-                style="@style/table_header"
-                android:layout_weight="3"
-                android:text="班级" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="类型" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="4"
-                android:text="时间" />
-
-
-            <TextView
-                style="@style/table_header"
-                android:text="异动单状态" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="学生学籍异动列表"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_28"
+                android:textStyle="bold" />
 
-            <TextView
-                style="@style/table_header"
-                android:text="发起时间" />
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
 
-            <TextView
-                style="@style/table_header"
-                android:text="发起人" />
+            <com.yzx.escreen.widget.TimeView
+                android:id="@+id/timeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/backgroundColor" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="5"
-            tools:listitem="@layout/layout_change_table" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/backgroundColor" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/filterLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_40"
-            android:paddingVertical="@dimen/d_20">
+            android:paddingVertical="30dp">
 
-            <TextView
-                android:id="@+id/totalTv"
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="共0条数据"
-                android:textSize="@dimen/sp18" />
-
-            <TextView
-                android:id="@+id/btnRefresh"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorPrimary"
-                android:text="刷新数据"
-                android:layout_marginStart="@dimen/d_20"
-                android:textSize="@dimen/sp18"/>
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/d_10"
+                android:paddingEnd="@dimen/dp_10"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="#dcdee0"
+                app:qmui_borderWidth="1px"
+                app:qmui_radius="@dimen/d_30">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/d_25"
+                    android:layout_height="@dimen/d_25"
+                    android:src="@mipmap/search" />
+
+                <EditText
+                    android:id="@+id/keywordInput"
+                    android:layout_width="300dp"
+                    android:layout_height="60dp"
+                    android:background="@color/transparent"
+                    android:hint="输入学生姓名"
+                    android:imeOptions="actionSearch"
+                    android:maxLength="5"
+                    android:padding="@dimen/d_5"
+                    android:paddingTop="@dimen/d_5"
+                    android:paddingBottom="@dimen/d_5"
+                    android:singleLine="true"
+                    android:textColorHint="#8e8e8e"
+                    android:textSize="@dimen/sp20" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/clearBtn"
+                    android:layout_width="@dimen/d_25"
+                    android:layout_height="@dimen/d_25"
+                    android:src="@mipmap/ic_clear"
+                    android:visibility="invisible" />
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/allBtn"
+                style="@style/home_status_btn"
+                android:layout_marginStart="50dp"
+                android:text="全部"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status1Btn"
+                style="@style/home_status_btn"
+                android:text="待处理"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status2Btn"
+                style="@style/home_status_btn"
+                android:text="已确认"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status3Btn"
+                style="@style/home_status_btn"
+                android:text="已拒绝"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <View
                 android:layout_width="0dp"
                 android:layout_height="1px"
                 android:layout_weight="1" />
 
-            <TextView
-                android:id="@+id/preTxtBtn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="上一页"
-                android:textColor="#3ca0e9"
-                android:textSize="@dimen/sp18" />
+            <Switch
+                android:id="@+id/switchBtn"
+                android:layout_width="48dp"
+                android:layout_height="@dimen/d_28"
+                android:checked="true"
+                android:thumb="@drawable/switch_ios_thumb"
+                android:track="@drawable/switch_ios_track_selector"
+                tools:ignore="UseSwitchCompatOrMaterialXml" />
 
             <TextView
-                android:id="@+id/pageTv"
+                android:id="@+id/switchBtnTxt"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/d_20"
-                android:paddingEnd="@dimen/d_20"
-                android:text="0/0"
-                android:textColor="#333"
-                android:textSize="@dimen/sp18" />
+                android:layout_height="@dimen/d_28"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/d_10"
+                android:gravity="center"
+                android:text="自动弹出异动单"
+                android:textColor="#53a051" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <TextView
-                android:id="@+id/nextTxtBtn"
-                android:layout_width="wrap_content"
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="下一页"
-                android:textColor="#3ca0e9"
-                android:textSize="@dimen/sp18" />
+                android:orientation="horizontal"
+                android:paddingTop="@dimen/d_20"
+                android:paddingBottom="@dimen/d_20">
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1.5"
+                    android:paddingStart="@dimen/dp_40"
+                    android:text="异动学生" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="人脸" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="3"
+                    android:text="班级" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="类型" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="4"
+                    android:text="时间" />
+
+
+                <TextView
+                    style="@style/table_header"
+                    android:text="异动单状态" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:text="发起时间" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:text="发起人" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/backgroundColor" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="5"
+                tools:listitem="@layout/layout_change_table" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/backgroundColor" />
 
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="@dimen/dp_40"
+                android:paddingVertical="@dimen/d_20">
+
+                <TextView
+                    android:id="@+id/totalTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="共0条数据"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/btnRefresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/d_20"
+                    android:text="刷新数据"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="@dimen/sp18" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1px"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/preTxtBtn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="上一页"
+                    android:textColor="#3ca0e9"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/pageTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/d_20"
+                    android:paddingEnd="@dimen/d_20"
+                    android:text="0/0"
+                    android:textColor="#333"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/nextTxtBtn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="下一页"
+                    android:textColor="#3ca0e9"
+                    android:textSize="@dimen/sp18" />
+
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.appcompat.widget.LinearLayoutCompat>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+
+    <include
+        android:id="@+id/loadingLayout"
+        layout="@layout/layout_loading"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5c731f2..574380e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -37,7 +37,7 @@
             <com.yzx.escreen.widget.TimeView
                 android:id="@+id/timeView"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
 
@@ -93,49 +93,49 @@
                 style="@style/home_status_btn"
                 android:layout_marginStart="50dp"
                 android:text="全部"
-                android:textColor="@color/white"
-                app:qmui_backgroundColor="#3ca0e9"
-                app:qmui_borderColor="@color/colorPrimary" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/status1Btn"
                 style="@style/home_status_btn"
                 android:text="待处理"
-                android:textColor="@color/gray_80"
-                app:qmui_backgroundColor="#fff"
-                app:qmui_borderColor="#dcdee0" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/status2Btn"
                 style="@style/home_status_btn"
                 android:text="已确认"
-                android:textColor="@color/gray_80"
-                app:qmui_backgroundColor="#fff"
-                app:qmui_borderColor="#dcdee0" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/status3Btn"
                 style="@style/home_status_btn"
                 android:text="已拒绝"
-                android:textColor="@color/gray_80"
-                app:qmui_backgroundColor="#fff"
-                app:qmui_borderColor="#dcdee0" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/status4Btn"
                 style="@style/home_status_btn"
                 android:text="正常销假"
-                android:textColor="@color/gray_80"
-                app:qmui_backgroundColor="#fff"
-                app:qmui_borderColor="#dcdee0" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                 android:id="@+id/status5Btn"
                 style="@style/home_status_btn"
                 android:text="超时销假"
-                android:textColor="@color/gray_80"
-                app:qmui_backgroundColor="#fff"
-                app:qmui_borderColor="#dcdee0" />
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <View
                 android:layout_width="0dp"
@@ -262,10 +262,10 @@
                     android:id="@+id/btnRefresh"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/colorPrimary"
-                    android:text="刷新数据"
                     android:layout_marginStart="@dimen/d_20"
-                    android:textSize="@dimen/sp18"/>
+                    android:text="刷新数据"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="@dimen/sp18" />
 
                 <View
                     android:layout_width="0dp"
@@ -302,4 +302,8 @@
             </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <include layout="@layout/layout_loading"
+        android:visibility="gone"
+        android:id="@+id/loadingLayout"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_visitor.xml b/app/src/main/res/layout/fragment_visitor.xml
index 391e3c2..6eb0535 100644
--- a/app/src/main/res/layout/fragment_visitor.xml
+++ b/app/src/main/res/layout/fragment_visitor.xml
@@ -1,304 +1,316 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundColor"
-    android:orientation="vertical"
-    tools:context=".fragment.ChangeFragment">
+    tools:context=".fragment.HomeFragment">
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="30dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="访客管理"
-            android:textColor="@color/black"
-            android:textSize="@dimen/d_28"
-            android:textStyle="bold" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1" />
-
-        <com.yzx.escreen.widget.TimeView
-            android:id="@+id/timeView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/filterLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/dp_40"
-        android:paddingVertical="30dp">
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/d_10"
-            android:paddingEnd="@dimen/dp_10"
-            app:qmui_backgroundColor="@color/white"
-            app:qmui_borderColor="#dcdee0"
-            app:qmui_borderWidth="1px"
-            app:qmui_radius="@dimen/d_30">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/d_25"
-                android:layout_height="@dimen/d_25"
-                android:src="@mipmap/search" />
-
-            <EditText
-                android:id="@+id/keywordInput"
-                android:layout_width="300dp"
-                android:layout_height="60dp"
-                android:background="@color/transparent"
-                android:hint="输入访客姓名"
-                android:imeOptions="actionSearch"
-                android:maxLength="5"
-                android:padding="@dimen/d_5"
-                android:paddingTop="@dimen/d_5"
-                android:paddingBottom="@dimen/d_5"
-                android:singleLine="true"
-                android:textColorHint="#8e8e8e"
-                android:textSize="@dimen/sp20" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/clearBtn"
-                android:layout_width="@dimen/d_25"
-                android:layout_height="@dimen/d_25"
-                android:src="@mipmap/ic_clear"
-                android:visibility="invisible" />
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/allBtn"
-            style="@style/home_status_btn"
-            android:layout_marginStart="50dp"
-            android:text="全部"
-            android:textColor="@color/white"
-            app:qmui_backgroundColor="#3ca0e9"
-            app:qmui_borderColor="@color/colorPrimary" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status1Btn"
-            style="@style/home_status_btn"
-            android:text="待审核"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status2Btn"
-            style="@style/home_status_btn"
-            android:text="可通行"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status3Btn"
-            style="@style/home_status_btn"
-            android:text="审核拒绝"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/status4Btn"
-            style="@style/home_status_btn"
-            android:text="已失效"
-            android:textColor="@color/gray_80"
-            app:qmui_backgroundColor="#fff"
-            app:qmui_borderColor="#dcdee0" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1px"
-            android:layout_weight="1" />
-
-        <Switch
-            android:id="@+id/switchBtn"
-            android:layout_width="48dp"
-            android:layout_height="@dimen/d_28"
-            android:checked="true"
-            android:thumb="@drawable/switch_ios_thumb"
-            android:track="@drawable/switch_ios_track_selector"
-            tools:ignore="UseSwitchCompatOrMaterialXml"
-            android:visibility="gone"/>
-
-        <TextView
-            android:id="@+id/switchBtnTxt"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/d_28"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/d_10"
-            android:gravity="center"
-            android:text="自动弹出请假单"
-            android:textColor="#53a051"
-            android:visibility="gone"/>
-
-        <TextView
-            android:id="@+id/codeBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/d_28"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/d_10"
-            android:gravity="center"
-            android:text="访客申请二维码"
-            android:textColor="#3c7ef6"/>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/white"
+        android:layout_height="match_parent"
+        android:background="@color/backgroundColor"
         android:orientation="vertical"
-        android:paddingStart="@dimen/dp_10"
-        android:paddingEnd="@dimen/dp_10">
+        tools:context=".fragment.VisitorFragment">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center_vertical"
             android:orientation="horizontal"
-            android:paddingTop="@dimen/d_20"
-            android:paddingBottom="@dimen/d_20">
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="0.6"
-                android:paddingStart="@dimen/dp_40"
-                android:text="姓名" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="0.6"
-                android:text="人脸" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="健康码" />
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="行程码" />
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1.5"
-                android:text="核酸报告" />
-
-
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="是否驾车" />
+            android:padding="30dp">
 
             <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="接待人" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="访客管理"
+                android:textColor="@color/black"
+                android:textSize="@dimen/d_28"
+                android:textStyle="bold" />
 
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="状态" />
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
 
-            <TextView
-                style="@style/table_header"
-                android:layout_weight="1"
-                android:text="申请时间" />
+            <com.yzx.escreen.widget.TimeView
+                android:id="@+id/timeView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/backgroundColor" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="5"
-            tools:listitem="@layout/layout_visitor_table" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/backgroundColor" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/filterLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
             android:paddingHorizontal="@dimen/dp_40"
-            android:paddingVertical="@dimen/d_20">
+            android:paddingVertical="30dp">
 
-            <TextView
-                android:id="@+id/totalTv"
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="共0条数据"
-                android:textSize="@dimen/sp18" />
-
-            <TextView
-                android:id="@+id/btnRefresh"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorPrimary"
-                android:text="刷新数据"
-                android:layout_marginStart="@dimen/d_20"
-                android:textSize="@dimen/sp18"/>
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/d_10"
+                android:paddingEnd="@dimen/dp_10"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="#dcdee0"
+                app:qmui_borderWidth="1px"
+                app:qmui_radius="@dimen/d_30">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/d_25"
+                    android:layout_height="@dimen/d_25"
+                    android:src="@mipmap/search" />
+
+                <EditText
+                    android:id="@+id/keywordInput"
+                    android:layout_width="300dp"
+                    android:layout_height="60dp"
+                    android:background="@color/transparent"
+                    android:hint="输入访客姓名"
+                    android:imeOptions="actionSearch"
+                    android:maxLength="5"
+                    android:padding="@dimen/d_5"
+                    android:paddingTop="@dimen/d_5"
+                    android:paddingBottom="@dimen/d_5"
+                    android:singleLine="true"
+                    android:textColorHint="#8e8e8e"
+                    android:textSize="@dimen/sp20" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/clearBtn"
+                    android:layout_width="@dimen/d_25"
+                    android:layout_height="@dimen/d_25"
+                    android:src="@mipmap/ic_clear"
+                    android:visibility="invisible" />
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/allBtn"
+                style="@style/home_status_btn"
+                android:layout_marginStart="50dp"
+                android:text="全部"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status1Btn"
+                style="@style/home_status_btn"
+                android:text="待审核"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status2Btn"
+                style="@style/home_status_btn"
+                android:text="可通行"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status3Btn"
+                style="@style/home_status_btn"
+                android:text="审核拒绝"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/status4Btn"
+                style="@style/home_status_btn"
+                android:text="已失效"
+                android:textColor="@color/s_app_color_status_text"
+                app:qmui_backgroundColor="@color/s_app_color_status_bg"
+                app:qmui_borderColor="@color/s_app_color_status_border" />
 
             <View
                 android:layout_width="0dp"
                 android:layout_height="1px"
                 android:layout_weight="1" />
 
-            <TextView
-                android:id="@+id/preTxtBtn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="上一页"
-                android:textColor="#3ca0e9"
-                android:textSize="@dimen/sp18" />
+            <Switch
+                android:id="@+id/switchBtn"
+                android:layout_width="48dp"
+                android:layout_height="@dimen/d_28"
+                android:checked="true"
+                android:thumb="@drawable/switch_ios_thumb"
+                android:track="@drawable/switch_ios_track_selector"
+                android:visibility="gone"
+                tools:ignore="UseSwitchCompatOrMaterialXml" />
 
             <TextView
-                android:id="@+id/pageTv"
+                android:id="@+id/switchBtnTxt"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/d_20"
-                android:paddingEnd="@dimen/d_20"
-                android:text="0/0"
-                android:textColor="#333"
-                android:textSize="@dimen/sp18" />
+                android:layout_height="@dimen/d_28"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/d_10"
+                android:gravity="center"
+                android:text="自动弹出请假单"
+                android:textColor="#53a051"
+                android:visibility="gone" />
 
             <TextView
-                android:id="@+id/nextTxtBtn"
+                android:id="@+id/codeBtn"
                 android:layout_width="wrap_content"
+                android:layout_height="@dimen/d_28"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/d_10"
+                android:gravity="center"
+                android:text="访客申请二维码"
+                android:textColor="#3c7ef6" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="下一页"
-                android:textColor="#3ca0e9"
-                android:textSize="@dimen/sp18" />
+                android:orientation="horizontal"
+                android:paddingTop="@dimen/d_20"
+                android:paddingBottom="@dimen/d_20">
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="0.6"
+                    android:paddingStart="@dimen/dp_40"
+                    android:text="姓名" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="0.6"
+                    android:text="人脸" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="健康码" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="行程码" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1.5"
+                    android:text="核酸报告" />
+
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="是否驾车" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="接待人" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="状态" />
+
+                <TextView
+                    style="@style/table_header"
+                    android:layout_weight="1"
+                    android:text="申请时间" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/backgroundColor" />
 
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="5"
+                tools:listitem="@layout/layout_visitor_table" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/backgroundColor" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="@dimen/dp_40"
+                android:paddingVertical="@dimen/d_20">
+
+                <TextView
+                    android:id="@+id/totalTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="共0条数据"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/btnRefresh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/d_20"
+                    android:text="刷新数据"
+                    android:textColor="@color/colorPrimary"
+                    android:textSize="@dimen/sp18" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1px"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/preTxtBtn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="上一页"
+                    android:textColor="#3ca0e9"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/pageTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/d_20"
+                    android:paddingEnd="@dimen/d_20"
+                    android:text="0/0"
+                    android:textColor="#333"
+                    android:textSize="@dimen/sp18" />
+
+                <TextView
+                    android:id="@+id/nextTxtBtn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="下一页"
+                    android:textColor="#3ca0e9"
+                    android:textSize="@dimen/sp18" />
+
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.appcompat.widget.LinearLayoutCompat>
-    </androidx.appcompat.widget.LinearLayoutCompat>
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+
+    <include
+        android:id="@+id/loadingLayout"
+        layout="@layout/layout_loading"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_change_table.xml b/app/src/main/res/layout/layout_change_table.xml
index 43ed2fe..12587b8 100644
--- a/app/src/main/res/layout/layout_change_table.xml
+++ b/app/src/main/res/layout/layout_change_table.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:clickable="true"
+    android:background="@drawable/ripple_water">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_leave_table.xml b/app/src/main/res/layout/layout_leave_table.xml
index 53187fd..54244c6 100644
--- a/app/src/main/res/layout/layout_leave_table.xml
+++ b/app/src/main/res/layout/layout_leave_table.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:clickable="true"
+    android:background="@drawable/ripple_water">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_loading.xml b/app/src/main/res/layout/layout_loading.xml
index f0d788c..9942419 100644
--- a/app/src/main/res/layout/layout_loading.xml
+++ b/app/src/main/res/layout/layout_loading.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="#33ffffff">
 
     <com.qmuiteam.qmui.widget.QMUIEmptyView
         android:id="@+id/QMUIEmptyView"
diff --git a/app/src/main/res/layout/layout_visitor_table.xml b/app/src/main/res/layout/layout_visitor_table.xml
index 5737293..028dc54 100644
--- a/app/src/main/res/layout/layout_visitor_table.xml
+++ b/app/src/main/res/layout/layout_visitor_table.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:clickable="true"
+    android:background="@drawable/ripple_water">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5c662e3..4b06e85 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#3ca0e9</color>
+    <color name="colorPrimary88">#883ca0e9</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
     <color name="white">#FFFFFF</color>
@@ -28,6 +29,7 @@
     <color name="transparent">@android:color/transparent</color>
     <color name="nb.theme.background">@color/white</color>
     <color name="dialog_bg">#88000000</color>
+    <color name="colorGrayBorder">#dcdee0</color>
 
 
     <!--common-->