1.车辆颜色默认黄色。

app/src/main/java/com/quansu/heifengwuliu/activity/VehicleInfoActivity.kt

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.core.net.toUri
 import androidx.lifecycle.Observer
 import com.luck.picture.lib.PictureSelector
@@ -89,11 +90,18 @@ class VehicleInfoActivity: MBActivity<VehicleInfoVModel, ActivityVehicleInfoBind
             if (null == it) {
                 return@Observer
             }
-            var info=it
             colorList= it.color_z as ArrayList<SelectData>
             carCateList=it.car_cate_z as ArrayList<SelectData>
             carEnergy=it.car_energy_z as ArrayList<SelectData>
             carTypeList=it.car_type_z as ArrayList<SelectData>
+            //车辆默认颜色
+            for (item in colorList) {
+                if (item.name == "黄色") {
+                    vm.color_code= item.code
+                    vm.color.value = item.name
+                   return@Observer
+                }
+            }
 
 
         })

app/src/main/java/com/quansu/heifengwuliu/vmodel/VehicleInfoVModel.kt

@@ -41,22 +41,20 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
 
 
     var regDate = MutableLiveData("")//注册日期
-    var certDate=  MutableLiveData("")//发证日期
-    var startDate =  MutableLiveData("")//驾驶证开始日期
-    var endDate =  MutableLiveData("")//驾驶证有效日期
+    var certDate = MutableLiveData("")//发证日期
+    var startDate = MutableLiveData("")//驾驶证开始日期
+    var endDate = MutableLiveData("")//驾驶证有效日期
 
-    var color_code=""
-    var carType_code=""
-    var carCate_code=""
-    var carEnergy_code=""
+    var color_code = ""
+    var carType_code = ""
+    var carCate_code = ""
+    var carEnergy_code = ""
 
     var isShow: MutableLiveData<Boolean> = MutableLiveData(true)
 
     var isMoreShow: MutableLiveData<Boolean> = MutableLiveData(true)
 
 
-
-
     @Bindable
     var licenseDl: String? = null
         set(value) {
@@ -79,14 +77,13 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
         }
 
 
-
-
     @Bindable
     var carLoad: String? = null
         set(value) {
             field = value
             notifyPropertyChanged(BR.carLoad)
         }
+
     @Bindable
     var carBrand: String? = null
         set(value) {
@@ -136,18 +133,21 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
             field = value
             notifyPropertyChanged(BR.carOwn)
         }
+
     @Bindable
     var carUse: String? = null
         set(value) {
             field = value
             notifyPropertyChanged(BR.carUse)
         }
+
     @Bindable
     var carSn: String? = null
         set(value) {
             field = value
             notifyPropertyChanged(BR.carSn)
         }
+
     @Bindable
     var organization: String? = null
         set(value) {
@@ -172,29 +172,28 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
         }
 
 
