refactor(更新)

- 按钮调整

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

@@ -4,5 +4,5 @@
     <stroke
         android:width="@dimen/divider_line_space"
         android:color="@color/black" />
-    <solid android:color="@color/white" />
+    <solid android:color="@color/color_e9ecf4" />
 </shape>

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

@@ -4,5 +4,5 @@
     <stroke
         android:width="@dimen/divider_line_space"
         android:color="@color/black" />
-    <solid android:color="@color/white80" />
+    <solid android:color="@color/color_e9ecf4" />
 </shape>

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

@@ -1,5 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM11,17h2v-4h4v-2h-4L13,7h-2v4L7,11v2h4z"/>
-    
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_add_box_disable" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_add_box_enable" />
+</selector>

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

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="@color/color_black50"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/color_77797c"
+        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM11,17h2v-4h4v-2h-4L13,7h-2v4L7,11v2h4z" />
+
+</vector>

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

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="@color/color_black80"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM11,17h2v-4h4v-2h-4L13,7h-2v4L7,11v2h4z" />
+
+</vector>

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

@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/vector_icon_size"
-    android:height="@dimen/vector_icon_size"
-    android:autoMirrored="true"
-    android:tint="#000000"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,10l5,5 5,-5z" />
-
-</vector>

app/src/main/res/layout-land/fragment_create_job.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -110,7 +115,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_job_workstation"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -141,7 +146,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_flow_mode"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -234,8 +239,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent"/>
 
                         <TextView
                             android:id="@+id/select_workflow_tip"

app/src/main/res/layout-land/fragment_create_sop.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -110,7 +115,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_sop_workstation"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -141,7 +146,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_flow_mode"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -233,8 +238,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"
@@ -508,10 +512,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -519,10 +527,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout-land/fragment_create_sop_job.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -110,7 +115,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_sop_workstation"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -142,7 +147,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_sop"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -234,8 +239,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"

app/src/main/res/layout-land/fragment_edit_job.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -111,7 +116,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_job_workstation"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -142,7 +147,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:drawableRight="@drawable/icon_drop_down"
+                                android:drawableRight="@mipmap/icon_drop_down"
                                 android:hint="@string/please_select_flow_mode"
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
@@ -234,8 +239,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"

app/src/main/res/layout-land/fragment_edit_sop.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -106,7 +111,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:hint="@string/please_select_sop_workstation"
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
@@ -137,7 +142,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:hint="@string/please_select_flow_mode"
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
@@ -228,8 +233,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"
@@ -445,10 +449,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -456,10 +464,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout-land/fragment_edit_sop_job.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -106,7 +111,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:hint="@string/please_select_sop_workstation"
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
@@ -138,7 +143,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:hint="@string/please_select_sop"
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
@@ -229,8 +234,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"

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

@@ -87,7 +87,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -114,7 +114,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -322,7 +322,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"

app/src/main/res/layout-land/fragment_job_execute.xml

@@ -37,8 +37,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

app/src/main/res/layout-land/fragment_point_manage.xml

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

app/src/main/res/layout-land/fragment_select_memeber.xml

@@ -59,8 +59,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -216,10 +221,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -227,10 +236,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout-land/fragment_select_point.xml

@@ -59,8 +59,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -155,10 +160,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -166,10 +175,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout-land/item_job_workflow_step.xml

@@ -12,7 +12,7 @@
             android:id="@+id/step_layout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/workflow_step_item_height"
-            android:layout_marginLeft="@dimen/common_spacing"
+            android:layout_marginHorizontal="@dimen/common_spacing"
             android:background="@drawable/bg_job_execute_step"
             android:gravity="center"
             android:minWidth="@dimen/workflow_step_item_width"
@@ -44,7 +44,6 @@
             android:id="@+id/divider_iv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_spacing"
             android:src="@drawable/icon_job_execute_arrow_right" />
     </LinearLayout>
 

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

