feat: remove scan support for all fno

This commit is contained in:
2026-01-04 11:33:58 +08:00
parent 85ea4649ef
commit 978a9af821
8 changed files with 1 additions and 41 deletions

View File

@@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt
* ========== 开发调试开关 ========== * ========== 开发调试开关 ==========
* TODO: 正式发布前务必设置为 false * TODO: 正式发布前务必设置为 false
*/ */
private const val DEV_AUTO_LOGIN = false // 自动登录开关 private const val DEV_AUTO_LOGIN = true // 自动登录开关
@Route(path = ARouterConstants.ACTIVITY_URL_LOGIN) @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN)
class LoginActivity : BaseActivity(), class LoginActivity : BaseActivity(),

View File

@@ -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?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (resultCode == Activity.RESULT_OK && data != null) { if (resultCode == Activity.RESULT_OK && data != null) {
when (requestCode) { when (requestCode) {
Constant.RequestCode.FLIGHT_NO -> {
flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh()
}
Constant.RequestCode.CAR -> { Constant.RequestCode.CAR -> {
carId.value = data.getStringExtra(Constant.Result.CODED_CONTENT) carId.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh() refresh()

View File

@@ -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?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (resultCode == Activity.RESULT_OK && data != null) { if (resultCode == Activity.RESULT_OK && data != null) {
when (requestCode) { when (requestCode) {
Constant.RequestCode.FLIGHT_NO -> {
flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh()
}
Constant.RequestCode.WAYBILL -> { Constant.RequestCode.WAYBILL -> {
waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh() refresh()

View File

@@ -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?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (resultCode == Activity.RESULT_OK && data != null) { if (resultCode == Activity.RESULT_OK && data != null) {
when (requestCode) { when (requestCode) {
Constant.RequestCode.FLIGHT_NO -> {
flightNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh()
}
Constant.RequestCode.WAYBILL -> { Constant.RequestCode.WAYBILL -> {
waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh() refresh()

View File

@@ -45,8 +45,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
icon="@{@drawable/img_scan}"
setOnIconClickListener="@{()-> viewModel.flightNoScanClick()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" /> value="@={viewModel.flightNo}" />

View File

@@ -42,8 +42,6 @@
<!-- 航班号 --> <!-- 航班号 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
icon="@{@drawable/img_scan}"
setOnIconClickListener="@{()-> viewModel.flightNoScanClick()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" value="@={viewModel.flightNo}"
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -45,8 +45,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
icon="@{@drawable/img_scan}"
setOnIconClickListener="@{()-> viewModel.flightNoScanClick()}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" /> value="@={viewModel.flightNo}" />

View File

@@ -45,7 +45,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
hint='@{"请输入航班号"}' hint='@{"请输入航班号"}'
icon="@{@drawable/img_scan}"
type="@{SearchLayoutType.INPUT}" type="@{SearchLayoutType.INPUT}"
value="@={viewModel.flightNo}" /> value="@={viewModel.flightNo}" />