diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 815261d..a8a00af 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_search_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 815261d..a8a00af 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_search_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/item_capability_rv_l.xml b/app/src/main/res/layout/item_capability_rv_l.xml
index 02451f2..ed5b810 100644
--- a/app/src/main/res/layout/item_capability_rv_l.xml
+++ b/app/src/main/res/layout/item_capability_rv_l.xml
@@ -17,18 +17,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="继电器保护"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" - " />
+            android:text=" - "
+            android:textColor="@color/black" />
 
         <TextView
             android:id="@+id/categoryView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="电学"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 815261d..a8a00af 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_search_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/item_capability_rv_l.xml b/app/src/main/res/layout/item_capability_rv_l.xml
index 02451f2..ed5b810 100644
--- a/app/src/main/res/layout/item_capability_rv_l.xml
+++ b/app/src/main/res/layout/item_capability_rv_l.xml
@@ -17,18 +17,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="继电器保护"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" - " />
+            android:text=" - "
+            android:textColor="@color/black" />
 
         <TextView
             android:id="@+id/categoryView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="电学"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_standard_device_rv_l.xml b/app/src/main/res/layout/item_standard_device_rv_l.xml
index 8d3b979..0f6bdfe 100644
--- a/app/src/main/res/layout/item_standard_device_rv_l.xml
+++ b/app/src/main/res/layout/item_standard_device_rv_l.xml
@@ -1,47 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_55"
-    android:gravity="center_vertical"
-    android:paddingHorizontal="@dimen/dp_5">
+    android:layout_height="@dimen/dp_100"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_7">
 
-    <TextView
-        android:id="@+id/deviceNameView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="测量设备&amp;测量工装"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="测量设备"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_14" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="在用"
+            android:textColor="@color/green"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/green"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/transmitRangeView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="国家级"
+            android:textColor="@color/themeColor"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/themeColor"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/measureMajorView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="电离辐射"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_12"
+            app:qmui_backgroundColor="@color/red"
+            app:qmui_borderWidth="0dp"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/deviceCodeView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.5"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="gdzc202301290002"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_5"
+        android:text="装置编号：gdzc202301290002"
+        android:textColor="@color/gray"
         android:textSize="@dimen/sp_12" />
 
-    <TextView
-        android:id="@+id/deviceDateView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="2023-01-04 00:00:00"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/deviceLibView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="徐州分中心"
-        android:textSize="@dimen/sp_12" />
+        <TextView
+            android:id="@+id/remarkView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="备注：无"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceLibView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="特种实验室"
+            android:textColor="@color/blue"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/blue"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <TextView
+            android:id="@+id/deviceDateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="有效期至：2023-01-04 00:00:00"
+            android:textColor="@color/red"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/labOwnerView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:text="管理员：李亚光"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 815261d..a8a00af 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_search_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/item_capability_rv_l.xml b/app/src/main/res/layout/item_capability_rv_l.xml
index 02451f2..ed5b810 100644
--- a/app/src/main/res/layout/item_capability_rv_l.xml
+++ b/app/src/main/res/layout/item_capability_rv_l.xml
@@ -17,18 +17,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="继电器保护"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" - " />
+            android:text=" - "
+            android:textColor="@color/black" />
 
         <TextView
             android:id="@+id/categoryView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="电学"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_standard_device_rv_l.xml b/app/src/main/res/layout/item_standard_device_rv_l.xml
index 8d3b979..0f6bdfe 100644
--- a/app/src/main/res/layout/item_standard_device_rv_l.xml
+++ b/app/src/main/res/layout/item_standard_device_rv_l.xml
@@ -1,47 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_55"
-    android:gravity="center_vertical"
-    android:paddingHorizontal="@dimen/dp_5">
+    android:layout_height="@dimen/dp_100"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_7">
 
-    <TextView
-        android:id="@+id/deviceNameView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="测量设备&amp;测量工装"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="测量设备"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_14" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="在用"
+            android:textColor="@color/green"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/green"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/transmitRangeView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="国家级"
+            android:textColor="@color/themeColor"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/themeColor"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/measureMajorView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="电离辐射"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_12"
+            app:qmui_backgroundColor="@color/red"
+            app:qmui_borderWidth="0dp"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/deviceCodeView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.5"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="gdzc202301290002"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_5"
+        android:text="装置编号：gdzc202301290002"
+        android:textColor="@color/gray"
         android:textSize="@dimen/sp_12" />
 
-    <TextView
-        android:id="@+id/deviceDateView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="2023-01-04 00:00:00"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/deviceLibView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="徐州分中心"
-        android:textSize="@dimen/sp_12" />
+        <TextView
+            android:id="@+id/remarkView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="备注：无"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceLibView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="特种实验室"
+            android:textColor="@color/blue"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/blue"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <TextView
+            android:id="@+id/deviceDateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="有效期至：2023-01-04 00:00:00"
+            android:textColor="@color/red"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/labOwnerView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:text="管理员：李亚光"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e4cca23..99df98d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="sp_18">18sp</dimen>
     <dimen name="sp_20">20sp</dimen>
     <dimen name="sp_22">22sp</dimen>
