Compare commits

5 Commits

Author SHA1 Message Date
YANG JIANKUAN
8a88904f79 feat(phone): 手持端首页菜单图标更新为 V2 版本
按 documents/5.5寸首页新样式/icons v2 一一替换 drawable-nodpi 下 21 个
img_pda_menu_* 资源(国际 12 含分组箭头、国内 9),资源名不变、代码零改动。
设计稿文件名「出港抵运」对应菜单「出港运抵」(gjc_arrive)。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 16:47:40 +08:00
YANG JIANKUAN
e828abe32f feat: modify old 5.5 pages color 2026-10-26 11:59:43 +08:00
YANG JIANKUAN
daaf651c04 fix(phone): 旧版手持端页面内容区蓝色统一为标题栏标准色 phone_primary
- 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>
2026-10-26 11:53:52 +08:00
YANG JIANKUAN
8d5c37039d fix(phone): 移除手机端国际 Tab「进港理货」入口
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 11:07:51 +08:00
YANG JIANKUAN
6fb7161e80 fix(phone): 首页四个 Tab 顶栏统一为业务页标题栏样式,移除国际板箱过磅入口
- 顶栏改为 48dp、phone_primary、18sp 加粗,与 title_tool_bar 一致;状态栏同色
- 「我的」页退出图标缩小(padding 14dp),铃铛垂直居中随之微调
- 手机端国际 Tab 去掉「板箱过磅」菜单入口及对应跳转分支

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-22 16:06:16 +08:00
95 changed files with 141 additions and 114 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@@ -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"

View File

@@ -43,8 +43,8 @@ class PDAEnterActivity : BasePdaActivity<ActivityPdaenterBinding, PDAEnterViewMo
override fun initOnCreate(savedInstanceState: Bundle?) {
binding.viewModel = viewModel
// 状态栏与顶部导航栏同色(设计稿状态栏为 #3B71E8 蓝底白字)
window.statusBarColor = ContextCompat.getColor(this, R.color.phone_home_primary)
// 状态栏与顶部导航栏同色(同业务页标题栏 phone_primary)
window.statusBarColor = ContextCompat.getColor(this, R.color.phone_primary)
binding.vp.adapter =
CustomVP2Adapter(viewModel.fragmentList, supportFragmentManager, lifecycle)
@@ -121,4 +121,4 @@ class PDAEnterActivity : BasePdaActivity<ActivityPdaenterBinding, PDAEnterViewMo
/** 首页按 documents/5.5寸首页新样式/ 设计稿 390dp 画布等比还原(其余 PDA 页仍为 [PDAHelper.PDA_WIDTH]) */
override fun getSizeInDp(): Float = 390f
}
}

View File

