不同分辨率的适配

app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt

@@ -50,7 +50,7 @@ class ApprovalActivity : BaseBindingActivity<ActivityApprovalBinding>(), OnRefre
     override fun initView() {
         type = intent.getStringExtra(TYPE) ?: ""
         immersionToolbar(
-            mBinding.ilToolBar.toolbar,
+            mBinding.toolbar,
             when (type) {
                 PI_PREAPPROV -> "待处理"
                 PI_APPROVED -> "已处理"
@@ -70,7 +70,7 @@ class ApprovalActivity : BaseBindingActivity<ActivityApprovalBinding>(), OnRefre
 //        beginTransaction.commit()
 
         mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
-        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
+//        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
         mBinding.recyclerView.adapter = adapter
         adapter.isStateViewEnable = true
     }

app/src/main/java/com/project/survey/ui/controlnet/ControlNetFirstListActivity.kt

@@ -42,7 +42,7 @@ class ControlNetFirstListActivity : BaseBindingActivity<ActivityControlNetListBi
         initVersion()
 
         mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
-        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
+//        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
         mBinding.recyclerView.adapter = adapter
         adapter.isStateViewEnable = true
     }

app/src/main/java/com/project/survey/ui/controlnet/SpecialControlNetworkListActivity.kt

@@ -45,7 +45,7 @@ class SpecialControlNetworkListActivity :
         )
 
         mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
-        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
+//        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
         mBinding.recyclerView.adapter = adapter
         adapter.isStateViewEnable = true
     }

app/src/main/java/com/project/survey/ui/lofting/LoftingListActivity.kt

