行驶证显示内容优化

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="",

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(

app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt

@@ -195,6 +195,9 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
                 }
 
                 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<ActivityAuthDrivingBinding>() {
             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<ActivityAuthDrivingBinding>() {
             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)

app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt

@@ -243,8 +243,11 @@ class EditDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
                         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<ActivityAuthDrivingBinding>() {
             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<ActivityAuthDrivingBinding>() {
             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)

app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt

@@ -159,6 +159,7 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
 
     private fun initViewByData(data: CarDetail) {
         var doneInfoCount = 0
+        firstMissingInfo = -1
         CarDetail = data
         binding.run {
             var missInfo = ""

app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt

@@ -156,6 +156,7 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), View.OnCli
 
     private fun initViewByData(data: UserDetail) {
         doneInfoCount = 0
+        firstMissingInfo = -1
         binding.run {
             var missInfo = ""