@@ -9,8 +9,6 @@ import com.lukouguoji.module_base.router.ARouterConstants
import com.sixin.module_p.R
import com.sixin.module_p.ui.enter.PdaMenuGroup
import com.sixin.module_p.ui.enter.filterByAuth
import com.sixin.module_p.ui.guobang.PdaGuoBangActivity
import com.sixin.module_p.ui.lihuo.PdaLiHuoActivity
import com.sixin.module_p.ui.shouyun.PdaShouYunActivity
import com.sixin.module_p.ui.zuzhuang.PdaZuZhuangActivity
import dev.DevUtils
@@ -74,12 +72,10 @@ class GjViewModel : BaseViewModel() {
// ===== 设计稿未覆盖:module_p 内的 PDA 专用页面(无 route,走 when 分支),沿用旧图标 =====
ActionBean("普货收运", R.drawable.gjc_shou_yun_icon, Constant.AuthName.GjcAppDomExpCheckin),
ActionBean("板箱组装", R.drawable.img_bxzz, Constant.AuthName.GjcBanXListActivity),
ActionBean("板箱过磅", R.drawable.gjc_fu_bang_icon, Constant.AuthName.GjcFuBangActivity),
)
),
PdaMenuGroup(
"国际进港", listOf(
ActionBean("进港理货", R.drawable.img_pda_menu_gjj_tally, Constant.AuthName.GjjTallyListActivity),
ActionBean(
"提取出库",
R.drawable.img_pda_menu_gjj_pick_up,
@@ -128,14 +124,6 @@ class GjViewModel : BaseViewModel() {
PdaZuZhuangActivity.start(DevUtils.getTopActivity())
}
"板箱过磅" -> {
PdaGuoBangActivity.start(DevUtils.getTopActivity())
}
"进港理货" -> {
PdaLiHuoActivity.start(DevUtils.getTopActivity())
}
else -> {
loge("点击事件 ${bean.title} 未处理")
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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="保存"

View File

@@ -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>

View File

@@ -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"-->

View File

@@ -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="确定"

View File

@@ -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>

View File

@@ -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="复核"

View File

@@ -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"

View File

@@ -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()}"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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="确定"

View File

@@ -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" />-->

View File

@@ -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="完成过磅"

View File

@@ -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="确认理货"

View File

@@ -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"

View File

@@ -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" />

View File

@@ -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="收 运"

View File

@@ -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"

View File

@@ -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>

View File

@@ -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"

View File

@@ -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 +")"}'

View File

@@ -29,7 +29,7 @@
<!--
消息铃铛(四个 Tab 共用一处、位置固定):按设计稿 domestic.html / home.html 的 .nav-bell——
34dp 按钮距右 12dp、垂直居中于 46dp 导航栏,16dp 图形距按钮左上 4.5dp;角标相对按钮 right:-2dp / top:0,
34dp 按钮距右 12dp、垂直居中于 48dp 导航栏,16dp 图形距按钮左上 4.5dp;角标相对按钮 right:-2dp / top:0,
所以容器比按钮宽 2dp、右边距 10dp。dashboard.html 的铃铛位置略有不同(右 8dp),按多数统一,不随 Tab 切换
-->
<FrameLayout
@@ -37,7 +37,7 @@
android:layout_width="36dp"
android:layout_height="34dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="6dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="10dp"
android:onClick="@{() -> viewModel.onMessageClick()}">

View File

@@ -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="确定"

View File

@@ -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="确定"

View File

@@ -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="确定"

View File

@@ -15,27 +15,26 @@
android:background="@color/backgroud_gray"
android:orientation="vertical">
<!-- 顶栏与首页其余 Tab 统一(设计稿 .nav-bar:46dp、#3B71E8、16sp 加粗) -->
<!-- 顶栏与首页其余 Tab 统一,样式同业务页 title_tool_bar(48dp、phone_primary、18sp 加粗) -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@color/phone_home_primary">
android:layout_height="48dp"
android:background="@color/phone_primary">
<ImageView
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:onClick="@{()-> viewModel.onLogoutClick()}"
android:padding="10dp"
android:padding="14dp"
android:src="@drawable/img_pda_exit" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:letterSpacing="0.019"
android:text="我的"
android:textColor="@color/white"
android:textSize="16sp"
android:textSize="18sp"
android:textStyle="bold" />
</RelativeLayout>
@@ -125,4 +124,4 @@
android:layout_weight="1" />
</LinearLayout>
</layout>
</layout>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -13,15 +13,14 @@
<item name="background">@null</item>
</style>
<!-- 手持端首页四个 Tab 的顶部导航栏(设计稿 .nav-bar:46dp、#3B71E8、16sp 加粗) -->
<!-- 手持端首页四个 Tab 的顶部导航栏:与手机业务页公共标题栏 title_tool_bar 一致(48dp、phone_primary、18sp 加粗白字) -->
<style name="PhoneHomeNavBar">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">46dp</item>
<item name="android:background">@color/phone_home_primary</item>
<item name="android:layout_height">48dp</item>
<item name="android:background">@color/phone_primary</item>
<item name="android:gravity">center</item>
<item name="android:letterSpacing">0.019</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">16sp</item>
<item name="android:textSize">18sp</item>
<item name="android:textStyle">bold</item>
</style>
@@ -64,4 +63,4 @@
<item name="android:textColor">@color/phone_home_text_title</item>
</style>
</resources>
</resources>