@@ -25,7 +25,7 @@ class LoftingListActivity : BaseBindingActivity<ActivityLoftingListBinding>() {
     override fun initView() {
         immersionToolbar(mBinding.toolbar, R.string.lofting)
 
-        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
+//        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this))
         mBinding.recyclerView.setAdapter(adapter)
         adapter.isStateViewEnable = true
     }

app/src/main/java/com/project/survey/ui/login/ForgetPwdActivity.kt

@@ -1,10 +1,9 @@
 package com.project.survey.ui.login
 
-import android.content.Intent
 import androidx.core.widget.addTextChangedListener
-import com.project.survey.ui.base.BaseBindingActivity
 import com.project.survey.databinding.ActivityForgetPwdBinding
 import com.project.survey.extend.setOnClickNoRepeatListener
+import com.project.survey.ui.base.BaseBindingActivity
 import com.project.survey.util.ActivityNavUtil
 
 /**

app/src/main/java/com/project/survey/ui/login/ForgetPwdInputCodeActivity.kt

@@ -1,10 +1,9 @@
 package com.project.survey.ui.login
 
-import android.content.Intent
 import androidx.lifecycle.lifecycleScope
-import com.project.survey.ui.base.BaseBindingActivity
 import com.project.survey.databinding.ActivityForgetPwdInputCodeBinding
 import com.project.survey.extend.showSoftInput
+import com.project.survey.ui.base.BaseBindingActivity
 import com.project.survey.util.ActivityNavUtil
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch

app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListFragment.kt

@@ -34,7 +34,7 @@ class PointMeasureListFragment : BaseBindingFragment<FragmentPointMeasureListBin
     private val adapter by lazy { PointMeasureListAdapter() }
 
     override fun initView() {
-        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(mContext))
+//        mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(mContext))
         mBinding.recyclerView.setAdapter(adapter)
         adapter.isStateViewEnable = true
     }

app/src/main/java/com/project/survey/widget/decoration/HorDividerDecoration.kt

@@ -3,8 +3,9 @@ package com.project.survey.widget.decoration
 import android.content.Context
 import androidx.core.content.ContextCompat
 import com.project.survey.R
+import com.project.survey.extend.dp2px
 
 class HorDividerDecoration(context: Context) : DefaultItemDecoration(
     ContextCompat.getColor(context, R.color.hor_line),
-    1, 1
+    1f.dp2px(), 0.5f.dp2px()
 )

app/src/main/java/com/project/survey/widget/decoration/TransparentDividerDecoration.kt

@@ -8,5 +8,5 @@ import com.project.survey.extend.dp2px
 
 class TransparentDividerDecoration(context: Context) : DefaultItemDecoration(
     ContextCompat.getColor(context, R.color.transparent),
-    1, 12f.dp2px()
+    1, 10f.dp2px()
 )

app/src/main/res/color/text_color_selector_blue_black.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/colorPrimary" android:state_selected="true" />
-    <item android:color="@color/text_color_20" android:state_selected="false" />
+    <item android:color="@color/text_color_404145" android:state_selected="false" />
 </selector>

app/src/main/res/drawable/arrow_right.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="6dp"
+    android:width="@dimen/sw_6dp"
-    android:height="10dp"
+    android:height="@dimen/sw_10dp"
     android:viewportWidth="6"
     android:viewportHeight="10">
   <path

app/src/main/res/drawable/bg_badge.xml

@@ -3,10 +3,10 @@
     android:shape="oval">
 
     <size
-        android:width="14dp"
+        android:width="@dimen/sw_14dp"
-        android:height="14dp" />
+        android:height="@dimen/sw_14dp" />
     <solid android:color="#CC5155" />
     <stroke
-        android:width="1dp"
+        android:width="@dimen/sw_1dp"
         android:color="#FFFFFF" />
 </shape>

app/src/main/res/drawable/bg_btn_enable.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/sw_99dp" />
+    <corners android:radius="@dimen/sw_15dp" />
     <solid android:color="#396BD0" />
 </shape>

app/src/main/res/drawable/bg_btn_enable_not.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/sw_99dp" />
+    <corners android:radius="@dimen/sw_15dp" />
     <solid android:color="#E8EAEE" />
 </shape>

app/src/main/res/drawable/bg_btn_login.xml

@@ -5,5 +5,6 @@
         android:angle="0"
         android:endColor="#396BD0"
         android:startColor="#3F79F0" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/sw_4dp" />
+    <size android:height="@dimen/sw_43dp" />
 </shape>

app/src/main/res/drawable/bg_input_code_gray.xml

@@ -7,9 +7,9 @@
 
     <!--  边框线  -->
     <stroke
-        android:width="1dp"
+        android:width="@dimen/sw_1dp"
-        android:color="@color/text_color_727778" />
+        android:color="@color/text_color_df" />
 
     <!--  圆角  -->
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/sw_2dp" />
 </shape>

app/src/main/res/drawable/bg_input_code_selected.xml

@@ -7,9 +7,9 @@
 
     <!--  边框线  -->
     <stroke
-        android:width="1dp"
+        android:width="@dimen/sw_1dp"
         android:color="@color/colorPrimary" />
 
     <!--  圆角  -->
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/sw_2dp" />
 </shape>

app/src/main/res/drawable/bg_item_input_code.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/sw_2dp" />
     <solid android:color="#00ffffff" />
     <stroke
-        android:width="1dp"
+        android:width="@dimen/sw_1dp"
         android:color="@color/colorPrimary" />
 </shape>

app/src/main/res/drawable/bg_point_measure_selector.xml

@@ -3,16 +3,16 @@
     <item android:state_selected="true">
         <shape android:shape="rectangle">
             <solid android:color="#E9F1FC" />
-            <corners android:radius="99dp" />
+            <corners android:radius="@dimen/sw_15dp" />
-            <stroke android:width="@dimen/sw_1dp" android:color="#1F396BD0" />
+            <stroke android:width="@dimen/sw_0_5dp" android:color="#1F396BD0" />
         </shape>
     </item>
 
     <item android:state_selected="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/white" />
-            <corners android:radius="99dp" />
+            <corners android:radius="@dimen/sw_15dp" />
-            <stroke android:width="@dimen/sw_1dp" android:color="#DFDFDF" />
+            <stroke android:width="@dimen/sw_0_5dp" android:color="#59202020" />
         </shape>
     </item>
 

app/src/main/res/drawable/bg_search.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="15dp" />
+    <corners android:radius="@dimen/sw_15dp" />
     <solid android:color="#f2f4f5" />
 </shape>

app/src/main/res/drawable/bg_section_r_8_top.xml

@@ -3,8 +3,8 @@
     android:shape="rectangle">
 
     <corners
-        android:topLeftRadius="8dp"
+        android:topLeftRadius="@dimen/sw_8dp"
-        android:topRightRadius="8dp" />
+        android:topRightRadius="@dimen/sw_8dp" />
 
     <solid android:color="@color/bg_color_fff" />
 

app/src/main/res/drawable/change_pwd.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12.444dp"
-    android:height="16dp"
-    android:viewportWidth="12.444"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M10.111,5.333L10.889,5.333C11.744,5.333 12.444,6.019 12.444,6.857L12.444,14.476C12.444,15.314 11.744,16 10.889,16L1.556,16C0.7,16 0,15.314 0,14.476L0,6.857C0,6.019 0.7,5.333 1.556,5.333L2.333,5.333L2.333,3.81C2.333,1.707 4.076,0 6.222,0C8.369,0 10.111,1.707 10.111,3.81L10.111,5.333ZM6.222,1.524C4.931,1.524 3.889,2.545 3.889,3.81L3.889,5.333L8.556,5.333L8.556,3.81C8.556,2.545 7.513,1.524 6.222,1.524ZM1.556,14.476L10.889,14.476L10.889,6.857L1.556,6.857L1.556,14.476ZM6.222,12.191C7.078,12.191 7.778,11.505 7.778,10.667C7.778,9.829 7.078,9.143 6.222,9.143C5.367,9.143 4.667,9.829 4.667,10.667C4.667,11.505 5.367,12.191 6.222,12.191Z"
-      android:fillColor="#C53E28"
-      android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable/ic_project_list.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
+    android:width="@dimen/sw_30dp"
-    android:height="30dp"
+    android:height="@dimen/sw_30dp"
     android:viewportWidth="30"
     android:viewportHeight="30">
   <path

app/src/main/res/drawable/icon_change_pwd.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/sw_16dp"
+    android:height="@dimen/sw_16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M0,0h16v16h-16z"
+      android:strokeAlpha="0"
+      android:fillColor="#D8D8D8"
+      android:fillAlpha="0"/>
+  <path
+      android:pathData="M11.889,5.333L12.667,5.333C13.522,5.333 14.222,6.019 14.222,6.857L14.222,14.476C14.222,15.314 13.522,16 12.667,16L3.333,16C2.478,16 1.778,15.314 1.778,14.476L1.778,6.857C1.778,6.019 2.478,5.333 3.333,5.333L4.111,5.333L4.111,3.81C4.111,1.707 5.853,0 8,0C10.147,0 11.889,1.707 11.889,3.81L11.889,5.333ZM8,1.524C6.709,1.524 5.667,2.545 5.667,3.81L5.667,5.333L10.333,5.333L10.333,3.81C10.333,2.545 9.291,1.524 8,1.524ZM3.333,14.476L12.667,14.476L12.667,6.857L3.333,6.857L3.333,14.476ZM8,12.191C8.856,12.191 9.556,11.505 9.556,10.667C9.556,9.829 8.856,9.143 8,9.143C7.144,9.143 6.444,9.829 6.444,10.667C6.444,11.505 7.144,12.191 8,12.191Z"
+      android:fillColor="#C53E28"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable/icon_mine_about.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/sw_16dp"
+    android:height="@dimen/sw_16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M7.992,16C3.576,16 0,12.416 0,8C0,3.584 3.576,0 7.992,0C12.416,0 16,3.584 16,8C16,12.416 12.416,16 7.992,16ZM8,1.6Q8.157,1.6 8.314,1.608Q8.471,1.615 8.627,1.631Q8.784,1.646 8.939,1.669Q9.094,1.692 9.249,1.723Q9.403,1.754 9.555,1.792Q9.707,1.83 9.858,1.876Q10.008,1.921 10.156,1.974Q10.304,2.027 10.449,2.087Q10.594,2.147 10.736,2.215Q10.878,2.282 11.017,2.356Q11.156,2.43 11.29,2.511Q11.425,2.591 11.556,2.679Q11.686,2.766 11.813,2.86Q11.939,2.953 12.06,3.053Q12.182,3.152 12.298,3.258Q12.414,3.363 12.526,3.475Q12.637,3.586 12.742,3.702Q12.848,3.819 12.947,3.94Q13.047,4.061 13.141,4.188Q13.234,4.314 13.321,4.444Q13.409,4.575 13.489,4.71Q13.57,4.844 13.644,4.983Q13.718,5.122 13.785,5.264Q13.853,5.406 13.913,5.551Q13.973,5.696 14.026,5.844Q14.079,5.992 14.124,6.142Q14.17,6.293 14.208,6.445Q14.246,6.597 14.277,6.751Q14.308,6.906 14.331,7.061Q14.354,7.216 14.369,7.373Q14.385,7.529 14.392,7.686Q14.4,7.843 14.4,8Q14.4,8.157 14.392,8.314Q14.385,8.471 14.369,8.627Q14.354,8.784 14.331,8.939Q14.308,9.095 14.277,9.249Q14.246,9.403 14.208,9.555Q14.17,9.708 14.124,9.858Q14.079,10.008 14.026,10.156Q13.973,10.304 13.913,10.449Q13.853,10.594 13.785,10.736Q13.718,10.878 13.644,11.017Q13.57,11.156 13.489,11.29Q13.409,11.425 13.321,11.556Q13.234,11.686 13.141,11.813Q13.047,11.939 12.947,12.06Q12.848,12.182 12.742,12.298Q12.637,12.414 12.526,12.526Q12.414,12.637 12.298,12.742Q12.182,12.848 12.06,12.947Q11.939,13.047 11.813,13.141Q11.686,13.234 11.556,13.321Q11.425,13.409 11.29,13.489Q11.156,13.57 11.017,13.644Q10.878,13.718 10.736,13.786Q10.594,13.853 10.449,13.913Q10.304,13.973 10.156,14.026Q10.008,14.079 9.858,14.124Q9.707,14.17 9.555,14.208Q9.403,14.246 9.249,14.277Q9.094,14.308 8.939,14.331Q8.784,14.354 8.627,14.369Q8.471,14.385 8.314,14.392Q8.157,14.4 8,14.4Q7.843,14.4 7.686,14.392Q7.529,14.385 7.373,14.369Q7.216,14.354 7.061,14.331Q6.905,14.308 6.751,14.277Q6.597,14.246 6.445,14.208Q6.293,14.17 6.142,14.124Q5.992,14.079 5.844,14.026Q5.696,13.973 5.551,13.913Q5.406,13.853 5.264,13.786Q5.122,13.718 4.983,13.644Q4.844,13.57 4.71,13.489Q4.575,13.409 4.444,13.321Q4.314,13.234 4.188,13.141Q4.061,13.047 3.94,12.947Q3.818,12.848 3.702,12.742Q3.586,12.637 3.474,12.526Q3.363,12.414 3.258,12.298Q3.152,12.182 3.053,12.06Q2.953,11.939 2.859,11.813Q2.766,11.686 2.679,11.556Q2.591,11.425 2.511,11.29Q2.43,11.156 2.356,11.017Q2.282,10.878 2.214,10.736Q2.147,10.594 2.087,10.449Q2.027,10.304 1.974,10.156Q1.921,10.008 1.876,9.858Q1.83,9.708 1.792,9.555Q1.754,9.403 1.723,9.249Q1.692,9.095 1.669,8.939Q1.646,8.784 1.631,8.627Q1.615,8.471 1.608,8.314Q1.6,8.157 1.6,8Q1.6,7.843 1.608,7.686Q1.615,7.529 1.631,7.373Q1.646,7.216 1.669,7.061Q1.692,6.906 1.723,6.751Q1.754,6.597 1.792,6.445Q1.83,6.293 1.876,6.142Q1.921,5.992 1.974,5.844Q2.027,5.696 2.087,5.551Q2.147,5.406 2.214,5.264Q2.282,5.122 2.356,4.983Q2.43,4.844 2.511,4.71Q2.591,4.575 2.679,4.444Q2.766,4.314 2.859,4.188Q2.953,4.061 3.053,3.94Q3.152,3.819 3.258,3.702Q3.363,3.586 3.474,3.475Q3.586,3.363 3.702,3.258Q3.818,3.152 3.94,3.053Q4.061,2.953 4.188,2.86Q4.314,2.766 4.444,2.679Q4.575,2.591 4.71,2.511Q4.844,2.43 4.983,2.356Q5.122,2.282 5.264,2.215Q5.406,2.147 5.551,2.087Q5.696,2.027 5.844,1.974Q5.992,1.921 6.142,1.876Q6.293,1.83 6.445,1.792Q6.597,1.754 6.751,1.723Q6.905,1.692 7.061,1.669Q7.216,1.646 7.373,1.631Q7.529,1.615 7.686,1.608Q7.843,1.6 8,1.6ZM8.8,11.2C8.8,11.64 8.44,12 8,12C7.56,12 7.2,11.64 7.2,11.2L7.2,8C7.2,7.56 7.56,7.2 8,7.2C8.44,7.2 8.8,7.56 8.8,8L8.8,11.2ZM7.2,5.6L7.2,4L8.8,4L8.8,5.6L7.2,5.6Z"
+      android:fillColor="#D77A25"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable/icon_switch_project.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/sw_16dp"
+    android:height="@dimen/sw_16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M0,0h16v16h-16z"
+      android:strokeAlpha="0"
+      android:fillColor="#D8D8D8"
+      android:fillAlpha="0"/>
+  <path
+      android:pathData="M2.556,0L12.556,0C13.472,0 14.222,0.72 14.222,1.6L14.222,14.4C14.222,15.28 13.472,16 12.556,16L2.556,16C1.639,16 0.889,15.28 0.889,14.4L0.889,1.6C0.889,0.72 1.639,0 2.556,0ZM12.556,14.4L2.556,14.4L2.556,1.6L3.389,1.6L3.389,8.8L5.889,7L8.389,8.8L8.389,1.6L12.556,1.6L12.556,14.4ZM5.056,1.6L6.722,1.6L6.722,5.6L5.889,5L5.056,5.6L5.056,1.6Z"
+      android:fillColor="#396BD0"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable/icon_toolbar_back.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
+    android:width="@dimen/sw_10dp"
-    android:height="16dp"
+    android:height="@dimen/sw_16dp"
     android:viewportWidth="10"
     android:viewportHeight="16">
   <path

app/src/main/res/drawable/icon_toolbar_exit.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
+    android:width="@dimen/sw_16dp"
-    android:height="16dp"
+    android:height="@dimen/sw_16dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path

app/src/main/res/drawable/login_error.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
+    android:width="@dimen/sw_16dp"
-    android:height="14dp"
+    android:height="@dimen/sw_14dp"
     android:viewportWidth="16"
     android:viewportHeight="14">
   <path

app/src/main/res/drawable/switch_project.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13.333dp"
-    android:height="16dp"
-    android:viewportWidth="13.333"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M1.667,0L11.667,0C12.583,0 13.333,0.72 13.333,1.6L13.333,14.4C13.333,15.28 12.583,16 11.667,16L1.667,16C0.75,16 0,15.28 0,14.4L0,1.6C0,0.72 0.75,0 1.667,0ZM11.667,14.4L1.667,14.4L1.667,1.6L2.5,1.6L2.5,8.8L5,7L7.5,8.8L7.5,1.6L11.667,1.6L11.667,14.4ZM4.167,1.6L5.833,1.6L5.833,5.6L5,5L4.167,5.6L4.167,1.6Z"
-      android:fillColor="#396BD0"
-      android:fillType="evenOdd"/>
-</vector>

app/src/main/res/layout/activity_approval.xml

@@ -6,11 +6,25 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include
+    <!--    <include-->
-        android:id="@+id/ilToolBar"
+    <!--        android:id="@+id/ilToolBar"-->
-        layout="@layout/sh_toolbar" />
+    <!--        layout="@layout/sh_toolbar" />-->
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/transparent"
+        app:navigationIcon="@drawable/icon_toolbar_back"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:titleCentered="true"
+        app:titleTextAppearance="@style/ToolbarTextAppearance" />
 
-    <include layout="@layout/item_search" />
+    <com.project.survey.widget.SearchWidget
+        android:id="@+id/searchWidget"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:sw_hint="流程名称、编号、申请人" />
 
     <!--    <androidx.fragment.app.FragmentContainerView-->
     <!--        android:id="@+id/container"-->

app/src/main/res/layout/activity_control_net_list.xml

@@ -1,6 +1,7 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -32,10 +33,10 @@
 
         <FrameLayout
             android:id="@+id/llSpinner"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/sw_103dp"
-            android:layout_height="30dp"
+            android:layout_height="@dimen/sw_30dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/sw_16dp"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="@dimen/sw_7dp"
             android:background="@drawable/bg_search"
             app:layout_constraintEnd_toStartOf="@id/searchWidget"
             app:layout_constraintHorizontal_weight="1"
@@ -46,25 +47,25 @@
                 android:id="@+id/spinner"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginVertical="7dp" />
+                android:textColor="@color/text_color_20"
+                android:textSize="@dimen/sw_11sp" />
 
         </FrameLayout>
 
         <View
             android:layout_width="0dp"
-            android:layout_height="2dp"
+            android:layout_height="@dimen/sw_2dp"
-            android:layout_marginTop="7dp"
             android:background="@drawable/bg_search_shadow_2"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/llSpinner"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
-            app:layout_constraintTop_toBottomOf="@id/llSpinner" />
 
         <com.project.survey.widget.SearchWidget
             android:id="@+id/searchWidget"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_weight="2"
+            app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/llSpinner"
             app:layout_constraintTop_toTopOf="parent"
             app:sw_hint="请输入控制网名称" />
@@ -79,8 +80,9 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="@dimen/sw_12dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+            tools:itemCount="2"
+            tools:listitem="@layout/item_control_net_first" />
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

app/src/main/res/layout/activity_control_point.xml

@@ -1,6 +1,7 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -34,8 +35,9 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="@dimen/sw_12dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+            tools:itemCount="2"
+            tools:listitem="@layout/item_control_net_first" />
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

app/src/main/res/layout/activity_forget_pwd.xml

@@ -1,36 +1,36 @@
 <?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="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-<!--    <include layout="@layout/sh_toolbar" />-->
+    <!--    <include layout="@layout/sh_toolbar" />-->
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         android:background="@color/transparent"
+        app:navigationIcon="@drawable/icon_toolbar_back"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
+        app:titleCentered="true"
-        app:navigationIcon="@drawable/icon_toolbar_back"
+        app:titleTextAppearance="@style/ToolbarTextAppearance" />
-        app:titleCentered="true" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_12dp"
         android:text="@string/authentication"
-        android:textColor="@color/text_color_1"
+        android:textColor="@color/text_color_20"
         android:textSize="@dimen/sw_20sp"
         android:textStyle="bold" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_6dp"
         android:text="@string/please_input_username"
         android:textColor="@color/text_color_727778"
@@ -39,9 +39,9 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_48dp"
-        android:text="@string/account"
+        android:text="账号"
         android:textColor="@color/text_color_727778"
         android:textSize="@dimen/sw_11sp" />
 
@@ -49,16 +49,16 @@
         android:id="@+id/etAccount"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:text=""
-        android:textColor="@color/text_color_1"
+        android:textColor="@color/text_color_20"
         android:textSize="@dimen/sw_14sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
-        android:layout_marginTop="@dimen/sw_48dp"
+        android:layout_marginTop="@dimen/sw_40dp"
         android:gravity="end"
         android:orientation="horizontal">
 
@@ -71,7 +71,8 @@
             android:paddingHorizontal="@dimen/sw_20dp"
             android:paddingVertical="@dimen/sw_6dp"
             android:text="@string/send_the_verification_code"
-            android:textColor="@color/text_color_enable_sc" />
+            android:textColor="@color/text_color_enable_sc"
+            android:textSize="@dimen/sw_12sp" />
 
     </LinearLayout>
 

app/src/main/res/layout/activity_forget_pwd_input_code.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-<!--    <include layout="@layout/sh_toolbar" />-->
+    <!--    <include layout="@layout/sh_toolbar" />-->
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -21,17 +21,17 @@
         android:id="@+id/tvAccountDesc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_12dp"
         android:text="@string/please_input_code"
-        android:textColor="@color/text_color_1"
+        android:textColor="@color/text_color_20"
         android:textSize="@dimen/sw_20sp"
         android:textStyle="bold" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_6dp"
         android:text="@string/the_verification_code_was_sent_for_forget_pwd"
         android:textColor="@color/text_color_727778"
@@ -41,9 +41,10 @@
         android:id="@+id/etInputCode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/sw_22dp"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
         android:layout_marginTop="@dimen/sw_24dp"
         app:code_number="6"
+        app:code_text_color="@color/text_color_20"
         app:line_color_default="@color/text_color_df"
         app:line_color_focus="@color/colorPrimary" />
 

app/src/main/res/layout/activity_lofting_list.xml

@@ -31,7 +31,6 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="12dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:itemCount="2"
         tools:listitem="@layout/item_lofting_list" />

app/src/main/res/layout/activity_login.xml

@@ -5,22 +5,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingHorizontal="@dimen/margin_side">
+    android:paddingHorizontal="@dimen/sw_23dp">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/sw_229dp"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/sw_33dp"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="@dimen/sw_100dp"
         android:src="@drawable/img_login_top" />
 
     <TextView
         android:id="@+id/tvAccountDesc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="52dp"
+        android:layout_marginTop="@dimen/sw_52dp"
         android:text="@string/group_account_login"
         android:textColor="@color/text_color_1"
-        android:textSize="20sp"
+        android:textSize="@dimen/sw_20sp"
         android:textStyle="bold" />
 
     <TextView
@@ -29,24 +29,24 @@
         android:layout_marginTop="@dimen/sw_15dp"
         android:text="@string/sh_account"
         android:textColor="@color/text_color_727778"
-        android:textSize="11sp" />
+        android:textSize="@dimen/sw_11sp" />
 
     <EditText
         android:id="@+id/etAccount"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
         android:imeOptions="actionNext"
+        android:singleLine="true"
         android:textColor="@color/text_color_20"
-        android:textSize="14sp" />
+        android:textSize="@dimen/sw_14sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/sw_30dp"
         android:text="@string/password"
         android:textColor="@color/text_color_727778"
-        android:textSize="11sp" />
+        android:textSize="@dimen/sw_11sp" />
 
     <com.project.survey.widget.edittext.PasswordView
         android:id="@+id/passwordView"
@@ -57,10 +57,11 @@
         android:id="@+id/tvError"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/sw_6dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:drawablePadding="@dimen/sw_6dp"
         android:text=""
         android:textColor="@color/text_color_CC5155"
+        android:textSize="@dimen/sw_11sp"
         android:visibility="invisible"
         app:drawableStartCompat="@drawable/login_error"
         tools:text="ddddd"
@@ -70,28 +71,28 @@
         android:id="@+id/btnLogin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="@dimen/sw_22dp"
         android:background="@drawable/bg_btn_login"
         android:text="@string/login"
         android:textColor="@color/white"
-        android:textSize="16sp" />
+        android:textSize="@dimen/sw_16sp" />
 
     <!--显示外部账号登录-->
     <LinearLayout
         android:id="@+id/llShowOutLogin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:gravity="center">
 
         <TextView
             android:id="@+id/tvShowOutLogin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="6dp"
+            android:padding="@dimen/sw_6dp"
             android:text="@string/external_account_login"
             android:textColor="@color/text_color_727778"
-            android:textSize="14sp" />
+            android:textSize="@dimen/sw_14sp" />
 
     </LinearLayout>
 
@@ -100,15 +101,16 @@
         android:id="@+id/llShowInnerLogin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:gravity="center"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/tvShowInnerLogin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="6dp"
+            android:padding="@dimen/sw_6dp"
             android:text="@string/group_account_login"
             android:textColor="@color/text_color_727778"
             android:textSize="@dimen/sw_14sp" />
@@ -116,13 +118,14 @@
         <View
             android:layout_width="@dimen/sw_1dp"
             android:layout_height="@dimen/sw_12dp"
+            android:layout_marginHorizontal="@dimen/sw_6dp"
             android:background="@color/text_color_727778" />
 
         <TextView
             android:id="@+id/tvForgetPwd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="6dp"
+            android:padding="@dimen/sw_6dp"
             android:text="@string/forget_the_password"
             android:textColor="@color/text_color_727778"
             android:textSize="@dimen/sw_14sp" />

app/src/main/res/layout/activity_login_input_code.xml

@@ -5,9 +5,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-<!--    <include-->
+    <!--    <include-->
-<!--        android:id="@+id/ilToolBar"-->
+    <!--        android:id="@+id/ilToolBar"-->
-<!--        layout="@layout/sh_toolbar" />-->
+    <!--        layout="@layout/sh_toolbar" />-->
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -23,19 +23,19 @@
         android:id="@+id/tvAccountDesc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:text="@string/please_input_code"
         android:textColor="@color/text_color_20"
-        android:textSize="20sp"
+        android:textSize="@dimen/sw_20sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/tvTips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="@dimen/sw_6dp"
         android:text="@string/the_verification_code_was_sent_for_login"
         android:textColor="@color/text_color_727778"
         android:textSize="@dimen/sw_14sp" />
@@ -44,9 +44,10 @@
         android:id="@+id/etInputCode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_23dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="@dimen/sw_24dp"
         app:code_number="6"
+        app:code_text_color="@color/text_color_20"
         app:line_color_default="@color/text_color_df"
         app:line_color_focus="@color/text_color_396bd0" />
 

app/src/main/res/layout/activity_main.xml

@@ -15,14 +15,14 @@
     <com.flyco.tablayout.CommonTabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
-        android:layout_height="54dp"
+        android:layout_height="@dimen/sw_54dp"
         android:background="@color/bg_color_main_tab"
-        tl:tl_iconHeight="23dp"
+        tl:tl_iconHeight="@dimen/sw_22dp"
-        tl:tl_iconWidth="23dp"
+        tl:tl_iconWidth="@dimen/sw_22dp"
         tl:tl_indicator_height="0dp"
         tl:tl_textSelectColor="@color/text_color_tab_selected"
         tl:tl_textUnselectColor="@color/text_color_tab_unselected"
-        tl:tl_textsize="12sp"
+        tl:tl_textsize="@dimen/sw_9sp"
         tl:tl_underline_color="@color/bg_color_main_underline_color"
         tl:tl_underline_gravity="TOP"
         tl:tl_underline_height="0.5dp" />

app/src/main/res/layout/activity_project_list.xml

@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         android:background="@color/transparent"
-        app:navigationIcon="@drawable/icon_toolbar_back"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:titleCentered="true"

app/src/main/res/layout/activity_set_new_pwd.xml

@@ -1,11 +1,11 @@
 <?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="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-<!--    <include layout="@layout/sh_toolbar" />-->
+    <!--    <include layout="@layout/sh_toolbar" />-->
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/set_new_password"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_20sp"
             android:textStyle="bold" />
 
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/sw_60dp"
             android:background="@drawable/bg_btn_login"
-            android:text="@string/confirm"
+            android:text="确认"
             android:textColor="@color/white"
             android:textSize="@dimen/sw_16sp" />
 

app/src/main/res/layout/activity_special_control_network_list.xml

@@ -1,6 +1,7 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -32,10 +33,10 @@
 
         <FrameLayout
             android:id="@+id/llSpinner"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/sw_103dp"
-            android:layout_height="30dp"
+            android:layout_height="@dimen/sw_30dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/sw_16dp"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="@dimen/sw_7dp"
             android:background="@drawable/bg_search"
             app:layout_constraintEnd_toStartOf="@id/searchWidget"
             app:layout_constraintHorizontal_weight="1"
@@ -46,25 +47,25 @@
                 android:id="@+id/spinner"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginVertical="7dp" />
+                android:textColor="@color/text_color_20"
+                android:textSize="@dimen/sw_11sp" />
 
         </FrameLayout>
 
         <View
             android:layout_width="0dp"
-            android:layout_height="2dp"
+            android:layout_height="@dimen/sw_2dp"
-            android:layout_marginTop="7dp"
             android:background="@drawable/bg_search_shadow_2"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/llSpinner"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
-            app:layout_constraintTop_toBottomOf="@id/llSpinner" />
 
         <com.project.survey.widget.SearchWidget
             android:id="@+id/searchWidget"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_weight="2"
+            app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/llSpinner"
             app:layout_constraintTop_toTopOf="parent"
             app:sw_hint="请输入控制网名称" />
@@ -79,8 +80,9 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="@dimen/sw_12dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+            tools:itemCount="3"
+            tools:listitem="@layout/item_special_control_network" />
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 </LinearLayout>

app/src/main/res/layout/fragment_home.xml

@@ -8,7 +8,7 @@
 
     <ImageView
         android:layout_width="match_parent"
-        android:layout_height="209dp"
+        android:layout_height="@dimen/sw_209dp"
         android:background="@drawable/bg_top_blue"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -16,10 +16,10 @@
         android:id="@+id/tvProject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_20dp"
         android:textColor="@color/text_color_fff"
-        android:textSize="20sp"
+        android:textSize="@dimen/sw_20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -29,10 +29,12 @@
         android:id="@+id/layoutFirst"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_16dp"
         android:background="@drawable/bg_section_r_8_top"
-        android:padding="@dimen/padding_side"
+        android:paddingHorizontal="@dimen/sw_22dp"
+        android:paddingTop="@dimen/sw_18dp"
+        android:paddingBottom="@dimen/sw_6dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvProject">
 
@@ -42,7 +44,7 @@
             android:layout_height="wrap_content"
             android:text="@string/beidou_application"
             android:textColor="@color/text_color_main"
-            android:textSize="@dimen/text_size_section_title"
+            android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -51,6 +53,7 @@
             android:id="@+id/itemPointMeasure"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sw_6dp"
             app:layout_constraintEnd_toStartOf="@id/itemLofting"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,10 +87,12 @@
         android:id="@+id/layoutSecond"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_16dp"
         android:background="@drawable/bg_section_r_8"
-        android:padding="@dimen/padding_side"
+        android:paddingHorizontal="@dimen/sw_22dp"
+        android:paddingTop="@dimen/sw_18dp"
+        android:paddingBottom="@dimen/sw_6dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layoutFirst">
 
@@ -97,7 +102,7 @@
             android:layout_height="wrap_content"
             android:text="@string/process_approval"
             android:textColor="@color/text_color_main"
-            android:textSize="@dimen/text_size_section_title"
+            android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -106,6 +111,7 @@
             android:id="@+id/itemToBeProcessed"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sw_6dp"
             app:layout_constraintEnd_toStartOf="@id/itemProcessed"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
@@ -141,10 +147,12 @@
         android:id="@+id/llThird"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_16dp"
         android:background="@drawable/bg_section_r_8"
-        android:padding="@dimen/padding_side"
+        android:paddingHorizontal="@dimen/sw_22dp"
+        android:paddingTop="@dimen/sw_18dp"
+        android:paddingBottom="@dimen/sw_6dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layoutSecond">
 
@@ -154,7 +162,7 @@
             android:layout_height="wrap_content"
             android:text="@string/engineering_control_network"
             android:textColor="@color/text_color_main"
-            android:textSize="@dimen/text_size_section_title"
+            android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -163,6 +171,7 @@
             android:id="@+id/itemControlNetFirst"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sw_6dp"
             app:layout_constraintEnd_toStartOf="@id/itemControlNetSpecial"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_instrument.xml

@@ -8,7 +8,7 @@
 
     <ImageView
         android:layout_width="match_parent"
-        android:layout_height="209dp"
+        android:layout_height="@dimen/sw_209dp"
         android:background="@drawable/bg_top_blue"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -16,10 +16,10 @@
         android:id="@+id/tvProject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_20dp"
         android:textColor="@color/text_color_fff"
-        android:textSize="20sp"
+        android:textSize="@dimen/sw_20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -29,10 +29,12 @@
         android:id="@+id/layoutFirst"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_16dp"
         android:background="@drawable/bg_section_r_8_top"
-        android:padding="@dimen/padding_side"
+        android:paddingHorizontal="@dimen/sw_22dp"
+        android:paddingTop="@dimen/sw_18dp"
+        android:paddingBottom="@dimen/sw_6dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvProject">
 
@@ -42,7 +44,7 @@
             android:layout_height="wrap_content"
             android:text="@string/instrument_online"
             android:textColor="@color/text_color_main"
-            android:textSize="@dimen/text_size_section_title"
+            android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -51,6 +53,7 @@
             android:id="@+id/itemConnectTotalStation"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sw_6dp"
             app:layout_constraintEnd_toStartOf="@id/itemConnectRTK"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
@@ -85,10 +88,12 @@
         android:id="@+id/layoutSecond"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/margin_side"
+        android:layout_marginHorizontal="@dimen/sw_20dp"
-        android:layout_marginTop="@dimen/margin_side"
+        android:layout_marginTop="@dimen/sw_16dp"
         android:background="@drawable/bg_section_r_8"
-        android:padding="@dimen/padding_side"
+        android:paddingHorizontal="@dimen/sw_22dp"
+        android:paddingTop="@dimen/sw_18dp"
+        android:paddingBottom="@dimen/sw_6dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layoutFirst">
 
@@ -98,7 +103,7 @@
             android:layout_height="wrap_content"
             android:text="@string/job_settings"
             android:textColor="@color/text_color_main"
-            android:textSize="@dimen/text_size_section_title"
+            android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -107,6 +112,7 @@
             android:id="@+id/itemTotalStationSetupStation"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sw_6dp"
             app:layout_constraintEnd_toStartOf="@id/itemMobileStationMode"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_me.xml

@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="22sp"
+            android:textSize="@dimen/sw_22sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -31,7 +31,7 @@
             android:id="@+id/tvProject"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/sw_6dp"
+            android:layout_marginTop="@dimen/sw_10dp"
             android:textColor="@color/white"
             android:textSize="@dimen/sw_15sp"
             app:layout_constraintStart_toStartOf="parent"
@@ -58,9 +58,9 @@
             android:layout_weight="1"
             android:drawablePadding="@dimen/sw_16dp"
             android:text="@string/switch_project"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_15sp"
-            app:drawableLeftCompat="@drawable/switch_project" />
+            app:drawableLeftCompat="@drawable/icon_switch_project" />
 
         <ImageView
             android:layout_width="wrap_content"
@@ -92,9 +92,9 @@
             android:layout_weight="1"
             android:drawablePadding="@dimen/sw_16dp"
             android:text="@string/change_pwd"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_15sp"
-            app:drawableStartCompat="@drawable/change_pwd" />
+            app:drawableStartCompat="@drawable/icon_change_pwd" />
 
         <ImageView
             android:layout_width="wrap_content"
@@ -126,15 +126,16 @@
             android:layout_weight="1"
             android:drawablePadding="@dimen/sw_16dp"
             android:text="@string/about"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_15sp"
-            app:drawableStartCompat="@drawable/about" />
+            app:drawableStartCompat="@drawable/icon_mine_about" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvVersion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
+            android:textSize="@dimen/sw_11sp"
             tools:text="1.0.0" />
 
         <ImageView
@@ -147,13 +148,13 @@
     <TextView
         android:id="@+id/tvLoginOut"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/sw_48dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="@dimen/sw_8dp"
         android:background="@color/white"
         android:gravity="center"
         android:text="@string/login_out"
         android:textColor="@color/text_color_20"
-        android:textSize="15sp" />
+        android:textSize="@dimen/sw_15sp" />
 
 
 </LinearLayout>

app/src/main/res/layout/fragment_point_measure_list.xml

@@ -9,7 +9,6 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="12dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:itemCount="2"
         tools:listitem="@layout/item_point_measure_list" />

app/src/main/res/layout/item_approval_approved.xml

@@ -4,17 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="12dp"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_5dp"
     android:background="@drawable/bg_white_round_4"
-    android:padding="12dp"
+    android:paddingHorizontal="@dimen/sw_14dp"
-    tools:layout_editor_absoluteX="12dp">
+    android:paddingTop="@dimen/sw_10dp"
+    android:paddingBottom="@dimen/sw_12dp">
 
     <TextView
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_20"
-        android:textSize="13sp"
+        android:textSize="@dimen/sw_13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -25,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_727778"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName"
         tools:text="XMBH2021-00001" />
@@ -34,12 +36,12 @@
         android:id="@+id/tvStatus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="@dimen/sw_5dp"
         android:background="@drawable/bg_approval_blue_stroke"
-        android:paddingHorizontal="4dp"
+        android:paddingHorizontal="@dimen/sw_4dp"
-        android:paddingVertical="1dp"
+        android:paddingVertical="@dimen/sw_1dp"
         android:textColor="@color/text_color_396bd0"
-        android:textSize="10sp"
+        android:textSize="@dimen/sw_10sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvNo"
         tools:text="监理审核" />
@@ -48,10 +50,10 @@
         android:id="@+id/tvReceiverKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:text="接&#8194;收&#8194;人："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvStatus" />
 
@@ -59,8 +61,8 @@
         android:id="@+id/tvReceiver"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_404145"
+        android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvReceiverKey"
         app:layout_constraintStart_toEndOf="@id/tvReceiverKey"
         tools:text="Tom" />
@@ -69,10 +71,10 @@
         android:id="@+id/tvStartTimeKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
         android:text="办理时间："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReceiverKey" />
 
@@ -80,8 +82,8 @@
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_404145"
+        android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvStartTimeKey"
         app:layout_constraintStart_toEndOf="@id/tvStartTimeKey"
         tools:text="2022-06-10 09:27:49" />

app/src/main/res/layout/item_approval_owner.xml

@@ -4,16 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="12dp"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_5dp"
     android:background="@drawable/bg_white_round_4"
-    android:padding="12dp">
+    android:paddingHorizontal="@dimen/sw_14dp"
+    android:paddingTop="@dimen/sw_10dp"
+    android:paddingBottom="@dimen/sw_12dp">
 
     <TextView
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_20"
-        android:textSize="13sp"
+        android:textSize="@dimen/sw_13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -24,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_727778"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName"
         tools:text="XMBH2021-00001" />
@@ -33,10 +36,10 @@
         android:id="@+id/tvStartTimeKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:text="发起时间："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvNo" />
 
@@ -44,8 +47,8 @@
         android:id="@+id/tvStartTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_404145"
+        android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvStartTimeKey"
         app:layout_constraintStart_toEndOf="@id/tvStartTimeKey"
         tools:text="2022-06-10 09:27:49" />
@@ -54,10 +57,10 @@
         android:id="@+id/tvEndTimeKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
         android:text="结束时间："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvStartTimeKey" />
 
@@ -65,8 +68,8 @@
         android:id="@+id/tvEndTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_404145"
+        android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvEndTimeKey"
         app:layout_constraintStart_toEndOf="@id/tvEndTimeKey"
         tools:text="2022-06-10 09:27:49" />

app/src/main/res/layout/item_control_net_first.xml

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_5dp"
     android:background="@drawable/bg_white_round_4"
     android:orientation="vertical"
-    android:paddingHorizontal="@dimen/sw_12dp"
+    android:paddingHorizontal="@dimen/sw_14dp"
-    android:paddingTop="@dimen/sw_12dp"
+    android:paddingBottom="@dimen/sw_5dp">
-    android:paddingBottom="@dimen/sw_6dp">
 
     <TextView
         android:id="@+id/tvPointName"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/sw_44dp"
-        tools:text="点名称"
+        android:gravity="center_vertical"
-        android:textColor="@color/text_color_1"
+        android:textColor="@color/text_color_20"
         android:textSize="@dimen/sw_13sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        tools:text="点名称" />
 
     <include
         layout="@layout/line_hor"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sw_0_5dp"
+        android:layout_height="@dimen/sw_0_5dp" />
-        android:layout_marginTop="@dimen/sw_12dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -35,7 +36,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="X(m)"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_12sp" />
 
         <TextView
@@ -44,9 +45,9 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="end"
-            tools:text="362122.22"
+            android:textColor="@color/text_color_404145"
-            android:textColor="@color/text_color_1"
+            android:textSize="@dimen/sw_12sp"
-            android:textSize="@dimen/sw_12sp" />
+            tools:text="362122.22" />
 
     </LinearLayout>
 
@@ -61,7 +62,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="Y(m)"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_12sp" />
 
         <TextView
@@ -70,9 +71,9 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="end"
-            android:text="362122.22"
+            android:textColor="@color/text_color_404145"
-            android:textColor="@color/text_color_1"
+            android:textSize="@dimen/sw_12sp"
-            android:textSize="@dimen/sw_12sp" />
+            tools:text="362122.22" />
 
     </LinearLayout>
 
@@ -87,7 +88,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="Z(m)"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_12sp" />
 
         <TextView
@@ -96,9 +97,9 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="end"
-            android:text="362122.22"
+            android:textColor="@color/text_color_404145"
-            android:textColor="@color/text_color_1"
+            android:textSize="@dimen/sw_12sp"
-            android:textSize="@dimen/sw_12sp" />
+            tools:text="362122.22" />
 
     </LinearLayout>
 
@@ -113,7 +114,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="施测时间"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_12sp" />
 
         <TextView
@@ -122,9 +123,9 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="end"
-            android:text="2022-06-10 09:27:49"
+            android:textColor="@color/text_color_404145"
-            android:textColor="@color/text_color_1"
+            android:textSize="@dimen/sw_12sp"
-            android:textSize="@dimen/sw_12sp" />
+            tools:text="2022-06-10 09:27:49" />
 
     </LinearLayout>
 
@@ -139,18 +140,21 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:text="备注"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
             android:textSize="@dimen/sw_12sp" />
 
         <TextView
             android:id="@+id/tvRemark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/sw_20dp"
             android:layout_weight="1"
+            android:ellipsize="end"
             android:gravity="end"
-            android:text=""
+            android:maxLines="2"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_404145"
-            android:textSize="@dimen/sw_12sp" />
+            android:textSize="@dimen/sw_12sp"
+            tools:text="都会大喊大叫好多好多好多好多好多好多好多好多好多好多的很好好多好多好多好多" />
 
     </LinearLayout>
 

app/src/main/res/layout/item_lofting_list.xml

@@ -4,15 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_6dp"
     android:background="@drawable/bg_white_round_4"
-    android:padding="12dp">
+    android:paddingHorizontal="14dp"
+    android:paddingTop="@dimen/sw_10dp"
+    android:paddingBottom="@dimen/sw_12dp">
 
     <TextView
         android:id="@+id/tvWorkName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_20"
-        android:textSize="13sp"
+        android:textSize="@dimen/sw_13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -22,10 +26,10 @@
         android:id="@+id/tvWorkDescKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:text="作&#8194;业&#8194;描&#8194;述&#8194;："
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvWorkName" />
 
@@ -33,8 +37,8 @@
         android:id="@+id/tvWorkDesc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvWorkDescKey"
         app:layout_constraintStart_toEndOf="@id/tvWorkDescKey"
         tools:text="内容" />
@@ -43,10 +47,10 @@
         android:id="@+id/tvCreateTimeKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
         android:text="创&#8194;建&#8194;时&#8194;间&#8194;："
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvWorkDescKey" />
 
@@ -54,8 +58,8 @@
         android:id="@+id/tvCreateTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvCreateTimeKey"
         app:layout_constraintStart_toEndOf="@id/tvCreateTimeKey"
         tools:text="2022-05-17 10:58:48" />
@@ -64,10 +68,10 @@
         android:id="@+id/tvProjectNameKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
         android:text="分项工程名称："
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvCreateTimeKey" />
 
@@ -75,8 +79,8 @@
         android:id="@+id/tvProjectName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvProjectNameKey"
         app:layout_constraintStart_toEndOf="@id/tvProjectNameKey"
         tools:text="单位-分部-分项 3个名称合并显示" />
@@ -85,10 +89,10 @@
         android:id="@+id/tvSurveyorKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
-        android:text="测&#12288;&#8194;量&#12288;&#8194;员："
+        android:text="测&#12288;量&#12288;员&#12288;："
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" />
 
@@ -96,8 +100,8 @@
         android:id="@+id/tvSurveyor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvSurveyorKey"
         app:layout_constraintStart_toEndOf="@id/tvSurveyorKey"
         tools:text="丁汉臻" />
@@ -105,8 +109,8 @@
     <View
         android:id="@+id/viewLine"
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/sw_1dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/sw_10dp"
         android:background="@color/c_ebebeb"
         app:layout_constraintTop_toBottomOf="@id/tvSurveyorKey" />
 
@@ -114,13 +118,13 @@
         android:id="@+id/tvLofting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/sw_10dp"
         android:background="@drawable/bg_point_measure_selector"
-        android:paddingHorizontal="28dp"
+        android:paddingHorizontal="@dimen/sw_28dp"
-        android:paddingVertical="6dp"
+        android:paddingVertical="@dimen/sw_6dp"
         android:text="@string/lofting"
         android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/viewLine" />
 

app/src/main/res/layout/item_point_measure_list.xml

@@ -4,15 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_6dp"
     android:background="@drawable/bg_white_round_4"
-    android:padding="12dp">
+    android:paddingHorizontal="@dimen/sw_14dp"
+    android:paddingTop="@dimen/sw_10dp"
+    android:paddingBottom="@dimen/sw_12dp">
 
     <TextView
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_20"
-        android:textSize="13sp"
+        android:textSize="@dimen/sw_13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -23,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_727778"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName"
         tools:text="XMBH2021-00001" />
@@ -32,12 +36,12 @@
         android:id="@+id/tvType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="@dimen/sw_5dp"
         android:background="@drawable/bg_approval_blue_stroke"
-        android:paddingHorizontal="4dp"
+        android:paddingHorizontal="@dimen/sw_4dp"
-        android:paddingVertical="1dp"
+        android:paddingVertical="@dimen/sw_1dp"
         android:textColor="@color/colorPrimary"
-        android:textSize="10sp"
+        android:textSize="@dimen/sw_10sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvNO"
         tools:text="测量类型" />
@@ -46,10 +50,10 @@
         android:id="@+id/tvProjectNameKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/sw_12dp"
         android:text="分项工程名称："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvType" />
 
@@ -58,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvProjectNameKey"
         app:layout_constraintStart_toEndOf="@id/tvProjectNameKey"
         tools:text="单位-分部-分项3个名称合并显示" />
@@ -67,10 +71,10 @@
         android:id="@+id/tvMeasureContentKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
         android:text="测&#8194;量&#8194;内&#8194;容&#8194;："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" />
 
@@ -79,7 +83,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvMeasureContentKey"
         app:layout_constraintStart_toEndOf="@id/tvMeasureContentKey"
         tools:text="内容名称" />
@@ -88,10 +92,10 @@
         android:id="@+id/tvApplyUserKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/sw_4dp"
-        android:text="申&#12288;&#8194;请&#12288;&#8194;人："
+        android:text="申&#12288;请&#12288;人&#12288;："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvMeasureContentKey" />
 
@@ -100,7 +104,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvApplyUserKey"
         app:layout_constraintStart_toEndOf="@id/tvApplyUserKey"
         tools:text="丁汉臻" />
@@ -108,8 +112,8 @@
     <View
         android:id="@+id/viewLine"
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/sw_1dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/sw_10dp"
         android:background="@color/c_ebebeb"
         app:layout_constraintTop_toBottomOf="@id/tvApplyUserKey" />
 
@@ -117,13 +121,13 @@
         android:id="@+id/tvGenerateForm"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/sw_8dp"
         android:background="@drawable/bg_point_measure_selector"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="@dimen/sw_16dp"
-        android:paddingVertical="6dp"
+        android:paddingVertical="@dimen/sw_6dp"
         android:text="生成报验单"
         android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
         app:layout_constraintEnd_toStartOf="@id/tvStopMeasure" />
 
@@ -131,13 +135,13 @@
         android:id="@+id/tvStopMeasure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/sw_8dp"
         android:background="@drawable/bg_point_measure_selector"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="@dimen/sw_16dp"
-        android:paddingVertical="6dp"
+        android:paddingVertical="@dimen/sw_6dp"
         android:text="结束测量"
         android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
         app:layout_constraintEnd_toStartOf="@id/tvEnterMeasure" />
 
@@ -145,13 +149,13 @@
         android:id="@+id/tvEnterMeasure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/sw_10dp"
         android:background="@drawable/bg_point_measure_selector"
-        android:paddingHorizontal="16dp"
+        android:paddingHorizontal="@dimen/sw_16dp"
-        android:paddingVertical="6dp"
+        android:paddingVertical="@dimen/sw_6dp"
         android:text="进入测量"
         android:textColor="@color/text_color_20"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/viewLine" />
 

app/src/main/res/layout/item_project_list.xml

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingHorizontal="16dp"
+    android:padding="@dimen/sw_16dp">
-    android:paddingVertical="18dp">
 
     <ImageView
         android:id="@+id/ivIcon"
@@ -20,9 +19,9 @@
         android:id="@+id/tvProjectName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="@dimen/sw_14dp"
         android:textColor="@color/text_color_20"
-        android:textSize="15sp"
+        android:textSize="@dimen/sw_15sp"
         android:textStyle="bold"
         app:layout_constraintStart_toEndOf="@id/ivIcon"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,11 +31,10 @@
         android:id="@+id/tvProjectNum"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
+        android:layout_marginTop="@dimen/sw_3dp"
-        android:layout_marginTop="3dp"
         android:textColor="@color/text_color_727778"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_11sp"
-        app:layout_constraintStart_toEndOf="@id/ivIcon"
+        app:layout_constraintStart_toStartOf="@id/tvProjectName"
         app:layout_constraintTop_toBottomOf="@id/tvProjectName"
         tools:text="XMBH2021-00001" />
 
@@ -45,7 +43,7 @@
 <!--        android:layout_width="wrap_content"-->
 <!--        android:layout_height="wrap_content"-->
 <!--        android:textColor="@color/text_color_727778"-->
-<!--        android:textSize="12sp"-->
+<!--        android:textSize="@dimen/sw_11sp"-->
 <!--        app:layout_constraintBottom_toBottomOf="@id/tvProjectNum"-->
 <!--        app:layout_constraintStart_toEndOf="@id/tvProjectNum"-->
 <!--        app:layout_constraintTop_toTopOf="@id/tvProjectNum"-->

app/src/main/res/layout/item_special_control_network.xml

@@ -4,16 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/sw_12dp"
+    android:layout_marginVertical="@dimen/sw_6dp"
     android:background="@drawable/bg_white_round_4"
-    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/sw_14dp"
-    android:padding="12dp">
+    android:paddingVertical="@dimen/sw_10dp">
 
     <TextView
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text_color_20"
-        android:textSize="13sp"
+        android:textSize="@dimen/sw_13sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -24,9 +26,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/sw_12dp"
-        android:text="等&#12288;&#12288;级："
+        android:text="等&#12288;级&#12288;："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName" />
 
@@ -34,11 +36,10 @@
         android:id="@+id/tvLevel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/sw_12dp"
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
+        app:layout_constraintBaseline_toBaselineOf="@id/tvLevelKey"
         app:layout_constraintStart_toEndOf="@id/tvLevelKey"
-        app:layout_constraintTop_toBottomOf="@id/tvName"
         tools:text="内容" />
 
     <TextView
@@ -48,7 +49,7 @@
         android:layout_marginTop="@dimen/sw_4dp"
         android:text="施测时间："
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvLevelKey" />
 
@@ -56,11 +57,10 @@
         android:id="@+id/tvTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/sw_4dp"
         android:textColor="@color/text_color_404145"
-        android:textSize="12sp"
+        android:textSize="@dimen/sw_12sp"
+        app:layout_constraintBaseline_toBaselineOf="@id/tvTimeKey"
         app:layout_constraintStart_toEndOf="@id/tvTimeKey"
-        app:layout_constraintTop_toBottomOf="@id/tvLevelKey"
         tools:text="2022-05-17 10:58:48" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/layout_no_data.xml

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:text="暂无数据"
         android:textColor="@color/text_color_20"
-        android:textSize="@dimen/text_size_body2"
+        android:textSize="@dimen/sw_14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/verifation_code_item.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:padding="3dp"
+    android:layout_weight="1"
-    android:layout_weight="1">
+    android:padding="@dimen/sw_3dp"
+    tools:layout_width="match_parent">
 
     <com.project.survey.widget.edittext.verificationcode.MyEditText
         android:id="@+id/tv_code"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/sw_41dp"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/sw_50dp"
         android:layout_centerInParent="true"
-        android:paddingTop="10dp"
+        android:background="@drawable/bg_item_input_code"
-        android:paddingBottom="10dp"
         android:gravity="center"
-        android:textSize="25sp"
+        android:textSize="@dimen/sw_20sp"
-        android:background="@drawable/bg_item_input_code"/>
+        tools:text="1" />
 </RelativeLayout>

app/src/main/res/layout/view_password.xml

@@ -18,12 +18,12 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:padding="@dimen/sw_12dp">
+        android:padding="@dimen/sw_4dp">
 
         <ImageView
             android:id="@+id/ivPwdShowHide"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/sw_16dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/sw_14dp"
             android:background="@drawable/bg_pwd_sc" />
 
     </FrameLayout>

app/src/main/res/layout/widget_search.xml

@@ -6,17 +6,17 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="30dp"
+        android:layout_height="@dimen/sw_30dp"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginHorizontal="@dimen/sw_16dp"
-        android:layout_marginVertical="7dp"
+        android:layout_marginVertical="@dimen/sw_7dp"
         android:background="@drawable/bg_search"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingHorizontal="18dp">
+        android:paddingHorizontal="@dimen/sw_16dp">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/sw_13dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/sw_13dp"
             android:src="@drawable/ic_search" />
 
         <EditText
@@ -27,17 +27,17 @@
             android:hint="请输入"
             android:imeOptions="actionSearch"
             android:inputType="text"
-            android:paddingHorizontal="6dp"
+            android:paddingHorizontal="@dimen/sw_8dp"
             android:singleLine="true"
-            android:textColor="@color/text_color_1"
+            android:textColor="@color/text_color_20"
-            android:textColorHint="@color/text_color_2"
+            android:textColorHint="@color/text_color_5b5a5e"
-            android:textSize="11sp" />
+            android:textSize="@dimen/sw_11sp" />
 
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="2dp"
+        android:layout_height="@dimen/sw_2dp"
         android:background="@drawable/bg_search_shadow_2" />
 
 </LinearLayout>

app/src/main/res/layout/widget_section_item.xml

@@ -4,12 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="12dp">
+    android:paddingVertical="@dimen/sw_12dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/ivIcon"
-        android:layout_width="44dp"
+        android:layout_width="@dimen/sw_44dp"
-        android:layout_height="44dp"
+        android:layout_height="@dimen/sw_44dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -22,7 +22,7 @@
         android:background="@drawable/bg_badge"
         android:gravity="center"
         android:textColor="@color/text_color_fff"
-        android:textSize="9sp"
+        android:textSize="@dimen/sw_9sp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/ivIcon"
         app:layout_constraintTop_toTopOf="@id/ivIcon"
@@ -33,9 +33,9 @@
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/sw_9dp"
         android:textColor="@color/text_color_main"
-        android:textSize="@dimen/text_size_section_item"
+        android:textSize="@dimen/sw_13sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ivIcon"

app/src/main/res/values/color.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#2964DA</color>
+    <color name="colorPrimary">#396BD0</color>
 
     <!--新增-->
     <color name="bg_content">#f8f8f8</color>
@@ -25,6 +25,7 @@
     <color name="text_color_CC5155">#CC5155</color>
     <color name="text_color_396bd0">#396BD0</color>
     <color name="text_color_404145">#404145</color>
+    <color name="text_color_5b5a5e">#5B5A5E</color>
 
     <color name="bg_color_home_page">#F9FAFB</color>
     <color name="bg_color_main_tab">#FFFFFF</color>

app/src/main/res/values/styles.xml

@@ -120,8 +120,8 @@
     </declare-styleable>
 
     <style name="ToolbarTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">@dimen/sw_15sp</item>
-        <item name="android:textColor">@color/text_color_main</item>
+        <item name="android:textColor">@color/text_color_20</item>
     </style>
 
 </resources>

colorful/src/main/res/values/colors.xml

@@ -4,8 +4,8 @@
     <!-- google's material design colours from
     http://www.google.com/design/spec/style/color.html#color-ui-color-palette -->
 
-    <color name="shang_hai_color">#2964DA</color>
+    <color name="shang_hai_color">#396BD0</color>
-    <color name="colorPrimary">#2964DA</color>
+    <color name="colorPrimary">#396BD0</color>
     <color name="c_ebebeb">#EBEBEB</color>
 
     <!--red-->