-
     fun discernVehicle(img: String) {//获取驾驶证信息
 
         repository().rxLreq(NetEngine.service.cvVehicle(img))
                 .doOnNext {
                     if (it.ok(true)) {
-                       var bean=it.data() as CvVehicle
-                        carOwn=bean.name
-                        driverOrg=bean.official_seal
-                        startDate.value=bean.issue_date
+                        var bean = it.data() as CvVehicle
+                        carOwn = bean.name
+                        driverOrg = bean.official_seal
+                        startDate.value = bean.issue_date
 
 
-                        if(!TextUtils.isEmpty(bean.valid_to)){
-                            var year=bean.valid_to.substring(0,4)
-                            var month=bean.valid_to.substring(4,6)
-                            var data=bean.valid_to.substring(6,8)
+                        if (!TextUtils.isEmpty(bean.valid_to)) {
+                            var year = bean.valid_to.substring(0, 4)
+                            var month = bean.valid_to.substring(4, 6)
+                            var data = bean.valid_to.substring(6, 8)
 
-                            endDate.value= "$year-$month-$data"
+                            endDate.value = "$year-$month-$data"
 
                         }
 
 
-                        carClass=bean.car_class
+                        carClass = bean.car_class
 
 
                     }
@@ -203,53 +202,57 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                 .subscribe()
 
     }
+
     fun discernDriving(img: String) {//获取行驶证信息
 
         repository().rxLreq(NetEngine.service.cvDriving(img))
                 .doOnNext {
                     if (it.ok(true)) {
-                       var bean=it.data() as CvDriving
-                        if(type==2){//第一面
-                            carSn=bean.vin
-                            regDate.value=bean.register_date
-                            certDate.value=bean.issue_date
-                            carBrand=bean.model
+                        var bean = it.data() as CvDriving
+                        if (type == 2) {//第一面
+                            carSn = bean.vin
+                            regDate.value = bean.register_date
+                            certDate.value = bean.issue_date
+                            carBrand = bean.model
+                            carUse = bean.use_character
+                            number = bean.plate_num
+                            //使用性质
                             carUse=bean.use_character
-                            number=bean.plate_num
+                            //
                             //车辆类型
-                            if(null!=info.value?.car_cate_z) {
+                            if (null != info.value?.car_cate_z) {
 
                                 for (item in info.value!!.car_cate_z) {
 
-                                    if(item.name.contains(bean.vehicle_type)){
-                                        carCate_code= item.code
+                                    if (item.name.contains(bean.vehicle_type)) {
+                                        carCate_code = item.code
                                         carCate.value = item.name
-                                       return@doOnNext
+                                        return@doOnNext
                                     }
 
                                 }
 
                             }
 
-                        }else{//第二面
-                            drivingSn=bean.record
-                            carWight=bean.total_quality
-                            var ss=bean.overall_size.split("x")
-                            carSizeL=ss[0]
-                            carSizeW=ss[1]
-
-                            if(ss[2].contains("m")){
-                                var ss=ss[2].split("m")
-                                carSizeH=ss[0]
-                            }else{
-                                carSizeH=ss[2]
+                        } else {//第二面
+                            drivingSn = bean.record
+                            carWight = bean.total_quality
+                            var ss = bean.overall_size.split("x")
+                            carSizeL = ss[0]
+                            carSizeW = ss[1]
+
+                            if (ss[2].contains("m")) {
+                                var ss = ss[2].split("m")
+                                carSizeH = ss[0]
+                            } else {
+                                carSizeH = ss[2]
                             }
                             //总质量
-                            var totalQuality=bean.total_quality.substring(0,bean.total_quality.length-2)
-                            if(totalQuality.toDouble()/1000>4.5){
-                                tonnage.value=2
-                            }else{
-                                tonnage.value=1
+                            var totalQuality = bean.total_quality.substring(0, bean.total_quality.length - 2)
+                            if (totalQuality.toDouble() / 1000 > 4.5) {
+                                tonnage.value = 2
+                            } else {
+                                tonnage.value = 1
                             }
 
 
@@ -266,23 +269,23 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
 
     fun toSubmit() {
 
-        if(TextUtils.isEmpty(driverImg.value)){
+        if (TextUtils.isEmpty(driverImg.value)) {
             toast("请上传驾驶证正本")
             return
         }
 
-        if(TextUtils.isEmpty(drivingZ.value)){
+        if (TextUtils.isEmpty(drivingZ.value)) {
             toast("请上传行驶证正面")
             return
         }
-        if(TextUtils.isEmpty(drivingF.value)){
+        if (TextUtils.isEmpty(drivingF.value)) {
             toast("请上传行驶证反面")
             return
         }
 
-        repository().rxLreq(NetEngine.service.setCar(driverImg.value, drivingZ.value, drivingF.value, tonnage.value.toString(),licenseDl,
-        licenseCy,number,color_code, carType_code,carLoad,carBrand,drivingSn,carWight,carSizeL,carSizeW,carSizeH,carCate_code,carEnergy_code,carOwn,
-        carUse,carSn,organization, regDate.value, certDate.value,driverOrg, startDate.value, endDate.value,carClass))
+        repository().rxLreq(NetEngine.service.setCar(driverImg.value, drivingZ.value, drivingF.value, tonnage.value.toString(), licenseDl,
+                licenseCy, number, color_code, carType_code, carLoad, carBrand, drivingSn, carWight, carSizeL, carSizeW, carSizeH, carCate_code, carEnergy_code, carOwn,
+                carUse, carSn, organization, regDate.value, certDate.value, driverOrg, startDate.value, endDate.value, carClass))
                 .doOnNext {
                     if (it.ok(true)) {
                         var user = User.get()
@@ -299,7 +302,7 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
 
     fun choseImg(type: Int) {//1:驾驶证正本 2行驶证正面 3行驶证副本
         //选择照片
-        if(!isShow.value!!){
+        if (!isShow.value!!) {
             return
         }
         this.type = type
@@ -314,77 +317,75 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                     if (it.ok(false)) {
                         var bean = it.data() as InfoBean
                         if (null != bean) {
-                            //todo:
-                            info.value=bean
 
+                            info.value = bean
                             isShow.value = bean.status != "2"
-
-                            driverImg.value=bean.driver_img
-                            drivingZ.value=bean.driving_z
-                            drivingF.value=bean.driving_f
-                            tonnage.value=bean.tonnage
-                            licenseDl=bean.license_dl
-                            licenseCy=bean.license_cy
-                            number=bean.number
-                            color.value=bean.color.name
-                            color_code=bean.color.code
-                            carType.value=bean.car_type.name
-                            carType_code=bean.car_type.code
-                            carLoad=bean.car_load
-                            carBrand=bean.car_brand
-                            drivingSn=bean.driving_sn
-                            carWight=bean.car_weight
-                            carSizeL=bean.car_size_l
-                            carSizeW=bean.car_size_w
-                            carSizeH=bean.car_size_h
-                            carCate.value=bean.car_cate.name
-                            carCate_code=bean.car_cate.code
-                            carEnergy.value=bean.car_energy.name
-                            carEnergy_code=bean.car_energy.code
-                            carOwn= bean.car_own
-                            carUse= bean.car_use
-                            carSn=bean.car_sn
-                            organization= bean.organization
-                            regDate.value=bean.reg_date
-                            certDate.value=bean.cert_date
-                            driverOrg= bean.driver_org
-                            carClass=bean.car_class
-                            startDate.value=bean.start_date
-                            endDate.value=bean.end_date
-
-
+                            driverImg.value = bean.driver_img
+                            drivingZ.value = bean.driving_z
+                            drivingF.value = bean.driving_f
+                            tonnage.value = bean.tonnage
+                            licenseDl = bean.license_dl
+                            licenseCy = bean.license_cy
+                            number = bean.number
+                            color.value = bean.color.name
+                            color_code = bean.color.code
+                            carType.value = bean.car_type.name
+                            carType_code = bean.car_type.code
+                            carLoad = bean.car_load
+                            carBrand = bean.car_brand
+                            drivingSn = bean.driving_sn
+                            carWight = bean.car_weight
+                            carSizeL = bean.car_size_l
+                            carSizeW = bean.car_size_w
+                            carSizeH = bean.car_size_h
+                            carCate.value = bean.car_cate.name
+                            carCate_code = bean.car_cate.code
+                            carEnergy.value = bean.car_energy.name
+                            carEnergy_code = bean.car_energy.code
+                            carOwn = bean.car_own
+                            carUse = bean.car_use
+                            carSn = bean.car_sn
+                            organization = bean.organization
+                            regDate.value = bean.reg_date
+                            certDate.value = bean.cert_date
+                            driverOrg = bean.driver_org
+                            carClass = bean.car_class
+                            startDate.value = bean.start_date
+                            endDate.value = bean.end_date
 
                         }
 
+
                     }
                 }
                 .subscribe()
 
     }
 
-    fun choseTon(type: Int){
-        if(type==1)tonnage.value=1 else tonnage.value=2
+    fun choseTon(type: Int) {
+        if (type == 1) tonnage.value = 1 else tonnage.value = 2
     }
 
-    fun choseTime(type: Int){
+    fun choseTime(type: Int) {
 
-        PopupUtils.setChoseTime(repository().context, null,2120,object : ChoiceData {
+        PopupUtils.setChoseTime(repository().context, null, 2120, object : ChoiceData {
             override fun onRestuse(time: String?) {
                 if (time != null) {
-                    when(type){
-                        1->regDate.value=time
-                        2->certDate.value=time
-                        3->startDate.value=time
-                        4->endDate.value=time
+                    when (type) {
+                        1 -> regDate.value = time
+                        2 -> certDate.value = time
+                        3 -> startDate.value = time
+                        4 -> endDate.value = time
                     }
                 }
             }
         })
     }
-    fun toMore(){
+
+    fun toMore() {
         //查看更多
-        more.value=1
-        isMoreShow.value=false
+        more.value = 1
+        isMoreShow.value = false
     }