feat: remove scan support for all fno
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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}" />
|
||||
|
||||
|
||||
@@ -42,8 +42,6 @@
|
||||
<!-- 航班号 -->
|
||||
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
||||
hint='@{"请输入航班号"}'
|
||||
icon="@{@drawable/img_scan}"
|
||||
setOnIconClickListener="@{()-> viewModel.flightNoScanClick()}"
|
||||
type="@{SearchLayoutType.INPUT}"
|
||||
value="@={viewModel.flightNo}"
|
||||
android:layout_width="0dp"
|
||||
|
||||
@@ -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}" />
|
||||
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
hint='@{"请输入航班号"}'
|
||||
icon="@{@drawable/img_scan}"
|
||||
type="@{SearchLayoutType.INPUT}"
|
||||
value="@={viewModel.flightNo}" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user