From daaf651c04ee745baa2ff660ff145c2d129e3d2e Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <timyih@icloud.com>
Date: Mon, 26 Oct 2026 11:53:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(phone):=20=E6=97=A7=E7=89=88=E6=89=8B?=
 =?UTF-8?q?=E6=8C=81=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E5=8C=BA?=
 =?UTF-8?q?=E8=93=9D=E8=89=B2=E7=BB=9F=E4=B8=80=E4=B8=BA=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E6=A0=87=E5=87=86=E8=89=B2=20phone=5Fprimary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- module_p 旧页面布局（列表/新增/详情/弹框/列表项）中 colorPrimary(#1C8CF5)、
  @color/blue 全部改为 phone_primary(#2563EB)：数量标签、底部按钮、表单标签、Tab、悬浮按钮等
- 单色图标（数量三角、收运记录入口、打印、加货物、搜索、上传加号、勾选框）改用 tint 着色，
  无需新图；勾选框新增着色包装 img_pda_check_n/s
- 开始收运底部按钮新增 bg_pda_btn_bottom 覆盖 tv_bottom_btn 背景
- 原 colorPrimary / bg_btn_bottom / 位图资源均与平板共用，未改动，平板不受影响

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../main/res/layout/pda_item_image_select.xml |  3 ++-
 .../main/res/drawable/bg_pda_btn_bottom.xml   | 11 ++++++++++
 .../src/main/res/drawable/img_pda_check_n.xml |  5 +++++
 .../src/main/res/drawable/img_pda_check_s.xml |  5 +++++
 .../main/res/drawable/p_checkbox_selector.xml |  4 ++--
 .../res/layout/activity_accident_visa_add.xml |  4 ++--
 .../res/layout/activity_gnc_un_shou_yun.xml   |  9 +++++----
 .../res/layout/activity_gnj_xie_ji_list.xml   |  7 ++++---
 .../res/layout/activity_gnj_xieji_add.xml     |  7 ++++---
 .../activity_pda_accident_visa_list.xml       |  7 ++++---
 .../layout/activity_pda_document_handover.xml |  7 ++++---
 .../res/layout/activity_pda_fu_bang_add.xml   |  8 ++++----
 .../layout/activity_pda_gnc_cun_fang_add.xml  |  2 +-
 .../layout/activity_pda_gnc_cun_fang_list.xml |  7 ++++---
 .../layout/activity_pda_gnc_shouyun_list.xml  | 12 ++++++-----
 .../activity_pda_goods_transport_add.xml      |  2 +-
 .../activity_pda_goods_transport_list.xml     | 16 ++++++++-------
 .../main/res/layout/activity_pda_guo_bang.xml |  4 ++--
 .../main/res/layout/activity_pda_li_huo.xml   |  4 ++--
 .../main/res/layout/activity_pda_message.xml  | 10 ++++++----
 .../src/main/res/layout/activity_pda_set.xml  |  4 ++--
 .../main/res/layout/activity_pda_shou_yun.xml |  2 +-
 .../res/layout/activity_pda_shou_yun_add.xml  | 20 +++++++++++--------
 .../activity_pda_transport_log_list.xml       |  5 +++--
 .../layout/activity_pda_xie_ji_details.xml    |  2 +-
 .../res/layout/activity_pda_zu_zhuang.xml     |  4 ++--
 .../layout/dialog_pda_gnc_cun_fang_add.xml    |  2 +-
 .../layout/dialog_pda_gnc_shou_yun_sync.xml   |  4 ++--
 ...ialog_pda_gnj_xieji_detatis_allocation.xml |  2 +-
 .../res/layout/item_pda_gnc_cunfang_list.xml  |  2 +-
 .../res/layout/item_pda_gnj_xieji_add.xml     |  2 +-
 .../layout/item_pda_gnj_xieji_car_list.xml    |  3 ++-
 module_p/src/main/res/layout/item_pda_lh.xml  |  4 ++--
 .../main/res/layout/item_pda_lh_select.xml    |  4 ++--
 .../res/layout/item_pda_zhuanyun_list.xml     |  3 ++-
 .../main/res/layout/item_pda_zu_zhuang.xml    |  4 ++--
 .../main/res/layout/item_pda_zz_select.xml    |  4 ++--
 37 files changed, 123 insertions(+), 82 deletions(-)
 create mode 100644 module_p/src/main/res/drawable/bg_pda_btn_bottom.xml
 create mode 100644 module_p/src/main/res/drawable/img_pda_check_n.xml
 create mode 100644 module_p/src/main/res/drawable/img_pda_check_s.xml

diff --git a/module_base/src/main/res/layout/pda_item_image_select.xml b/module_base/src/main/res/layout/pda_item_image_select.xml
index d97e9ad..28eb2a4 100644
--- a/module_base/src/main/res/layout/pda_item_image_select.xml
+++ b/module_base/src/main/res/layout/pda_item_image_select.xml
@@ -21,7 +21,8 @@
             android:layout_height="50dp"
             android:padding="10dp"
             android:layout_centerInParent="true"
-            android:src="@drawable/img_add" />
+            android:src="@drawable/img_add"
+            android:tint="@color/phone_primary" />
 
         <ImageView
             android:id="@+id/iv"
diff --git a/module_p/src/main/res/drawable/bg_pda_btn_bottom.xml b/module_p/src/main/res/drawable/bg_pda_btn_bottom.xml
new file mode 100644
index 0000000..2210a0a
--- /dev/null
+++ b/module_p/src/main/res/drawable/bg_pda_btn_bottom.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 旧版手持端底部按钮：同 tv_bottom_btn 的 bg_btn_bottom，主色换为手机标准主色 phone_primary（bg_btn_bottom 与平板共用，不能直接改） -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <shape>
+            <solid android:color="@color/phone_primary" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/bg_gray_radius_4" android:state_enabled="false" />
+</selector>
diff --git a/module_p/src/main/res/drawable/img_pda_check_n.xml b/module_p/src/main/res/drawable/img_pda_check_n.xml
new file mode 100644
index 0000000..ac0742c
--- /dev/null
+++ b/module_p/src/main/res/drawable/img_pda_check_n.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 旧版手持端勾选框：原图为 #1296DB 单色位图，着色为手机标准主色 phone_primary（img_p_check_n 与平板共用，不能直接改原图） -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/img_p_check_n"
+    android:tint="@color/phone_primary" />
diff --git a/module_p/src/main/res/drawable/img_pda_check_s.xml b/module_p/src/main/res/drawable/img_pda_check_s.xml
new file mode 100644
index 0000000..8ae7865
--- /dev/null
+++ b/module_p/src/main/res/drawable/img_pda_check_s.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 旧版手持端勾选框：原图为 #1296DB 单色位图，着色为手机标准主色 phone_primary（img_p_check_s 与平板共用，不能直接改原图） -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/img_p_check_s"
+    android:tint="@color/phone_primary" />
diff --git a/module_p/src/main/res/drawable/p_checkbox_selector.xml b/module_p/src/main/res/drawable/p_checkbox_selector.xml
index 421e8b8..f6cbbf1 100644
--- a/module_p/src/main/res/drawable/p_checkbox_selector.xml
+++ b/module_p/src/main/res/drawable/p_checkbox_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/img_p_check_n" android:state_checked="false" />
-    <item android:drawable="@drawable/img_p_check_s" android:state_checked="true" />
+    <item android:drawable="@drawable/img_pda_check_n" android:state_checked="false" />
+    <item android:drawable="@drawable/img_pda_check_s" android:state_checked="true" />
 </selector>
\ No newline at end of file
diff --git a/module_p/src/main/res/layout/activity_accident_visa_add.xml b/module_p/src/main/res/layout/activity_accident_visa_add.xml
index 227d696..2c797f0 100644
--- a/module_p/src/main/res/layout/activity_accident_visa_add.xml
+++ b/module_p/src/main/res/layout/activity_accident_visa_add.xml
@@ -686,7 +686,7 @@
                         android:layout_width="120dp"
                         android:layout_height="50dp"
                         android:layout_gravity="end"
-                        android:background="@color/colorPrimary"
+                        android:background="@color/phone_primary"
                         android:gravity="center"
                         android:onClick="@{()-> viewModel.reSet()}"
                         android:text="重置"
@@ -701,7 +701,7 @@
                         android:layout_width="120dp"
                         android:layout_height="50dp"
                         android:layout_gravity="end"
-                        android:background="@color/colorPrimary"
+                        android:background="@color/phone_primary"
                         android:gravity="center"
                         android:onClick="@{()-> viewModel.onSaveClick()}"
                         android:text="保存"
diff --git a/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml b/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml
index 491c946..214fb3f 100644
--- a/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml
+++ b/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml
@@ -73,7 +73,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -85,7 +85,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -144,7 +145,7 @@
                 android:onClick="@{()->viewModel.onAddClick()}"
                 android:padding="10dp"
                 android:src="@drawable/add"
-                app:tint="@color/colorPrimary" />
+                app:tint="@color/phone_primary" />
 
             <ImageView
                 android:layout_width="50dp"
@@ -154,7 +155,7 @@
                 android:onClick="@{()->viewModel.onMenuClick()}"
                 android:padding="10dp"
                 android:src="@drawable/img_gnc_shouyun_menu"
-                app:tint="@color/colorPrimary" />
+                app:tint="@color/phone_primary" />
 
         </RelativeLayout>
 
diff --git a/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml b/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml
index 12ae8e7..8c0c0a3 100644
--- a/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml
+++ b/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml
@@ -70,7 +70,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -82,7 +82,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -130,7 +131,7 @@
                 android:onClick="@{()->viewModel.onAddClick()}"
                 android:padding="10dp"
                 android:src="@drawable/add"
-                app:tint="@color/colorPrimary" />
+                app:tint="@color/phone_primary" />
 
 <!--            <TextView-->
 <!--                style="@style/tv_bottom_btn"-->
diff --git a/module_p/src/main/res/layout/activity_gnj_xieji_add.xml b/module_p/src/main/res/layout/activity_gnj_xieji_add.xml
index c0a13df..87ef244 100644
--- a/module_p/src/main/res/layout/activity_gnj_xieji_add.xml
+++ b/module_p/src/main/res/layout/activity_gnj_xieji_add.xml
@@ -169,7 +169,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -181,7 +181,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -215,7 +216,7 @@
                 android:layout_width="120dp"
                 android:layout_height="50dp"
                 android:layout_gravity="end"
-                android:background="@color/colorPrimary"
+                android:background="@color/phone_primary"
                 android:gravity="center"
                 android:onClick="@{()-> viewModel.onConfirmClick()}"
                 android:text="确定"
diff --git a/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml b/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml
index 079e8d8..0b95d17 100644
--- a/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml
+++ b/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml
@@ -65,7 +65,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -77,7 +77,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -125,7 +126,7 @@
                 android:onClick="@{()->viewModel.onAddClick()}"
                 android:padding="10dp"
                 android:src="@drawable/add"
-                app:tint="@color/colorPrimary" />
+                app:tint="@color/phone_primary" />
 
         </RelativeLayout>
 
diff --git a/module_p/src/main/res/layout/activity_pda_document_handover.xml b/module_p/src/main/res/layout/activity_pda_document_handover.xml
index 4696268..4882407 100644
--- a/module_p/src/main/res/layout/activity_pda_document_handover.xml
+++ b/module_p/src/main/res/layout/activity_pda_document_handover.xml
@@ -71,7 +71,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -83,7 +83,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -137,7 +138,7 @@
             <TextView
                 android:layout_width="120dp"
                 android:layout_height="50dp"
-                android:background="@color/colorPrimary"
+                android:background="@color/phone_primary"
                 android:gravity="center"
                 android:onClick="@{()->viewModel.onReviewClick()}"
                 android:text="复核"
diff --git a/module_p/src/main/res/layout/activity_pda_fu_bang_add.xml b/module_p/src/main/res/layout/activity_pda_fu_bang_add.xml
index fd471e4..dbf3b03 100644
--- a/module_p/src/main/res/layout/activity_pda_fu_bang_add.xml
+++ b/module_p/src/main/res/layout/activity_pda_fu_bang_add.xml
@@ -176,7 +176,7 @@
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:text="收运参考值"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         setEnable="@{false}"
@@ -269,7 +269,7 @@
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:text="体积"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -451,7 +451,7 @@
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:text="优先级"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -680,7 +680,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:background="@color/colorPrimary"
+                android:background="@color/phone_primary"
                 android:gravity="center"
                 android:onClick="@{()->viewModel.confirmClick()}"
                 android:paddingHorizontal="20dp"
diff --git a/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_add.xml b/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_add.xml
index 9a5e199..cddda73 100644
--- a/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_add.xml
+++ b/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_add.xml
@@ -78,7 +78,7 @@
             android:layout_width="120dp"
             android:layout_height="50dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:text="确定"
             android:onClick="@{()-> viewModel.onConfirmClick()}"
diff --git a/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_list.xml b/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_list.xml
index efad872..957eabe 100644
--- a/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_list.xml
+++ b/module_p/src/main/res/layout/activity_pda_gnc_cun_fang_list.xml
@@ -115,7 +115,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -127,7 +127,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -167,7 +168,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
-                android:background="@color/colorPrimary"
+                android:background="@color/phone_primary"
                 android:gravity="center"
                 android:onClick="@{()->viewModel.onDistributionClick()}"
                 android:paddingHorizontal="15dp"
diff --git a/module_p/src/main/res/layout/activity_pda_gnc_shouyun_list.xml b/module_p/src/main/res/layout/activity_pda_gnc_shouyun_list.xml
index 590ef11..2130d9c 100644
--- a/module_p/src/main/res/layout/activity_pda_gnc_shouyun_list.xml
+++ b/module_p/src/main/res/layout/activity_pda_gnc_shouyun_list.xml
@@ -74,7 +74,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@color/colorPrimary"
+                        android:background="@color/phone_primary"
                         android:paddingHorizontal="20dp"
                         android:paddingVertical="4dp"
                         android:text='@{"数量 "+viewModel.count}'
@@ -86,7 +86,8 @@
                         android:layout_height="10dp"
                         android:layout_marginTop="-3dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/img_daosanjiao" />
+                        android:src="@drawable/img_daosanjiao"
+                        app:tint="@color/phone_primary" />
 
                 </LinearLayout>
 
@@ -158,7 +159,7 @@
                 android:layout_gravity="end"
                 android:layout_marginEnd="10dp"
                 android:layout_marginRight="10dp"
-                android:background="@color/colorPrimary"
+                android:background="@color/phone_primary"
                 android:gravity="center"
                 android:onClick="@{()->viewModel.showSyncDialog()}"
                 android:paddingHorizontal="15dp"
@@ -179,7 +180,8 @@
             android:layout_marginBottom="60dp"
             android:background="@drawable/bg_white_circle"
             android:padding="10dp"
-            android:src="@drawable/img_print_pda" />
+            android:src="@drawable/img_print_pda"
+            app:tint="@color/phone_primary" />
         <!--<TextView
             android:layout_width="wrap_content"
             android:layout_height="50dp"
@@ -188,7 +190,7 @@
             android:layout_marginRight="10dp"
             android:layout_marginEnd="10dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.showSyncDialog()}"
             android:paddingHorizontal="15dp"
diff --git a/module_p/src/main/res/layout/activity_pda_goods_transport_add.xml b/module_p/src/main/res/layout/activity_pda_goods_transport_add.xml
index 1ca952a..6842bdc 100644
--- a/module_p/src/main/res/layout/activity_pda_goods_transport_add.xml
+++ b/module_p/src/main/res/layout/activity_pda_goods_transport_add.xml
@@ -77,7 +77,7 @@
             android:layout_width="120dp"
             android:layout_height="50dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()-> viewModel.onConfirmClick()}"
             android:text="确定"
diff --git a/module_p/src/main/res/layout/activity_pda_goods_transport_list.xml b/module_p/src/main/res/layout/activity_pda_goods_transport_list.xml
index 341876b..6b5befc 100644
--- a/module_p/src/main/res/layout/activity_pda_goods_transport_list.xml
+++ b/module_p/src/main/res/layout/activity_pda_goods_transport_list.xml
@@ -123,7 +123,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@color/colorPrimary"
+                        android:background="@color/phone_primary"
                         android:paddingHorizontal="20dp"
                         android:paddingVertical="4dp"
                         android:text='@{"数量 "+viewModel.count}'
@@ -135,7 +135,8 @@
                         android:layout_height="10dp"
                         android:layout_marginTop="-3dp"
                         android:scaleType="fitXY"
-                        android:src="@drawable/img_daosanjiao" />
+                        android:src="@drawable/img_daosanjiao"
+                        app:tint="@color/phone_primary" />
 
                 </LinearLayout>
 
@@ -188,7 +189,7 @@
                     android:layout_width="120dp"
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:gravity="center"
                     android:onClick="@{()-> viewModel.onSupplementClick()}"
                     android:textColor="@color/white"
@@ -200,7 +201,7 @@
                     android:layout_width="120dp"
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:gravity="center"
                     android:onClick="@{()-> viewModel.onConfirmClick()}"
                     android:text="@{viewModel.confirmText}"
@@ -221,10 +222,11 @@
             android:layout_marginBottom="80dp"
             android:background="@drawable/bg_white_circle"
             android:padding="10dp"
-            android:src="@drawable/img_add_cargo" />
+            android:src="@drawable/img_add_cargo"
+            app:tint="@color/phone_primary" />
 
         <!--<ImageView
-            shape_bg_color="@{@color/colorPrimary}"
+            shape_bg_color="@{@color/phone_primary}"
             shape_radius="@{25}"
             visible="@{viewModel.supplementEnable}"
             android:layout_width="50dp"
@@ -233,7 +235,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginRight="30dp"
             android:layout_marginBottom="80dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:onClick="@{()->viewModel.onSupplementClick()}"
             android:padding="12dp"
             android:src="@drawable/img_edit" />-->
diff --git a/module_p/src/main/res/layout/activity_pda_guo_bang.xml b/module_p/src/main/res/layout/activity_pda_guo_bang.xml
index a9b9bf6..981b2e0 100644
--- a/module_p/src/main/res/layout/activity_pda_guo_bang.xml
+++ b/module_p/src/main/res/layout/activity_pda_guo_bang.xml
@@ -107,7 +107,7 @@
                         android:textSize="15sp" />
 
                     <TextView
-                        shape_bg_color="@{@color/colorPrimary}"
+                        shape_bg_color="@{@color/phone_primary}"
                         shape_radius="@{4}"
                         android:layout_width="80dp"
                         android:layout_height="40dp"
@@ -449,7 +449,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.confirmClick()}"
             android:text="完成过磅"
diff --git a/module_p/src/main/res/layout/activity_pda_li_huo.xml b/module_p/src/main/res/layout/activity_pda_li_huo.xml
index 3b62625..8110196 100644
--- a/module_p/src/main/res/layout/activity_pda_li_huo.xml
+++ b/module_p/src/main/res/layout/activity_pda_li_huo.xml
@@ -46,7 +46,7 @@
                     android:textSize="15sp" />
 
                 <TextView
-                    shape_bg_color="@{@color/colorPrimary}"
+                    shape_bg_color="@{@color/phone_primary}"
                     shape_radius="@{4}"
                     android:layout_width="80dp"
                     android:layout_height="40dp"
@@ -118,7 +118,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.confirmClick()}"
             android:text="确认理货"