-    <dimen name="sp_24">24sp</dimen>
 
     <!--控件边距-->
     <dimen name="dp_1">1dp</dimen>

diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index 0be3a76..44e1ad8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -134,10 +134,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index c59a147..2dcb850 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -141,10 +141,33 @@
                                 position: Int,
                                 item: StandardDeviceListModel.DataModel.RowsModel
                             ) {
+                                val transmitRange = if (item.transmitRangeName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.transmitRangeName
+                                }
+
+                                val remark = if (item.remark.isNullOrBlank()) {
+                                    "无"
+                                } else {
+                                    item.remark
+                                }
+
+                                val lab = if (item.standardLaboratoryName.isNullOrBlank()) {
+                                    "未知"
+                                } else {
+                                    item.standardLaboratoryName
+                                }
+
                                 viewHolder.setText(R.id.deviceNameView, item.standardName)
-                                    .setText(R.id.deviceCodeView, item.standardNo)
-                                    .setText(R.id.deviceDateView, item.preparationDate)
-                                    .setText(R.id.deviceLibView, item.standardLaboratoryName)
+                                    .setText(R.id.deviceStateView, item.managerStateName)
+                                    .setText(R.id.transmitRangeView, transmitRange)
+                                    .setText(R.id.measureMajorView, item.measureMajorName)
+                                    .setText(R.id.deviceCodeView, "装置编号：${item.standardNo}")
+                                    .setText(R.id.remarkView, "备注：$remark")
+                                    .setText(R.id.deviceLibView, lab)
+                                    .setText(R.id.deviceDateView, "有效期至：${item.validTime}")
+                                    .setText(R.id.labOwnerView, "管理员：${item.laboratoryOwnerName}")
                             }
                         }
                         standardDeviceRecyclerView.addItemDecoration(
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index c7546e4..0000000
--- a/app/src/main/res/drawable/ic_about.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index 32980a2..0000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M900.33,858.62L124.24,858.62c-15.78,0 -28.74,-12.96 -28.74,-28.74L95.49,194.69c0,-15.78 12.96,-28.74 28.74,-28.74h776.09c15.78,0 28.74,12.96 28.74,28.74v635.19c0,15.78 -12.96,28.74 -28.74,28.74zM152.98,801.13h718.6v-577.7h-718.6v577.7z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M372.79,516.51c-65.38,0 -118.92,-53.54 -118.92,-118.92 0,-65.38 53.54,-118.92 118.92,-118.92 65.38,0 118.92,53.54 118.92,118.92 0,65.38 -53.54,118.92 -118.92,118.92zM372.79,329.95c-37.2,0 -67.63,30.43 -67.63,67.63s30.43,67.63 67.63,67.63 67.63,-30.43 67.63,-67.63 -30.43,-67.63 -67.63,-67.63z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M510.87,732.93L234.14,732.93c-14.09,0 -25.36,-11.27 -25.36,-25.36L208.78,630.36c0,-90.74 73.83,-164.01 164.01,-164.01S536.8,540.18 536.8,630.36v77.21c0,14.09 -11.84,25.36 -25.93,25.36zM259.5,681.65h226.01L485.51,630.36c0,-62.56 -50.72,-113.29 -113.29,-113.29s-113.29,50.72 -113.29,113.29v51.29zM770.7,382.93L584.14,382.93c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h186.55c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05zM770.7,536.8L614.58,536.8c-15.22,0 -27.05,-12.4 -27.05,-27.05 0,-15.22 12.4,-27.05 27.05,-27.05h156.12c15.22,0 27.05,12.4 27.05,27.05 0.56,15.22 -11.84,27.05 -27.05,27.05zM770.7,690.66L646.14,690.66c-15.22,0 -27.05,-12.4 -27.05,-27.05s12.4,-27.05 27.05,-27.05h124.56c15.22,0 27.05,12.4 27.05,27.05s-11.84,27.05 -27.05,27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index de71e09..0000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.41,947.2H166.28A84.58,84.58 0,0 1,81.92 862.6V166.52A84.58,84.58 0,0 1,166.28 81.92h461.13a29.28,29.28 0,0 1,0 58.55H166.28a26.04,26.04 0,0 0,-25.99 26.05v696.07a26.04,26.04 0,0 0,25.97 26.05h694.14a26.04,26.04 0,0 0,25.97 -26.05V375.73a29.18,29.18 0,1 1,58.37 0v486.87A84.58,84.58 0,0 1,860.41 947.2z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M935.84,172.85l-69.12,-76.25a43.19,43.19 0,0 0,-61.68 -2.42L344.06,528.16l-0.11,0.11a43.47,43.47 0,0 0,-13.06 25.31l-26.56,128.2 -0.48,3.14a43.26,43.26 0,0 0,55.14 45.85l112.53,-32.77a43.26,43.26 0,0 0,18.79 -11.26L934.7,232.45a43.52,43.52 0,0 0,1.14 -59.6zM493.27,600.17L422.91,534.23 765.2,211.97l54.09,54.92zM366.89,667.55l18.33,-88.53 67.17,62.94 -0.96,0.98zM860.16,225.09l-52.4,-53.2 26.09,-24.58 49.24,54.32z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
deleted file mode 100644
index 4d2016b..0000000
--- a/app/src/main/res/drawable/ic_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index cf1f741..0000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 8c6934c..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected.xml b/app/src/main/res/drawable/ic_home_selected.xml
deleted file mode 100644
index d500f01..0000000
--- a/app/src/main/res/drawable/ic_home_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M888,462.4L544,142.4c-19.2,-17.6 -48,-17.6 -65.6,0l-344,320c-9.6,9.6 -16,22.4 -16,35.2v355.2c0,27.2 22.4,49.6 49.6,49.6h240V657.6c0,-56 46.4,-102.4 102.4,-102.4 56,0 102.4,46.4 102.4,102.4v246.4h240c27.2,0 49.6,-22.4 49.6,-49.6V497.6c1.6,-12.8 -4.8,-25.6 -14.4,-35.2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
deleted file mode 100644
index 4995056..0000000
--- a/app/src/main/res/drawable/ic_message.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M820.89,807.99H487.46a39.65,39.65 0,0 0,-22.59 7.07l-135.75,94.14a39.71,39.71 0,0 1,-61.39 -24.2l-10.1,-45.74a39.78,39.78 0,0 0,-38.8 -31.27l0.2,-148.99a146.53,146.53 0,0 1,146.24 -146.63h535.12a39.83,39.83 0,0 1,39.75 39.91v136.01a119.48,119.48 0,0 1,-119.24 119.71z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M815.39,112.64L198.37,112.64A157.84,157.84 0,0 0,40.96 270.55v379.78a157.84,157.84 0,0 0,157.41 157.91h14.79a1.63,1.63 0,0 1,1.58 1.27l10.11,45.72a77.78,77.78 0,0 0,120.32 47.39l135.79,-94.09a1.63,1.63 0,0 1,0.92 -0.29h333.52A157.84,157.84 0,0 0,972.8 650.33L972.8,270.55A157.84,157.84 0,0 0,815.39 112.64zM896.51,650.33a81.35,81.35 0,0 1,-81.13 81.41L481.88,731.74a77.42,77.42 0,0 0,-44.27 13.82L301.82,839.68a1.62,1.62 0,0 1,-2.5 -0.99l-10.11,-45.72a77.48,77.48 0,0 0,-76.05 -61.23h-14.79a81.36,81.36 0,0 1,-81.14 -81.41L117.24,270.55a81.36,81.36 0,0 1,81.14 -81.41h617.02a81.35,81.35 0,0 1,81.13 81.41v379.78zM337.99,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM522.08,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24zM699.15,424.68a49.24,49.24 0,1 0,49.09 49.24,49.15 49.15,0 0,0 -49.09,-49.24z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine.xml b/app/src/main/res/drawable/ic_mine.xml
deleted file mode 100644
index 91c2557..0000000
--- a/app/src/main/res/drawable/ic_mine.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_mine_selected.xml b/app/src/main/res/drawable/ic_mine_selected.xml
deleted file mode 100644
index f3b0d04..0000000
--- a/app/src/main/res/drawable/ic_mine_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M511.67,548.59c140.98,0 255.68,-114.7 255.68,-255.68 0,-140.98 -114.7,-255.68 -255.68,-255.68S255.99,151.92 255.99,292.91c0,140.99 114.7,255.68 255.68,255.68zM716.54,579.27h-409.09C172.11,579.27 62,679.33 62,802.31v108.72c0,42.63 36.7,77.32 81.82,77.32h736.36c45.11,0 81.82,-34.7 81.82,-77.32V802.31C962,679.33 851.89,579.27 716.54,579.27z"
-      android:fillColor="@color/themeColor"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notice.xml b/app/src/main/res/drawable/ic_notice.xml
deleted file mode 100644
index 962e03f..0000000
--- a/app/src/main/res/drawable/ic_notice.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54px"
-    android:height="54px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M656.26,347.21a188.65,188.65 0,1 0,0 324.05V347.21z" />
-
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M668.35,118.88a73.35,73.35 0,0 0,-71.17 -4.06L287.17,263.5a4.61,4.61 0,0 1,-2.01 0.46L130.05,263.96A73.73,73.73 0,0 0,56.32 337.6v349.64a73.73,73.73 0,0 0,73.73 73.64h156.55a4.68,4.68 0,0 1,1.94 0.43l309.59,143.2a73.7,73.7 0,0 0,104.67 -66.82L702.8,181.21a73.22,73.22 0,0 0,-34.45 -62.33zM125.4,687.24L125.4,337.6a4.61,4.61 0,0 1,4.61 -4.61h122.04v358.88L130.05,691.87a4.61,4.61 0,0 1,-4.64 -4.63zM633.72,837.68a4.61,4.61 0,0 1,-6.56 4.19l-306.03,-141.55L321.13,323.77l305.97,-146.72a4.61,4.61 0,0 1,6.62 4.16v656.47zM938.26,478.72h-150.25a34.51,34.51 0,1 0,0 69.02h150.25a34.51,34.51 0,1 0,0 -69.02zM810.01,360.96a34.45,34.45 0,0 0,24.42 -10.1L940.67,244.74a34.52,34.52 0,0 0,-48.84 -48.81L785.59,302.08a34.51,34.51 0,0 0,24.42 58.88zM834.43,675.57a34.52,34.52 0,1 0,-48.84 48.81l106.25,106.14a34.52,34.52 0,0 0,48.84 -48.81z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml
deleted file mode 100644
index 6916eca..0000000
--- a/app/src/main/res/drawable/ic_overtime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M327.52,780.57L233.89,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-250.37a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v250.37a39.23,39.23 0,0 1,-39.21 39.25zM952.29,780.57h-93.62a39.23,39.23 0,0 1,-39.21 -39.25v-108.43a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v108.43a39.23,39.23 0,0 1,-39.21 39.25zM639.9,780.57L546.3,780.57a39.23,39.23 0,0 1,-39.21 -39.25v-496.13a39.23,39.23 0,0 1,39.21 -39.25h93.62a39.23,39.23 0,0 1,39.21 39.25v496.13a39.23,39.23 0,0 1,-39.23 39.25z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M244.63,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L77.09,403.01a73.93,73.93 0,0 1,73.84 -73.86h93.7A73.93,73.93 0,0 1,318.46 403.01v318.05a73.93,73.93 0,0 1,-73.83 73.86zM150.94,398.37a4.63,4.63 0,0 0,-4.61 4.63v318.05a4.63,4.63 0,0 0,4.61 4.63h93.7a4.63,4.63 0,0 0,4.61 -4.63L249.24,403.01a4.63,4.63 0,0 0,-4.61 -4.63h-93.7zM869.89,794.91h-93.7a73.94,73.94 0,0 1,-73.86 -73.86v-177.7A73.94,73.94 0,0 1,776.19 469.5h93.7a73.94,73.94 0,0 1,73.85 73.85v177.7a73.94,73.94 0,0 1,-73.85 73.86zM776.19,538.72a4.64,4.64 0,0 0,-4.64 4.63v177.7a4.64,4.64 0,0 0,4.64 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63v-177.7a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM557.26,794.91h-93.7a73.93,73.93 0,0 1,-73.85 -73.86L389.72,155.78A73.93,73.93 0,0 1,463.56 81.92h93.7a73.93,73.93 0,0 1,73.85 73.86v565.28a73.93,73.93 0,0 1,-73.85 73.86zM463.56,151.14a4.63,4.63 0,0 0,-4.61 4.63v565.28a4.63,4.63 0,0 0,4.61 4.63h93.7a4.64,4.64 0,0 0,4.63 -4.63L561.89,155.78a4.64,4.64 0,0 0,-4.63 -4.63h-93.7zM933.07,947.2L90.93,947.2a34.61,34.61 0,0 1,0 -69.22h842.14a34.61,34.61 0,0 1,0 69.22z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml
deleted file mode 100644
index 92d2699..0000000
--- a/app/src/main/res/drawable/ic_privacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M481.11,33.92l-307.2,86.36a114.13,114.13 0,0 0,-83.24 109.87v331.33a293.33,293.33 0,0 0,91.22 212.61l16.68,15.72 8.21,7.64 16.15,14.83 15.79,14.21 15.45,13.61 15.1,13.01 14.76,12.42c19.43,16.13 37.97,30.66 55.64,43.56l13.1,9.39c64.64,45.4 117.12,68.14 159.23,68.14 42.11,0 94.59,-22.74 159.23,-68.14l13.1,-9.39a1153.9,1153.9 0,0 0,55.64 -43.56l14.76,-12.42 15.1,-13.01 15.45,-13.61 15.79,-14.21 16.15,-14.83 16.51,-15.42 8.38,-7.94a293.33,293.33 0,0 0,91.22 -212.61L933.33,230.14a114.13,114.13 0,0 0,-83.24 -109.87l-307.2,-86.38a114.13,114.13 0,0 0,-61.78 0zM522.69,105.79l307.2,86.36a39.47,39.47 0,0 1,28.78 37.99v331.33a218.67,218.67 0,0 1,-68.01 158.51l-15.36,14.46 -15.04,13.93 -14.68,13.35 -14.31,12.8 -13.97,12.2 -6.85,5.89 -13.44,11.37 -6.57,5.46 -12.89,10.52 -12.52,9.94c-2.05,1.6 -4.1,3.2 -6.12,4.74l-11.95,9.09c-1.96,1.49 -3.9,2.92 -5.85,4.33l-11.37,8.23 -5.55,3.9 -10.82,7.38c-1.77,1.19 -3.54,2.35 -5.27,3.48l-10.24,6.53c-36.78,22.89 -65.66,34.35 -85.87,34.35 -20.2,0 -49.07,-11.46 -85.87,-34.35l-10.24,-6.53a611.93,611.93 0,0 1,-5.27 -3.48l-10.79,-7.38 -11.2,-7.94 -5.76,-4.2 -11.73,-8.79a1061.18,1061.18 0,0 1,-12.16 -9.39l-12.52,-9.92 -12.89,-10.52 -13.23,-11.09c-2.26,-1.88 -4.5,-3.8 -6.78,-5.74l-13.78,-11.93 -14.14,-12.5 -14.51,-13.08 -14.85,-13.63 -15.21,-14.21 -7.72,-7.32A218.67,218.67 0,0 1,165.33 561.49L165.33,230.14a39.47,39.47 0,0 1,28.8 -37.97l307.2,-86.4a39.47,39.47 0,0 1,21.33 0z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml
deleted file mode 100644
index c03f19f..0000000
--- a/app/src/main/res/drawable/ic_push_setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3fc5935..0000000
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="72px"
-    android:height="72px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M733.37,673.68H285.51a88.58,88.58 0,0 1,-88.58 -88.52v-149.56a88.58,88.58 0,0 1,88.58 -88.52h447.86a88.58,88.58 0,0 1,88.58 88.52v149.56a88.58,88.58 0,0 1,-88.58 88.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M115.9,410.39A39.1,39.1 0,0 1,76.8 371.3L76.8,248.87A172.27,172.27 0,0 1,248.87 76.8L366.08,76.8a39.1,39.1 0,1 1,0 78.19L248.87,154.99a93.99,93.99 0,0 0,-93.89 93.89L154.99,371.3a39.1,39.1 0,0 1,-39.09 39.09zM371.31,942.08L248.87,942.08A172.27,172.27 0,0 1,76.8 770.01v-114.61a39.1,39.1 0,1 1,78.19 0v114.61a93.99,93.99 0,0 0,93.89 93.89h122.43a39.1,39.1 0,1 1,0 78.19zM770.01,942.08L652.8,942.08a39.1,39.1 0,1 1,0 -78.19h117.22a93.99,93.99 0,0 0,93.89 -93.89v-119.81a39.1,39.1 0,0 1,78.19 0v119.83A172.26,172.26 0,0 1,770.01 942.08zM902.99,410.39a39.1,39.1 0,0 1,-39.1 -39.09L863.89,248.87a93.99,93.99 0,0 0,-93.89 -93.89h-125.04a39.1,39.1 0,1 1,0 -78.19h125.04A172.27,172.27 0,0 1,942.08 248.87L942.08,371.3a39.1,39.1 0,0 1,-39.09 39.09zM717.94,551.14L300.94,551.14a39.1,39.1 0,0 1,0 -78.19h417a39.1,39.1 0,1 1,0 78.19z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample.xml b/app/src/main/res/drawable/ic_sample.xml
deleted file mode 100644
index 44e1c25..0000000
--- a/app/src/main/res/drawable/ic_sample.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="@color/gray"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sample_selected.xml b/app/src/main/res/drawable/ic_sample_selected.xml
deleted file mode 100644
index 365b493..0000000
--- a/app/src/main/res/drawable/ic_sample_selected.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M339.2,565.6m-339.2,0a339.2,339.2 0,1 0,678.4 0,339.2 339.2,0 1,0 -678.4,0Z" />
-    <path
-        android:fillColor="#F16051"
-        android:pathData="M809.6,247.2m-214.4,0a214.4,214.4 0,1 0,428.8 0,214.4 214.4,0 1,0 -428.8,0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M324.8,239.2m-25.6,0a25.6,25.6 0,1 0,51.2 0,25.6 25.6,0 1,0 -51.2,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M324.8,280.8c-22.4,0 -41.6,-19.2 -41.6,-41.6s19.2,-41.6 41.6,-41.6c22.4,0 41.6,19.2 41.6,41.6s-19.2,41.6 -41.6,41.6zM324.8,229.6c-6.4,0 -11.2,4.8 -11.2,11.2 0,6.4 4.8,11.2 11.2,11.2s11.2,-4.8 11.2,-11.2c-1.6,-6.4 -6.4,-11.2 -11.2,-11.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M411.2,165.6m-35.2,0a35.2,35.2 0,1 0,70.4 0,35.2 35.2,0 1,0 -70.4,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M411.2,215.2c-27.2,0 -51.2,-22.4 -51.2,-51.2 0,-27.2 22.4,-51.2 51.2,-51.2 27.2,0 51.2,22.4 51.2,51.2 0,28.8 -22.4,51.2 -51.2,51.2zM411.2,144.8c-11.2,0 -19.2,9.6 -19.2,19.2 0,11.2 9.6,19.2 19.2,19.2 9.6,0 19.2,-9.6 19.2,-19.2 1.6,-9.6 -8,-19.2 -19.2,-19.2z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M521.6,82.4m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M521.6,144.8c-35.2,0 -62.4,-28.8 -62.4,-62.4 0,-35.2 28.8,-62.4 62.4,-62.4 35.2,0 62.4,28.8 62.4,62.4 0,35.2 -27.2,62.4 -62.4,62.4zM521.6,50.4c-17.6,0 -32,14.4 -32,32s14.4,32 32,32 32,-14.4 32,-32 -14.4,-32 -32,-32z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M609.6,916l-182.4,-278.4v-233.6h-176V637.6L67.2,916c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M571.2,1004H105.6c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l182.4,-275.2V404c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16v228.8l180.8,275.2c12.8,19.2 12.8,43.2 3.2,62.4 -14.4,20.8 -35.2,33.6 -57.6,33.6zM265.6,418.4v217.6c0,3.2 -1.6,6.4 -3.2,8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-1.6,-3.2 -3.2,-4.8 -3.2,-8V418.4h-145.6z" />
-    <path
-        android:fillColor="#4FBF9F"
-        android:pathData="M508.8,762.4s-99.2,-49.6 -171.2,0c-88,60.8 -169.6,0 -169.6,0l-100.8,153.6c-20.8,30.4 1.6,72 38.4,72h465.6c36.8,0 59.2,-40 38.4,-72l-100.8,-153.6z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M220.8,319.2h236.8v83.2H220.8z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M457.6,418.4L220.8,418.4c-8,0 -16,-6.4 -16,-16v-83.2c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c-0,9.6 -8,16 -16,16zM235.2,388h206.4v-52.8L235.2,335.2v52.8zM571.2,1004L105.6,1004c-22.4,0 -43.2,-12.8 -54.4,-32 -11.2,-20.8 -9.6,-43.2 3.2,-62.4l184,-280c4.8,-6.4 14.4,-9.6 20.8,-4.8 6.4,4.8 9.6,14.4 4.8,20.8L80,925.6c-6.4,9.6 -6.4,20.8 -1.6,32 4.8,9.6 16,16 27.2,16h465.6c11.2,0 22.4,-6.4 27.2,-16 4.8,-9.6 4.8,-22.4 -1.6,-32l-182.4,-280c-4.8,-6.4 -3.2,-16 4.8,-20.8 6.4,-4.8 16,-3.2 20.8,4.8l182.4,280c12.8,19.2 12.8,43.2 3.2,62.4 -11.2,19.2 -32,32 -54.4,32zM297.6,479.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16zM337.6,543.2h-88c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h88c8,0 16,6.4 16,16 -0,9.6 -6.4,16 -16,16zM297.6,607.2h-46.4c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h46.4c8,0 16,6.4 16,16 -0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M729.6,247.2h176v593.6h-176z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16v-592c0,-8 6.4,-16 16,-16h176c8,0 16,6.4 16,16L921.6,840.8c-0,8 -8,14.4 -16,14.4zM745.6,824.8h145.6L891.2,261.6h-145.6v563.2z" />
-    <path
-        android:fillColor="#FDBF5E"
-        android:pathData="M729.6,455.2v385.6h176V455.2" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M905.6,855.2h-176c-8,0 -16,-6.4 -16,-16V455.2c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v369.6h145.6v-369.6c0,-8 6.4,-16 16,-16 8,0 16,6.4 16,16v385.6c-1.6,8 -9.6,14.4 -17.6,14.4z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M699.2,162.4h236.8v83.2H699.2z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M936,261.6L699.2,261.6c-8,0 -16,-6.4 -16,-16L683.2,162.4c0,-8 6.4,-16 16,-16h236.8c8,0 16,6.4 16,16v83.2c0,9.6 -6.4,16 -16,16zM713.6,231.2h206.4v-52.8L713.6,178.4v52.8zM809.6,344.8h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,8 -6.4,16 -16,16zM779.2,429.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16zM809.6,516h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,602.4h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,8 -8,16 -16,16zM809.6,687.2h-80c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h80c8,0 16,6.4 16,16 0,9.6 -6.4,16 -16,16zM779.2,773.6h-49.6c-8,0 -16,-6.4 -16,-16 0,-8 6.4,-16 16,-16h49.6c8,0 16,6.4 16,16 0,9.6 -8,16 -16,16z" />
-    <path
-        android:fillColor="#193651"
-        android:pathData="M406.4,856.8h30.4v30.4h-30.4zM323.2,856.8h30.4v30.4h-30.4zM240,856.8h30.4v30.4h-30.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml
deleted file mode 100644
index 6bad12a..0000000
--- a/app/src/main/res/drawable/ic_total_sample.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M902.3,762.88c0,98.77 -175.89,178.84 -392.86,178.84S116.58,861.65 116.58,762.88s175.89,-178.84 392.86,-178.84 392.86,80.07 392.86,178.84z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M509.44,492.48c-243.71,0 -427.52,-91.56 -427.52,-212.96S265.73,66.56 509.44,66.56 936.96,158.11 936.96,279.52s-183.81,212.96 -427.52,212.96zM509.44,135.53c-211.39,0 -358.7,75.88 -358.7,143.98S298.05,423.51 509.44,423.51s358.7,-75.89 358.7,-143.99S720.83,135.53 509.44,135.53zM509.44,720.57c-243.71,0 -427.52,-91.56 -427.52,-212.96a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0c0,121.41 -183.81,212.96 -427.52,212.96zM509.44,957.44C265.73,957.44 81.92,865.88 81.92,744.48a34.41,34.41 0,1 1,68.82 0c0,68.1 147.31,143.99 358.7,143.99s358.7,-75.89 358.7,-143.99a34.41,34.41 0,1 1,68.82 0C936.96,865.88 753.15,957.44 509.44,957.44z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml
deleted file mode 100644
index 4ff7f08..0000000
--- a/app/src/main/res/drawable/ic_total_verify.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M514.6,939.77l363.44,-451.07v348.38l-52.42,91.7z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M762.78,154.62h-44.03a96.81,96.81 0,0 0,-46.93 -51.32A98.07,98.07 0,0 0,578.92 35.84L445.08,35.84a98.07,98.07 0,0 0,-92.88 67.49A96.81,96.81 0,0 0,305.26 154.62h-44.03C176.47,154.62 107.52,226.27 107.52,314.31v519.31C107.52,921.65 176.47,993.28 261.22,993.28h501.57C847.53,993.28 916.48,921.65 916.48,833.62L916.48,314.31c0,-88.04 -68.95,-159.69 -153.7,-159.69zM390.05,163.49a34.93,34.93 0,0 0,27.22 -31.74,27.97 27.97,0 0,1 27.81,-26.04h133.85a27.96,27.96 0,0 1,27.81 26.04,34.93 34.93,0 0,0 27.22,31.74 27.94,27.94 0,0 1,-6.14 55.19L396.19,218.69a27.94,27.94 0,0 1,-6.14 -55.17zM846.64,833.62c0,49.5 -37.62,89.77 -83.86,89.77L261.22,923.39c-46.24,0 -83.86,-40.27 -83.86,-89.77L177.36,314.31c0,-49.51 37.62,-89.78 83.86,-89.78h43.33a97.85,97.85 0,0 0,91.65 64.06h231.62a97.84,97.84 0,0 0,91.65 -64.06h43.33c46.24,0 83.86,40.27 83.86,89.78v519.31zM739.84,375.66L279.79,375.66a34.94,34.94 0,0 0,0 69.89L739.84,445.55a34.94,34.94 0,0 0,0 -69.89zM279.79,630.31h324.74a34.94,34.94 0,0 0,0 -69.88L279.79,560.42a34.94,34.94 0,0 0,0 69.88zM663.04,745.19L279.79,745.19a34.94,34.94 0,0 0,0 69.88L663.04,815.07a34.94,34.94 0,0 0,0 -69.88z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index bcc9397..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M883.28,950.79H396.41a27,27 0,0 1,0 -54.1h486.87a27.06,27.06 0,0 0,27.05 -27.05V311.47L765.87,139.33H342.31a27.07,27.07 0,0 0,-27.05 27v53.25a27,27 0,1 1,-54.09 0v-53.2a81.23,81.23 0,0 1,81.14 -81.15h436.16a27,27 0,0 1,20.71 9.67l158.91,189.34a26.93,26.93 0,0 1,6.34 17.38v568a81.24,81.24 0,0 1,-81.15 81.17z" />
-    <path
-        android:fillColor="@color/themeColor"
-        android:pathData="M341.15,723.51L179,723.51a27,27 0,0 1,-27 -27L152,518.54h-44.75a27.21,27.21 0,0 1,-19.13 -7.9,81.25 81.25,0 0,1 0,-114.69l114.64,-114.64c30.54,-30.54 84.16,-30.54 114.7,0L432.07,396a81.25,81.25 0,0 1,0 114.69,27.19 27.19,0 0,1 -19.12,7.9L368.2,518.59v177.88a27,27 0,0 1,-27.05 27.04zM206.09,669.42h108L314.09,491.49a27,27 0,0 1,27 -27.05h58.14a27.2,27.2 0,0 0,-5.47 -30.24L279.18,319.56c-10.17,-10.15 -28.05,-10.15 -38.17,0L126.37,434.2a27.21,27.21 0,0 0,-5.46 30.24L179,464.44a27,27 0,0 1,27.05 27.05z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
deleted file mode 100644
index aeb63f6..0000000
--- a/app/src/main/res/drawable/ic_verified.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="80px"
-    android:height="80px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="#F4CA1C"
-        android:pathData="M916.95,536.52l-386.41,172.93 -421.94,-26.62 54.73,74.04L503.89,913.41l381.95,-164.06 31.09,-39.91V536.52z" />
-    <path
-        android:fillColor="#595BB3"
-        android:pathData="M877.68,230.71l-289.82,-148.06a145.7,145.7 0,0 0,-127.35 -2.86L158.24,217.49a147.07,147.07 0,0 0,-85.66 130.37L66.56,664.19a146.51,146.51 0,0 0,84.04 135.17l295.59,139.03a146.57,146.57 0,0 0,120.28 1.98l296.48,-127.71a146.63,146.63 0,0 0,88.43 -131.58L957.44,363.8a147.21,147.21 0,0 0,-79.76 -133.08zM488.09,140.29a79.49,79.49 0,0 1,69.48 1.54l289.83,148.05a78.82,78.82 0,0 1,15.23 10.24l-344.13,169.56L168.45,288.9a78.98,78.98 0,0 1,17.41 -10.91zM178.92,739.22a79.96,79.96 0,0 1,-45.85 -73.77l6.03,-316.32c0,-0.17 0,-0.35 0.03,-0.51l345.76,178.54v355.02a79.63,79.63 0,0 1,-10.38 -3.92zM884.87,679.83A79.99,79.99 0,0 1,836.61 751.62l-285.18,122.88v-346.91L890.88,360.36c0,0.72 0.05,1.44 0.04,2.17z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index de6f785..aa6e74d 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_base_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 815261d..a8a00af 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -9,8 +9,6 @@
 
     <include layout="@layout/include_search_title" />
 
-    <include layout="@layout/include_equipment_layout" />
-
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/borderThickness"
diff --git a/app/src/main/res/layout/item_capability_rv_l.xml b/app/src/main/res/layout/item_capability_rv_l.xml
index 02451f2..ed5b810 100644
--- a/app/src/main/res/layout/item_capability_rv_l.xml
+++ b/app/src/main/res/layout/item_capability_rv_l.xml
@@ -17,18 +17,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="继电器保护"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" - " />
+            android:text=" - "
+            android:textColor="@color/black" />
 
         <TextView
             android:id="@+id/categoryView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="电学"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_standard_device_rv_l.xml b/app/src/main/res/layout/item_standard_device_rv_l.xml
index 8d3b979..0f6bdfe 100644
--- a/app/src/main/res/layout/item_standard_device_rv_l.xml
+++ b/app/src/main/res/layout/item_standard_device_rv_l.xml
@@ -1,47 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_55"
-    android:gravity="center_vertical"
-    android:paddingHorizontal="@dimen/dp_5">
+    android:layout_height="@dimen/dp_100"
+    android:orientation="vertical"
+    android:padding="@dimen/dp_7">
 
-    <TextView
-        android:id="@+id/deviceNameView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="测量设备&amp;测量工装"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/deviceNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="测量设备"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_14" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceStateView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="在用"
+            android:textColor="@color/green"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/green"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/transmitRangeView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="国家级"
+            android:textColor="@color/themeColor"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/themeColor"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/measureMajorView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="电离辐射"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_12"
+            app:qmui_backgroundColor="@color/red"
+            app:qmui_borderWidth="0dp"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/deviceCodeView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.5"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="gdzc202301290002"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="@dimen/dp_5"
+        android:text="装置编号：gdzc202301290002"
+        android:textColor="@color/gray"
         android:textSize="@dimen/sp_12" />
 
-    <TextView
-        android:id="@+id/deviceDateView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="2023-01-04 00:00:00"
-        android:textSize="@dimen/sp_12" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/deviceLibView"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingHorizontal="@dimen/dp_3"
-        android:text="徐州分中心"
-        android:textSize="@dimen/sp_12" />
+        <TextView
+            android:id="@+id/remarkView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="备注：无"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/deviceLibView"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_20"
+            android:layout_gravity="end"
+            android:layout_marginStart="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:text="特种实验室"
+            android:textColor="@color/blue"
+            android:textSize="@dimen/sp_12"
+            app:qmui_borderColor="@color/blue"
+            app:qmui_borderWidth="@dimen/dp_1"
+            app:qmui_radius="@dimen/dp_3" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5">
+
+        <TextView
+            android:id="@+id/deviceDateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="有效期至：2023-01-04 00:00:00"
+            android:textColor="@color/red"
+            android:textSize="@dimen/sp_12" />
+
+        <TextView
+            android:id="@+id/labOwnerView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:text="管理员：李亚光"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/sp_12" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e4cca23..99df98d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="sp_18">18sp</dimen>
     <dimen name="sp_20">20sp</dimen>
     <dimen name="sp_22">22sp</dimen>
-    <dimen name="sp_24">24sp</dimen>
 
     <!--控件边距-->
     <dimen name="dp_1">1dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd5d9e4..267f025 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -75,11 +75,6 @@
         <item name="android:paddingBottom">@dimen/dp_7</item>
     </style>
 
-    <style name="sampleTopTabLayoutStyle">
-        <item name="android:textSize">@dimen/sp_16</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <!--委托书输入框-->
     <style name="inputEditTextStyle">
         <item name="android:layout_width">match_parent</item>