@@ -94,7 +94,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:hint="@string/please_select_card_username"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -185,19 +185,30 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -212,10 +212,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -223,10 +227,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -184,19 +184,30 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -125,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_power_type"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -158,7 +158,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -190,7 +190,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_rfid_tag"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -215,10 +215,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -226,10 +230,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -184,19 +184,30 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -209,10 +209,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -220,10 +224,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -149,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:hint="@string/please_select_role"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -177,7 +177,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:hint="@string/please_select_area"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -239,10 +239,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -250,10 +254,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -86,10 +86,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -97,10 +101,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -94,7 +94,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:hint="@string/please_select_card_username"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -158,10 +158,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -169,10 +173,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -184,10 +184,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -195,10 +199,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -157,10 +157,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -168,10 +172,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -125,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_power_type"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -158,7 +158,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -214,10 +214,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -225,10 +229,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -157,10 +157,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -168,10 +172,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -155,10 +155,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -166,10 +170,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -186,10 +186,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -197,10 +201,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:hint="@string/please_select_card_username"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -183,10 +183,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -194,10 +198,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -212,10 +212,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -223,10 +227,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -182,10 +182,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -193,10 +197,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -125,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_power_type"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -158,7 +158,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -190,7 +190,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_rfid_tag"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -215,10 +215,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -226,10 +230,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -182,10 +182,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -193,10 +197,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -209,10 +209,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -220,10 +224,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:hint="@string/please_select_role"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -176,7 +176,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:drawableRight="@drawable/icon_drop_down"
+                android:drawableRight="@mipmap/icon_drop_down"
                 android:hint="@string/please_select_area"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -238,10 +238,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -249,10 +253,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -20,7 +20,7 @@
             <ImageView
                 android:layout_width="@dimen/common_spacing_2x"
                 android:layout_height="@dimen/common_spacing_2x"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:src="@mipmap/icon_job_manage_create_job" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -95,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_job_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -126,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_flow_mode"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -196,6 +201,7 @@
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/workflow_mode"
+                        android:layout_gravity="center_vertical"
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -203,8 +209,7 @@
                         android:id="@+id/workflow_mode_setting_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_marginRight="@dimen/common_spacing"
+                        android:layout_margin="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/settings"
@@ -225,8 +230,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="@dimen/common_spacing" />
+                        android:layout_height="match_parent" />
 
                     <TextView
                         android:id="@+id/select_workflow_tip"
@@ -237,7 +241,7 @@
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
                         android:text="@string/please_select_workflow_mode"
-                        android:textColor="@color/black"
+                        android:textColor="@color/color_black50"
                         android:textSize="@dimen/normal_text_size_18" />
                 </FrameLayout>
             </LinearLayout>
@@ -264,6 +268,7 @@
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/point_info_title"
+                        android:layout_gravity="center_vertical"
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -271,8 +276,7 @@
                         android:id="@+id/select_point_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_marginRight="@dimen/common_spacing"
+                        android:layout_margin="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
@@ -315,7 +319,7 @@
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
                             android:text="@string/please_must_select_at_least_one_point"
-                            android:textColor="@color/black"
+                            android:textColor="@color/color_black50"
                             android:textSize="@dimen/normal_text_size_18" />
                     </LinearLayout>
                 </FrameLayout>
@@ -343,6 +347,7 @@
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/member_info_title"
+                        android:layout_gravity="center_vertical"
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -350,8 +355,7 @@
                         android:id="@+id/select_member_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/common_spacing"
-                        android:layout_marginRight="@dimen/common_spacing"
+                        android:layout_margin="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:text="@string/select"
@@ -470,7 +474,7 @@
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
                             android:text="@string/please_select_member"
-                            android:textColor="@color/black"
+                            android:textColor="@color/color_black50"
                             android:textSize="@dimen/normal_text_size_18" />
                     </LinearLayout>
                 </FrameLayout>
@@ -481,8 +485,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:paddingVertical="@dimen/common_spacing">
+            android:paddingHorizontal="@dimen/common_spacing">
 
             <CheckBox
                 android:id="@+id/save_sop"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -95,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -126,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_flow_mode"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -193,6 +198,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/workflow_mode"
@@ -203,6 +209,7 @@
                         android:id="@+id/workflow_mode_setting_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginVertical="5dp"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
@@ -225,8 +232,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="@dimen/common_spacing" />
+                        android:layout_height="match_parent" />
 
                     <TextView
                         android:id="@+id/select_workflow_tip"
@@ -261,6 +267,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/point_info_title"
@@ -271,6 +278,7 @@
                         android:id="@+id/select_point_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginVertical="5dp"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
@@ -315,7 +323,7 @@
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
                             android:text="@string/please_must_select_at_least_one_point"
-                            android:textColor="@color/black"
+                            android:textColor="@color/black50"
                             android:textSize="@dimen/normal_text_size_18" />
                     </LinearLayout>
                 </FrameLayout>
@@ -342,6 +350,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
                         android:text="@string/member_info_title"
@@ -352,6 +361,7 @@
                         android:id="@+id/select_member_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginVertical="5dp"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_marginRight="@dimen/common_spacing"
                         android:background="@drawable/common_btn"
@@ -472,7 +482,7 @@
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
                             android:text="@string/please_select_member"
-                            android:textColor="@color/black"
+                            android:textColor="@color/black50"
                             android:textSize="@dimen/normal_text_size_18" />
                     </LinearLayout>
                 </FrameLayout>
@@ -493,10 +503,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -504,10 +518,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -95,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -127,7 +132,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -225,8 +230,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="@dimen/common_spacing" />
+                        android:layout_height="match_parent" />
 
                     <TextView
                         android:id="@+id/select_workflow_tip"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -101,7 +106,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:drawableRight="@drawable/icon_drop_down"