diff --git a/module_p/src/main/res/layout/activity_pda_message.xml b/module_p/src/main/res/layout/activity_pda_message.xml
index 18fee36..332e7c2 100644
--- a/module_p/src/main/res/layout/activity_pda_message.xml
+++ b/module_p/src/main/res/layout/activity_pda_message.xml
@@ -30,7 +30,8 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:padding="10dp"
-                android:src="@drawable/img_search" />
+                android:src="@drawable/img_search"
+                app:tint="@color/phone_primary" />
 
             <EditText
                 setFocusLoseListener="@{viewModel::refresh}"
@@ -106,7 +107,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -118,7 +119,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
@@ -146,7 +148,7 @@
             android:layout_width="100dp"
             android:layout_height="50dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.onConfirmClick()}"
             android:paddingHorizontal="15dp"
diff --git a/module_p/src/main/res/layout/activity_pda_set.xml b/module_p/src/main/res/layout/activity_pda_set.xml
index 9da3372..45dbfe6 100644
--- a/module_p/src/main/res/layout/activity_pda_set.xml
+++ b/module_p/src/main/res/layout/activity_pda_set.xml
@@ -98,11 +98,11 @@
             android:layout_height="44dp"
             android:layout_marginHorizontal="15dp"
             android:layout_marginTop="20dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.onConfirmClick()}"
             android:text="提交"
