1.添加驾照类型。

app/src/main/java/com/quansu/heifengwuliu/config/Config.kt

@@ -7,8 +7,8 @@ class Config : IConfig {
       // return "https://heifengwuliu.qs110.com/"
      // return "https://heifengwuliudev.qs110.com/"
 
-       return "https://xinyunbida.qs110.com/"
-      //  return "https://xinyunbidadev.qs110.com/"
+      return "https://xinyunbida.qs110.com/"
+      // return "https://xinyunbidadev.qs110.com/"
 
     }
 

app/src/main/java/com/quansu/heifengwuliu/model/CvVehicle.kt

@@ -8,6 +8,8 @@ import com.ysnows.base.inter.IModel
  */
 data class CvVehicle(var id_num:String,var name:String,var sex:String,
                      var nationality:String,var address:String,var birth_date:String,
-                     var issue_date:String,var car_class:String,var valid_to:String,var official_seal:String
+                     var issue_date:String,var car_class:String,
+                     var valid_to:String,var official_seal:String,
+                     var valid_from: String,
 ) : IModel {
 }

app/src/main/java/com/quansu/heifengwuliu/model/InfoBean.kt

@@ -28,6 +28,7 @@ class InfoBean(var info_id: String, var uid: String,
                var car_own: String,
                var car_use: String, var car_sn: String, var organization: String,
                var reg_date: String, var cert_date: String, var driver_org: String,
+               var car_class:String,
                var start_date: String, var end_date: String,
                var reason: String, var color: ColorBean, var car_cate: CarCateBean,
                var car_energy: carEnergyBean,

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -341,7 +341,9 @@ interface ApiService {
                @Field("car_use") car_use: String?, @Field("car_sn") car_sn: String?,
                @Field("organization") organization: String?, @Field("reg_date") reg_date: String?,
                @Field("cert_date") cert_date: String?, @Field("driver_org") driver_org: String?,
-               @Field("start_date") start_date: String?, @Field("end_date") end_date: String?
+               @Field("start_date") start_date: String?, @Field("end_date") end_date: String?,
+               @Field("car_class") car_class: String?
+
     ): Observable<Resp<Any>>
 
 

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

@@ -163,6 +163,13 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
         }
 
 
+    @Bindable
+    var carClass: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.carClass)
+        }
+
 
 
     fun discernVehicle(img: String) {//获取驾驶证信息
@@ -174,9 +181,20 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                         carOwn=bean.name
                         driverOrg=bean.official_seal
                         startDate.value=bean.issue_date
-                        endDate.value=bean.valid_to
 
 
+                        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"
+
+                        }
+
+
+                        carClass=bean.car_class
+
 
                     }
 
@@ -242,7 +260,7 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
 
         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))
+        carUse,carSn,organization, regDate.value, certDate.value,driverOrg, startDate.value, endDate.value,carClass))
                 .doOnNext {
                     if (it.ok(true)) {
                         var user = User.get()
@@ -308,6 +326,7 @@ class VehicleInfoVModel(application: Application) : BViewModel<BRepository>(appl
                             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
 

app/src/main/res/layout/activity_vehicle_info.xml

@@ -1535,16 +1535,16 @@
                                 android:orientation="horizontal">
 
                                 <TextView
-                                    android:layout_width="0dp"
+                                    android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_weight="1"
                                     android:text="驾驶证发证机关"
                                     android:textColor="@color/text_title"
                                     android:textSize="14sp" />
 
 
                                 <com.ysnows.base.widget.DelEditText
-                                    android:layout_width="wrap_content"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
                                     android:layout_height="wrap_content"
                                     android:background="@color/white"
                                     android:gravity="right|center"
@@ -1562,20 +1562,51 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="13dp"
-                                android:onClick="@{v->vm.choseTime(3)}"
                                 android:orientation="horizontal">
 
                                 <TextView
-                                    android:layout_width="0dp"
+                                    android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
+                                    android:text="驾照类型"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="14sp" />
+
+
+                                <com.ysnows.base.widget.DelEditText
+                                    android:layout_width="0dp"
                                     android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:background="@color/white"
+                                    android:gravity="right|center"
+                                    android:hint="驾照类型"
+                                    android:paddingStart="@dimen/dp_10"
+                                    android:text="@={vm.carClass}"
+                                    android:textColor="#26292F"
+                                    android:textColorHint="#979899"
+                                    android:textSize="@dimen/sp_13" />
+
+
+                            </LinearLayout>
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:onClick="@{v->vm.choseTime(3)}"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
                                     android:text="驾驶证开始日期"
                                     android:textColor="@color/text_title"
                                     android:textSize="14sp" />
 
 
                                 <com.ysnows.base.widget.DelEditText
-                                    android:layout_width="wrap_content"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
                                     android:layout_height="wrap_content"
                                     android:background="@color/white"
                                     android:gravity="right|center"
@@ -1803,16 +1834,16 @@
                                 android:orientation="horizontal">
 
                                 <TextView
-                                    android:layout_width="0dp"
+                                    android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_weight="1"
                                     android:text="驾驶证发证机关"
                                     android:textColor="@color/text_title"
                                     android:textSize="14sp" />
 
 
                                 <TextView
-                                    android:layout_width="wrap_content"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
                                     android:layout_height="wrap_content"
                                     android:gravity="right|center"
                                     android:paddingStart="@dimen/dp_10"
@@ -1823,6 +1854,35 @@
 
                             </LinearLayout>
 
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="驾照类型"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="14sp" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right|center"
+                                    android:paddingStart="@dimen/dp_10"
+                                    android:text="@{vm.carClass}"
+                                    android:textColor="#26292F"
+                                    android:textSize="@dimen/sp_13" />
+
+
+                            </LinearLayout>
+
+
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"