diff --git a/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt index d0157ed..f92c977 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/CarBean.kt @@ -8,6 +8,7 @@ package com.dahe.gldriver.bean */ data class CarBean( val approvedLoad: String="", + val tractionWeight: String="", val carHeight: String="", var carId: String="", val carLong: String="", diff --git a/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt b/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt index bceb6c5..cad3d9e 100644 --- a/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt +++ b/app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt @@ -95,6 +95,7 @@ data class DataX( val inspectionRecord: String = "",//检验有效期至2023年06月吉J 有效期 val issueDate: String = "",//发证日期 val energySign: String = "",//能源类型 + val barcodeNumber: String = "",//条码编号 ) data class PrismKeyValueInfo( diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt index 1c3e047..f272457 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt @@ -195,6 +195,9 @@ class AuthDrivingActivity : BaseActivity() { } upDrivingInfoBean.energySignCode = it.energySign + upDrivingInfoBean.barcodeNumber = it.barcodeNumber + upDrivingInfoBean.overallDimension = it.overallDimension + binding.run { etCurbWeight.setText(it.curbWeight)//整备质量 etPermittedWeight.setText(it.permittedWeight)// @@ -238,6 +241,8 @@ class AuthDrivingActivity : BaseActivity() { if (etCarNum.text.isNullOrEmpty() || tvCarType.text.isNullOrEmpty() || tvEnd.text.isNullOrEmpty() || + etOwner.text.isNullOrEmpty() || + etUseNature.text.isNullOrEmpty() || tvCarColor.text.isNullOrEmpty() ) { showToast("请完善车辆信息") @@ -252,6 +257,8 @@ class AuthDrivingActivity : BaseActivity() { vehicleNum = binding.etCarNum.text.trim().toString() vehicleType = binding.tvCarType.text.trim().toString() plateColor = binding.tvCarColor.text.trim().toString() + owner = binding.etOwner.text.trim().toString() + useNature = binding.etUseNature.text.trim().toString() } DataManager.getInstance().addCar(upDrivingInfoBean) diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt index fd54589..4e7d15c 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt @@ -243,8 +243,11 @@ class EditDrivingActivity : BaseActivity() { carHeight = split[2] } } - upDrivingInfoBean.tractionWeight = it.tractionWeight + if (it.tractionWeight.contains("kg")){ + upDrivingInfoBean.tractionWeight = it.tractionWeight.split("kg")[0] + } upDrivingInfoBean.energySignCode = it.energySign + upDrivingInfoBean.barcodeNumber = it.barcodeNumber binding.run { etCurbWeight.setText(it.curbWeight)//整备质量 etPermittedWeight.setText(it.permittedWeight)//核定载质量 @@ -258,6 +261,8 @@ class EditDrivingActivity : BaseActivity() { if (etCarNum.text.isNullOrEmpty() || tvCarType.text.isNullOrEmpty() || tvEnd.text.isNullOrEmpty() || + etOwner.text.isNullOrEmpty() || + etUseNature.text.isNullOrEmpty() || tvCarColor.text.isNullOrEmpty() ) { showToast("请完善车辆信息") @@ -272,6 +277,8 @@ class EditDrivingActivity : BaseActivity() { vehicleNum = binding.etCarNum.text.trim().toString() vehicleType = binding.tvCarType.text.trim().toString() plateColor = binding.tvCarColor.text.trim().toString() + owner = binding.etOwner.text.trim().toString() + useNature = binding.etUseNature.text.trim().toString() } DataManager.getInstance().editCar(upDrivingInfoBean) diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt index 9babcc6..02f5237 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt @@ -159,6 +159,7 @@ class CarDetailActivity : BaseActivity(), View.OnClick private fun initViewByData(data: CarDetail) { var doneInfoCount = 0 + firstMissingInfo = -1 CarDetail = data binding.run { var missInfo = "" diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt index 37d38da..4adfaa1 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt @@ -156,6 +156,7 @@ class PersonInfoActivity : BaseActivity(), View.OnCli private fun initViewByData(data: UserDetail) { doneInfoCount = 0 + firstMissingInfo = -1 binding.run { var missInfo = ""