-            shape_bg_color="@{@color/colorPrimary}"
+            shape_bg_color="@{@color/phone_primary}"
             shape_radius="@{8}"
             android:textSize="18sp"
             android:textColor="@color/white" />
diff --git a/module_p/src/main/res/layout/activity_pda_shou_yun.xml b/module_p/src/main/res/layout/activity_pda_shou_yun.xml
index 20b9069..4e89c9c 100644
--- a/module_p/src/main/res/layout/activity_pda_shou_yun.xml
+++ b/module_p/src/main/res/layout/activity_pda_shou_yun.xml
@@ -314,7 +314,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.confirmClick()}"
             android:text="收  运"
diff --git a/module_p/src/main/res/layout/activity_pda_shou_yun_add.xml b/module_p/src/main/res/layout/activity_pda_shou_yun_add.xml
index 98cd82d..f0aedf8 100644
--- a/module_p/src/main/res/layout/activity_pda_shou_yun_add.xml
+++ b/module_p/src/main/res/layout/activity_pda_shou_yun_add.xml
@@ -176,7 +176,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="运单号"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -273,7 +273,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="代理人"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -334,7 +334,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="件数"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -365,7 +365,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="重量"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -453,7 +453,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="承运人"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -483,7 +483,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="航程"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -547,7 +547,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="计划航班"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -637,7 +637,7 @@
                         android:layout_width="80dp"
                         android:layout_height="wrap_content"
                         android:text="业务类型"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -786,6 +786,7 @@
 
             <TextView
                 style="@style/tv_bottom_btn"
