From 978a9af8211c994f065dc5bfc16c2e5d3d7a6817 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Sun, 4 Jan 2026 11:33:58 +0800 Subject: [PATCH] feat: remove scan support for all fno --- .../java/com/lukouguoji/module_base/LoginActivity.kt | 2 +- .../gjc/viewModel/GjcBoxWeighingViewModel.kt | 11 ----------- .../gjc/viewModel/GjcWeighingRecordViewModel.kt | 11 ----------- .../lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt | 11 ----------- .../src/main/res/layout/activity_gjc_box_weighing.xml | 2 -- .../main/res/layout/activity_gjc_weighing_list.xml | 2 -- .../res/layout/activity_gjc_weighing_record_list.xml | 2 -- .../src/main/res/layout/activity_int_exp_assemble.xml | 1 - 8 files changed, 1 insertion(+), 41 deletions(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt index bb22afa..0d6b880 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt @@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt * ========== 开发调试开关 ========== * TODO: 正式发布前务必设置为 false */ -private const val DEV_AUTO_LOGIN = false // 自动登录开关 +private const val DEV_AUTO_LOGIN = true // 自动登录开关 @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN) class LoginActivity : BaseActivity(), diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt index d7cfba6..1c13771 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt @@ -38,13 +38,6 @@ class GjcBoxWeighingViewModel : BasePageViewModel() { // 方法区 /////////////////////////////////////////////////////////////////////////// - /** - * 扫码输入航班号 - */ - fun flightNoScanClick() { - ScanModel.startScan(getTopActivity(), Constant.RequestCode.FLIGHT_NO) - } - /** * 扫码输入架子车号 */ @@ -132,10 +125,6 @@ class GjcBoxWeighingViewModel : BasePageViewModel() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (resultCode == Activity.RESULT_OK && data != null) { when (requestCode) { - Constant.RequestCode.FLIGHT_NO -> { - flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) - refresh() - } Constant.RequestCode.CAR -> { carId.value = data.getStringExtra(Constant.Result.CODED_CONTENT) refresh() diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt index d53ec30..a348c8d 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt @@ -75,13 +75,6 @@ class GjcWeighingRecordViewModel : BasePageViewModel() { } } - /** - * 扫码输入航班号 - */ - fun flightNoScanClick() { - ScanModel.startScan(getTopActivity(), Constant.RequestCode.FLIGHT_NO) - } - /** * 扫码输入运单号 */ @@ -156,10 +149,6 @@ class GjcWeighingRecordViewModel : BasePageViewModel() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (resultCode == Activity.RESULT_OK && data != null) { when (requestCode) { - Constant.RequestCode.FLIGHT_NO -> { - flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) - refresh() - } Constant.RequestCode.WAYBILL -> { waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) refresh() diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt index cdf3e5c..250d50e 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt @@ -79,13 +79,6 @@ class GjcWeighingViewModel : BasePageViewModel() { } } - /** - * 扫码输入航班号 - */ - fun flightNoScanClick() { - ScanModel.startScan(getTopActivity(), Constant.RequestCode.FLIGHT_NO) - } - /** * 扫码输入运单号 */ @@ -173,10 +166,6 @@ class GjcWeighingViewModel : BasePageViewModel() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (resultCode == Activity.RESULT_OK && data != null) { when (requestCode) { - Constant.RequestCode.FLIGHT_NO -> { - flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) - refresh() - } Constant.RequestCode.WAYBILL -> { waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) refresh() diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml index 9aebf32..7858dce 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml @@ -45,8 +45,6 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入航班号"}' - icon="@{@drawable/img_scan}" - setOnIconClickListener="@{()-> viewModel.flightNoScanClick()}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.flightNo}" /> diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml index 981b2cf..b245fcd 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml @@ -42,8 +42,6 @@ diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml index 33131fb..cba37be 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml @@ -45,7 +45,6 @@ android:layout_height="wrap_content" android:layout_weight="1" hint='@{"请输入航班号"}' - icon="@{@drawable/img_scan}" type="@{SearchLayoutType.INPUT}" value="@={viewModel.flightNo}" />