From 28159ce7386259c2796ee5d15537e53e801e7984 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Sun, 4 Jan 2026 15:08:22 +0800 Subject: [PATCH] feat: opt qr scan icons --- .claude/settings.local.json | 3 ++- .../java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt | 2 +- module_gjc/src/main/res/layout/activity_int_exp_arrive.xml | 4 ++-- module_gjc/src/main/res/layout/activity_int_exp_load.xml | 4 ++-- .../src/main/res/layout/activity_int_exp_out_handover.xml | 2 +- module_gjc/src/main/res/layout/activity_int_exp_tally.xml | 4 ++-- .../src/main/res/layout/activity_int_arr_air_manifest.xml | 4 ++-- .../src/main/res/layout/activity_int_imp_loading_list.xml | 2 +- module_gjj/src/main/res/layout/activity_int_imp_manifest.xml | 2 +- module_gjj/src/main/res/layout/activity_int_imp_tally.xml | 4 ++-- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index bfa83c6..8ae65df 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -48,7 +48,8 @@ "Bash(xargs sed:*)", "Bash(while IFS= read -r file)", "Bash(do if ! grep -q \"import com.lukouguoji.module_base.ktx.formatDate\" \"$file\")", - "Bash(then sed -i '' '/import dev.utils.common.DateUtils/a\\\\\nimport com.lukouguoji.module_base.ktx.formatDate\n' \"$file\" echo \"Added formatDate import to: $file\" fi done)" + "Bash(then sed -i '' '/import dev.utils.common.DateUtils/a\\\\\nimport com.lukouguoji.module_base.ktx.formatDate\n' \"$file\" echo \"Added formatDate import to: $file\" fi done)", + "Bash(identify:*)" ], "deny": [], "ask": [] diff --git a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt index 6c2647c..d911352 100644 --- a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt @@ -707,7 +707,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcAssembleAllocateActivity, - com.lukouguoji.module_base.R.drawable.img_gjc_banxiangzuzhuang, + com.lukouguoji.module_base.R.drawable.img_gnc_fenpei, "组装分配" ) ) diff --git a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml index 3832860..36887fe 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml @@ -51,7 +51,7 @@ @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入分单号"}' - icon="@{@drawable/scan_code}" + icon="@{@drawable/img_scan}" setOnIconClickListener="@{(v)-> viewModel.scanHouseWaybill()}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.houseWaybillNo}" /> diff --git a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml index d5384a5..916bcee 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml @@ -60,7 +60,7 @@ @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入分单号"}' - icon="@{@drawable/scan_code}" + icon="@{@drawable/img_scan}" setOnIconClickListener="@{(v)-> viewModel.scanHouseWaybill()}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.houseWaybillNo}" /> diff --git a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml index d8aad2d..3876b45 100644 --- a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml +++ b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入运单号"}' - icon="@{@drawable/scan_code}" + icon="@{@drawable/img_scan}" setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.waybillNo}" /> @@ -65,7 +65,7 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入分单号"}' - icon="@{@drawable/scan_code}" + icon="@{@drawable/img_scan}" setOnIconClickListener="@{(v)-> viewModel.scanHouseNo()}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.houseNo}" /> diff --git a/module_gjj/src/main/res/layout/activity_int_imp_loading_list.xml b/module_gjj/src/main/res/layout/activity_int_imp_loading_list.xml index 0aff104..c4a0c2b 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_loading_list.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_loading_list.xml @@ -69,7 +69,7 @@