+                android:background="@drawable/bg_pda_btn_bottom"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="0dp"
                 android:layout_weight="1"
@@ -799,6 +800,7 @@
 
             <TextView
                 style="@style/tv_bottom_btn"
+                android:background="@drawable/bg_pda_btn_bottom"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="0dp"
                 android:layout_weight="1"
@@ -812,6 +814,7 @@
 
             <TextView
                 style="@style/tv_bottom_btn"
+                android:background="@drawable/bg_pda_btn_bottom"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="0dp"
                 android:layout_weight="1"
@@ -825,6 +828,7 @@
 
             <TextView
                 style="@style/tv_bottom_btn"
+                android:background="@drawable/bg_pda_btn_bottom"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="0dp"
                 android:layout_weight="1"
diff --git a/module_p/src/main/res/layout/activity_pda_transport_log_list.xml b/module_p/src/main/res/layout/activity_pda_transport_log_list.xml
index ab34a98..33e11fd 100644
--- a/module_p/src/main/res/layout/activity_pda_transport_log_list.xml
+++ b/module_p/src/main/res/layout/activity_pda_transport_log_list.xml
@@ -71,7 +71,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorPrimary"
+                    android:background="@color/phone_primary"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="4dp"
                     android:text='@{"数量 "+viewModel.count}'