+                        android:drawableRight="@mipmap/icon_drop_down"
                         android:hint="@string/please_select_job_workstation"
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
@@ -132,7 +137,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:drawableRight="@drawable/icon_drop_down"
+                        android:drawableRight="@mipmap/icon_drop_down"
                         android:hint="@string/please_select_flow_mode"
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
@@ -231,8 +236,7 @@
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:paddingBottom="@dimen/common_spacing" />
+                            android:layout_height="match_parent" />
                     </FrameLayout>
                 </LinearLayout>
 

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -95,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -126,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_flow_mode"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -225,8 +230,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="@dimen/common_spacing" />
+                        android:layout_height="match_parent" />
                 </FrameLayout>
             </LinearLayout>
 
@@ -422,10 +426,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -433,10 +441,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -95,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop_workstation"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -127,7 +132,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@drawable/icon_drop_down"
+                    android:drawableRight="@mipmap/icon_drop_down"
                     android:hint="@string/please_select_sop"
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
@@ -226,8 +231,7 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="@dimen/common_spacing" />
+                        android:layout_height="match_parent" />
                 </FrameLayout>
             </LinearLayout>
 

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -87,7 +87,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -114,7 +114,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -322,7 +322,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:drawableRight="@drawable/icon_drop_down"
+                            android:drawableRight="@mipmap/icon_drop_down"
                             android:gravity="center_vertical"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -37,8 +37,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -37,8 +37,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -167,21 +172,30 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -59,8 +59,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -206,10 +211,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -217,10 +226,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -59,8 +59,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -154,10 +159,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -165,10 +174,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -37,8 +37,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"
@@ -164,21 +169,30 @@
                 android:id="@+id/confirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_confirm"
+                android:drawableLeft="@mipmap/icon_confirm"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/confirm"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
                 android:id="@+id/cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:layout_marginLeft="@dimen/common_spacing"
+                android:background="@drawable/common_btn_cancel"
+                android:drawableLeft="@mipmap/icon_cancel"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/cancel"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </LinearLayout>

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -35,8 +35,13 @@
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="5dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
+                android:drawableLeft="@mipmap/icon_back"
+                android:drawablePadding="@dimen/common_spacing"
+                android:gravity="center"
+                android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:text="@string/back"
                 android:textColor="@color/black"

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

@@ -12,7 +12,7 @@
             android:id="@+id/step_layout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/workflow_step_item_height"
-            android:layout_marginLeft="@dimen/common_spacing"
+            android:layout_marginHorizontal="@dimen/common_spacing"
             android:background="@drawable/bg_job_execute_step"
             android:gravity="center"
             android:minWidth="@dimen/workflow_step_item_width"
@@ -44,7 +44,6 @@
             android:id="@+id/divider_iv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_spacing"
             android:src="@drawable/icon_job_execute_arrow_right" />
     </LinearLayout>
 

app/src/main/res/values-land/dimens.xml

@@ -86,4 +86,5 @@
     <dimen name="home_menu_item_iv_layout_size">120dp</dimen>
     <dimen name="home_menu_item_iv_size">80dp</dimen>
     <dimen name="home_menu_item_tv_text_size">25sp</dimen>
+    <dimen name="common_btn_height">40dp</dimen>
 </resources>

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

@@ -12,4 +12,9 @@
     <color name="color_ffc9c9">#ffc9c9</color>
     <color name="color_a5d8ff">#a5d8ff</color>
     <color name="init_step_circle">#228be6</color>
+    <color name="color_e9ecf4">#e9ecf4</color>
+    <color name="color_77797c">#77797c</color>
+    <color name="color_303132">#303132</color>
+    <color name="color_black50">#80000000</color>
+    <color name="color_black80">#cc000000</color>
 </resources>

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

@@ -89,4 +89,5 @@
     <dimen name="home_menu_item_iv_layout_size">120dp</dimen>
     <dimen name="home_menu_item_iv_size">80dp</dimen>
     <dimen name="home_menu_item_tv_text_size">25sp</dimen>
+    <dimen name="common_btn_height">40dp</dimen>
 </resources>

ui-base/src/main/res/drawable/common_btn.xml

@@ -4,5 +4,5 @@
     <stroke
         android:width="@dimen/divider_line_space"
         android:color="@color/black" />
-    <corners android:radius="4dp" />
+    <corners android:radius="8dp" />
 </shape>

ui-base/src/main/res/drawable/common_btn_cancel.xml

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

ui-base/src/main/res/drawable/common_btn_confirm.xml

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

ui-base/src/main/res/values/colors.xml

@@ -50,4 +50,6 @@
     <color name="common_tip_dialog_success">#099268</color>
     <color name="home_card_title_bg">#228be6</color>
     <color name="dirtyColor">#F44336</color>
+    <color name="color_008000">#008000</color>
+    <color name="color_ff0000">#ff0000</color>
 </resources>