1. driver 信息可为空

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

@@ -31,8 +31,6 @@ import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.utils.PopuTipsUtils
 import com.quansu.heifengwuliu.vmodel.WaybillDetailsVModel
 import com.ysnows.base.model.PositionBean
-import com.ysnows.base.utils.B
-import com.ysnows.base.utils.UiSwitch
 import com.ysnows.base.utils.UiUtils
 import java.util.*
 
@@ -112,12 +110,12 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
 
         binding.imgCollect.onClick {
 
-            if (vm.info.value!!.driver.is_collect == 0) {
+            if (vm.info.value!!.driver?.is_collect == 0) {
 
                 PopuTipsUtils.show(context(), "确定收藏该司机么？", binding.imgCollect, object : ChoiceData {
                     override fun onRestuse(id: String?) {
                         val choseList = ArrayList<SaveDriverBean>()
-                        var ben = SaveDriverBean(vm.info.value!!.driver.uid, vm.info.value!!.driver.car_id)
+                        var ben = SaveDriverBean(vm.info.value!!.driver?.uid, vm.info.value!!.driver?.car_id)
                         choseList.add(ben)
                         var arr = Gson().toJson(choseList)
                         vm.setSaveDriver(arr)
@@ -130,7 +128,7 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
                 PopuTipsUtils.show(context(), "确定取消收藏该司机么？", binding.imgCollect, object : ChoiceData {
                     override fun onRestuse(id: String?) {
                         val choseList = ArrayList<SaveDriverBean>()
-                        var ben = SaveDriverBean(vm.info.value!!.driver.uid, vm.info.value!!.driver.car_id)
+                        var ben = SaveDriverBean(vm.info.value!!.driver?.uid, vm.info.value!!.driver?.car_id)
                         choseList.add(ben)
                         var arr = Gson().toJson(choseList)
                         vm.setDelDriver(arr)
@@ -148,7 +146,7 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
 
 
         var list = ArrayList<PositionBean>()
-        var brand=bean.driver.number
+        var brand=bean.driver?.number
 
 
         var positionName = bean.info.send[bean.info.send.size - 1].province.name + bean.info.send[bean.info.send.size - 1].city.name +

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

@@ -9,7 +9,7 @@ import java.io.Serializable
  */
 data class WaybillDetails(var order: OrderBean, var info: DataInfoBean.OrderBean,
                           var company: CompanyBean,
-                          var driver: DriverBean,
+                          var driver: DriverBean?,
                           var eva: EvaBean,
                           var is_baoxian:Int,
                           var baoxian_money:String

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

@@ -257,7 +257,7 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
 
             if (order_state == 10 || order_state == 20) {
 
-                var brand=info.value!!.driver.number
+                var brand=info.value!!.driver?.number
 
 
                 var list = ArrayList<PositionBean>()
@@ -681,7 +681,7 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
                 .doOnNext {
                     if (it.ok(true)) {
                         is_collect.value=1
-                        info.value!!.driver.is_collect=1
+                        info.value!!.driver?.is_collect=1
                     }
                 }
                 .subscribe()
@@ -695,7 +695,7 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
            val it= repository().lreq { NetEngine.service.delDriver(arr) }
             if(it.ok(true)){
                 is_collect.value=0
-                info.value!!.driver.is_collect=0
+                info.value!!.driver?.is_collect=0
             }
         }