@@ -83,7 +83,8 @@
                     android:layout_height="10dp"
                     android:layout_marginTop="-3dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/img_daosanjiao" />
+                    android:src="@drawable/img_daosanjiao"
+                    app:tint="@color/phone_primary" />
 
             </LinearLayout>
 
diff --git a/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml b/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml
index 6e6370c..cfd15ef 100644
--- a/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml
+++ b/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml
@@ -180,7 +180,7 @@
             android:layout_width="120dp"
             android:layout_height="60dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()-> viewModel.onDistributionClick()}"
             android:textColor="@color/white"
diff --git a/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml b/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml
index 2f6d33b..acc22bf 100644
--- a/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml
+++ b/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml
@@ -46,7 +46,7 @@
                     android:textSize="15sp" />
 
                 <TextView
-                    shape_bg_color="@{@color/colorPrimary}"
+                    shape_bg_color="@{@color/phone_primary}"
                     shape_radius="@{4}"
                     android:layout_width="80dp"
                     android:layout_height="40dp"
@@ -129,7 +129,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()->viewModel.confirmClick()}"
             android:text='@{"确认组装("+ viewModel.totalCount+"/" + viewModel.totalWeight +")"}'
diff --git a/module_p/src/main/res/layout/dialog_pda_gnc_cun_fang_add.xml b/module_p/src/main/res/layout/dialog_pda_gnc_cun_fang_add.xml
index eb43cc9..caf681a 100644
--- a/module_p/src/main/res/layout/dialog_pda_gnc_cun_fang_add.xml
+++ b/module_p/src/main/res/layout/dialog_pda_gnc_cun_fang_add.xml
@@ -83,7 +83,7 @@
             android:layout_width="120dp"
             android:layout_height="50dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()-> model.onConfirmClick()}"
             android:text="确定"
diff --git a/module_p/src/main/res/layout/dialog_pda_gnc_shou_yun_sync.xml b/module_p/src/main/res/layout/dialog_pda_gnc_shou_yun_sync.xml
index 82cb68e..a29a6da 100644
--- a/module_p/src/main/res/layout/dialog_pda_gnc_shou_yun_sync.xml
+++ b/module_p/src/main/res/layout/dialog_pda_gnc_shou_yun_sync.xml
@@ -22,7 +22,7 @@
         <com.lukouguoji.module_base.ui.weight.StatusView
             android:layout_width="match_parent"
             android:layout_height="20dp"
-            android:background="@color/colorPrimary" />
+            android:background="@color/phone_primary" />
 
         <include layout="@layout/title_tool_bar" />
 
@@ -69,7 +69,7 @@
             android:layout_width="100dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()-> model.confirmClick()}"
             android:text="确定"
diff --git a/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml b/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml
index a3d2aa3..4df1361 100644
--- a/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml
+++ b/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml
@@ -81,7 +81,7 @@
             android:layout_width="120dp"
             android:layout_height="50dp"
             android:layout_gravity="end"
-            android:background="@color/colorPrimary"
+            android:background="@color/phone_primary"
             android:gravity="center"
             android:onClick="@{()-> model.onConfirmClick()}"
             android:text="确定"
diff --git a/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml b/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml
index d33c2e9..20c0198 100644
--- a/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml
+++ b/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml
@@ -182,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:text="@{bean.storageArea}"
-                        android:textColor="@color/blue" />
+                        android:textColor="@color/phone_primary" />
 
                 </LinearLayout>
 
diff --git a/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml b/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml
index fa9be33..567ed66 100644
--- a/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml
+++ b/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml
@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
                         android:text="kg"
-                        android:textColor="@color/blue" />
+                        android:textColor="@color/phone_primary" />
 
                 </LinearLayout>
 
diff --git a/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml b/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml
index 12c6163..1a89ddc 100644
--- a/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml
+++ b/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml
@@ -25,7 +25,8 @@
             android:layout_width="22dp"
             android:layout_height="22dp"
             android:onClick="@{()-> bean.checkedClick()}"
-            android:src="@drawable/img_p_check_s" />
+            android:src="@drawable/img_p_check_s"
+            android:tint="@color/phone_primary" />
 
 
         <LinearLayout
diff --git a/module_p/src/main/res/layout/item_pda_lh.xml b/module_p/src/main/res/layout/item_pda_lh.xml
index a8febe4..fea25a8 100644
--- a/module_p/src/main/res/layout/item_pda_lh.xml
+++ b/module_p/src/main/res/layout/item_pda_lh.xml
@@ -48,7 +48,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.5"
                             android:text="@{bean.waybillCode}"
-                            android:textColor="@color/colorPrimary" />
+                            android:textColor="@color/phone_primary" />
 
                         <TextView
                             android:layout_width="60dp"
@@ -81,7 +81,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.5"
                             android:text="@{bean.pc}"
-                            android:textColor="@color/colorPrimary" />
+                            android:textColor="@color/phone_primary" />
 
                         <TextView
                             android:layout_width="60dp"
diff --git a/module_p/src/main/res/layout/item_pda_lh_select.xml b/module_p/src/main/res/layout/item_pda_lh_select.xml
index b2bfab7..c18b894 100644
--- a/module_p/src/main/res/layout/item_pda_lh_select.xml
+++ b/module_p/src/main/res/layout/item_pda_lh_select.xml
@@ -39,7 +39,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:text="@{bean.waybillCode}"
-                    android:textColor="@color/colorPrimary" />
+                    android:textColor="@color/phone_primary" />
 
                 <TextView
                     android:layout_width="60dp"
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:text="@{bean.pc}"
-                    android:textColor="@color/colorPrimary" />
+                    android:textColor="@color/phone_primary" />
 
                 <TextView
                     android:layout_width="60dp"
diff --git a/module_p/src/main/res/layout/item_pda_zhuanyun_list.xml b/module_p/src/main/res/layout/item_pda_zhuanyun_list.xml
index 4da4120..121b183 100644
--- a/module_p/src/main/res/layout/item_pda_zhuanyun_list.xml
+++ b/module_p/src/main/res/layout/item_pda_zhuanyun_list.xml
@@ -28,7 +28,8 @@
             setIVCheckImage="@{bean.checked}"
             android:layout_width="22dp"
             android:layout_height="22dp"
-            android:src="@drawable/img_p_check_s" />
+            android:src="@drawable/img_p_check_s"
+            android:tint="@color/phone_primary" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/module_p/src/main/res/layout/item_pda_zu_zhuang.xml b/module_p/src/main/res/layout/item_pda_zu_zhuang.xml
index ab971e8..82e0ffc 100644
--- a/module_p/src/main/res/layout/item_pda_zu_zhuang.xml
+++ b/module_p/src/main/res/layout/item_pda_zu_zhuang.xml
@@ -48,7 +48,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.5"
                             android:text="@{bean.waybillCode}"
-                            android:textColor="@color/colorPrimary" />
+                            android:textColor="@color/phone_primary" />
 
                         <TextView
                             android:layout_width="60dp"
@@ -81,7 +81,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.5"
                             android:text="@{bean.pc}"
-                            android:textColor="@color/colorPrimary" />
+                            android:textColor="@color/phone_primary" />
 
                         <TextView
                             android:layout_width="60dp"
diff --git a/module_p/src/main/res/layout/item_pda_zz_select.xml b/module_p/src/main/res/layout/item_pda_zz_select.xml
index 2b9b0c8..24fc13c 100644
--- a/module_p/src/main/res/layout/item_pda_zz_select.xml
+++ b/module_p/src/main/res/layout/item_pda_zz_select.xml
@@ -43,7 +43,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:text="@{bean.waybillCode}"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <TextView
                         android:layout_width="60dp"
@@ -76,7 +76,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1.5"
                         android:text="@{bean.pc}"
-                        android:textColor="@color/colorPrimary" />
+                        android:textColor="@color/phone_primary" />
 
                     <TextView
                         android:layout_width="60dp"