1.购买保险

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

@@ -9,7 +9,7 @@ import com.quansu.heifengwuliu.vmodel.BuyInsureVModel
 /**
  *Created by shihuiyun
  *on 2020/10/22
- * type:1还未购买保险
+ * type:0还未购买保险
  */
 class BuyInsureActivity: MBActivity<BuyInsureVModel, ActivityBuyInsureBinding>() {
 
@@ -18,14 +18,13 @@ class BuyInsureActivity: MBActivity<BuyInsureVModel, ActivityBuyInsureBinding>()
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
          vm.type.value=intent.extras!!.getInt("type")
-        if(vm.type.value==1){
-
-            vm.info.value= intent.extras!!.getSerializable("info") as WaybillDetails?
-            vm.schemeCode= vm.info.value!!.info.receive[vm.info.value!!.info.receive.size-1].goods_type.code
+        if(vm.type.value==0){
             //访问被保人信息
-            vm.getInfo()
+            vm.getInfo(intent.extras!!.getString("order_id")!!)
             vm.getRate()
 
+        }else{
+            vm.getDatailsInfo(intent.extras!!.getString("order_id")!!)
         }
 
     }

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

@@ -302,6 +302,13 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
         }
 
 
+        if (requestCode == MIntentAction.REQUEST_CHOSE_INSURE) {//保险
+
+            var money=data!!.extras!!.getString("money")
+            vm.insureMoney.value=money
+            vm.isInsureShow.value=true
+        }
+
     }
 
 

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -705,7 +705,7 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
 
             //保险，常用司机
 
-            if (order.is_insurance == "0") {
+            if (order.is_insurance == 0) {
                 vm.insurance.value = "否"
                 is_insurance = 0
             } else {

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -773,7 +773,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             }
             //保险，常用司机
 
-            if (order.is_insurance == "0") {
+            if (order.is_insurance == 0) {
                 vm.insurance.value = "否"
                 is_insurance = 0
             } else {

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

@@ -57,7 +57,7 @@ data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<St
                          var true_total: String,
                          var nums: String, var is_public: String,
                          var driver: List<String>,
-                         var is_insurance: String, var type: Int,
+                         var is_insurance: Int, var type: Int,
                          var data: String, var pay_time: String,
                          var create_time: String, var update_time: String,
                          var delete_time: String, var send: List<SendBean>,

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

@@ -0,0 +1,51 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/10/23
+ */
+data class OrderGet(var channelOrderId:String,var  orderOwner:String,
+                    var productCode:String,var  amount:String,
+                    var payMoney:String,var  schemeCode:String,
+                    var facllbackUrl:String,var  deductible:String,
+                    var startPlace:StartPlaceBean,var finishPlace:StartPlaceBean,
+                    var transferPlace:List<TransferPlaceBean>,
+                    var vehicleInfoList:List<VehicleInfoListBean>,
+                    var goodsInfoList:List<GoodsInfoListBean>,
+                    var insurantInfoList:List<InsurantInfoListBean>,
+                    var applicantInfo:ApplicantInfoBean,
+                    var coverInfo:CoverInfoBean,
+
+
+                    ):IModel{
+
+    data class StartPlaceBean(var areaName:String,var  areaCode:String,
+                              var detailedAddress:String):IModel{
+
+    }
+
+    data class TransferPlaceBean(var areaName:String,var  areaCode:String,
+                                 var detailedAddress:String):IModel{}
+
+    data class VehicleInfoListBean(var licensePlateNo:String,var  licensePlateType:String):IModel{}
+
+    data class GoodsInfoListBean(var goodsName:String,var  goodsType:String,
+                                 var schemeName:String,var  rate:String
+                                 ):IModel{}
+
+    data class InsurantInfoListBean(var personnelType:String,var  name:String,
+                                    var certificateType:String,var  certificateNo:String,
+                                    var mobile:String
+    ):IModel{}
+
+    data class ApplicantInfoBean(var personnelType:String,var  name:String,
+                                 var certificateType:String,var  certificateNo:String,
+                                 var mobile:String
+    ):IModel{}
+
+    data class CoverInfoBean(var coverType:String):IModel{}
+
+
+}

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

@@ -9,7 +9,11 @@ import java.io.Serializable
  */
 data class WaybillDetails(var order: OrderBean, var info: DataInfoBean.OrderBean,
                           var company: CompanyBean,
-                          var driver: DriverBean, var eva: EvaBean) : IModel ,Serializable{
+                          var driver: DriverBean,
+                          var eva: EvaBean,
+                          var is_baoxian:Int,
+                          var baoxian_money:String
+) : IModel ,Serializable{
 
 
     data class OrderBean(var order_id: String, var order_sn: String, var order_state: Int, var uid: String,

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

@@ -822,12 +822,8 @@ interface ApiService {
                        @Field("start_areaCode") start_areaCode: String,
                        @Field("finish_areaName") finish_areaName: String,
                        @Field("finish_areaCode") finish_areaCode: String,
-
                        @Field("transfer_areaName[]") transfer_areaName: List<String>,
                        @Field("transfer_areaCode[]") transfer_areaCode: List<String>,
-
-//                       @Body transfer_areaName: List<String>,
-//                       @Body transfer_areaCode:List<String>,
                        @Field("goodsName") goodsName: String,
                        @Field("name") name: String,
                        @Field("personnelType") personnelType: String,
@@ -836,6 +832,25 @@ interface ApiService {
                        @Field("mobile") mobile: String,
                        @Field("licensePlateNo") licensePlateNo: String,
                        @Field("licensePlateType") licensePlateType: String,
-       ): Resp<List<Any>>
+       ): Resp<Any>
+
+
+
+    /**
+     *投保信息
+     *
+     * @return
+     */
+    @GET("api/baoxian/orderGet")
+    suspend fun baoxianOrderGet(@Query("order_id") order_id: String?): Resp<OrderGet>
+
+
+
+    /**
+     *  保单详情
+     * @return
+     */
+    @GET("api/baoxian/getInfo")
+    suspend fun baoxianGetInfo(@Query("order_id") order_id: String?): Resp<OrderGet>
 
 }

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

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.vmodel
 import android.app.Activity
 import android.app.Application
 import android.content.Intent
+import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
 import android.widget.LinearLayout
@@ -13,9 +14,7 @@ import com.google.gson.Gson
 import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.inte.ChoseData
-import com.quansu.heifengwuliu.model.InsurancePlan
-import com.quansu.heifengwuliu.model.User
-import com.quansu.heifengwuliu.model.WaybillDetails
+import com.quansu.heifengwuliu.model.*
 import com.quansu.heifengwuliu.utils.PopuBottomUtils
 import com.quansu.heifengwuliu.utils.PopuListUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
@@ -26,16 +25,16 @@ import java.util.HashMap
 
 class BuyInsureVModel(application: Application) : BViewModel<BRepository>(application) {
 
-    val type: MutableLiveData<Int> = MutableLiveData<Int>()//type:1还未购买保险
+    val type: MutableLiveData<Int> = MutableLiveData<Int>()//type:0还未购买保险  1已经购买保险
 
-    val info: MutableLiveData<WaybillDetails> = MutableLiveData<WaybillDetails>()//还未购买保险，从详情传过来
+    val info: MutableLiveData<OrderGet> = MutableLiveData<OrderGet>()//还未购买保险，从详情传过来
 
     //保险费率
     val schemeName: MutableLiveData<String> = MutableLiveData<String>()
     val schemeCodeName: MutableLiveData<String> = MutableLiveData<String>()
     var schemeCode: String = ""
     var maxAmount: String = ""
-    val minAmount: MutableLiveData<String> = MutableLiveData<String>()
+    val minAmount: MutableLiveData<String> = MutableLiveData<String>("10000")
 
 
     var list: List<InsurancePlan>? = null
@@ -45,6 +44,7 @@ class BuyInsureVModel(application: Application) : BViewModel<BRepository>(applic
 
     val priceFormat: MutableLiveData<String> = MutableLiveData<String>()//保费金额-展示的
 
+    var order_id: String? = null
 
     @Bindable
     var name: String? = null
@@ -76,22 +76,26 @@ class BuyInsureVModel(application: Application) : BViewModel<BRepository>(applic
             notifyPropertyChanged(BR.money)
         }
 
-    fun getInfo() {//被保人信息
+    fun getInfo(order_id: String) {//被保人信息
+        this.order_id = order_id
         name = User.get()!!.name
         phone = User.get()!!.mobile
 
-        //获取企业统一信用代码
-        repository().rxPreq(NetEngine.service.getInfo("3"))
-                .doOnNext {
-                    if (it.ok()) {
-                        var bean = it.data()
-                        if (null != bean) {
-                            number = bean.license_sn
-                        }
 
-                    }
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.baoxianOrderGet(order_id) }
+
+            if (it.ok()) {
+                var bean = it.data()
+                info.value = bean
+                if (null != bean) {
+                    number = bean.insurantInfoList[0].certificateNo
+
                 }
-                .subscribe()
+            }
+
+        }
+
 
     }
 
@@ -200,74 +204,41 @@ class BuyInsureVModel(application: Application) : BViewModel<BRepository>(applic
             return
         }
 
-//        var map = HashMap<String, String>()
-//        map["order_id"] = info.value!!.order.order_id
-//        map["amount"] = money!!
-//        map["payMoney"] = payMoney!!
-//        map["schemeCode"] = schemeCode!!
-//        map["start_areaName"] = info.value!!.info.send[info.value!!.info.send.size - 1].city.name
-//        map["start_areaCode"] = info.value!!.info.send[info.value!!.info.send.size - 1].city.code
-//        map["finish_areaName"] = info.value!!.info.receive[info.value!!.info.receive.size - 1].city.name
-//        map["finish_areaCode"] = info.value!!.info.receive[info.value!!.info.receive.size - 1].city.code
 
         var areaName = ArrayList<String>()
         var areaCode = ArrayList<String>()
-        if (info.value!!.info.receive.size > 1) {
-            for ((position, item) in info.value!!.info.receive.withIndex()) {
-                if (position < info.value!!.info.receive.size - 1) {
-                    areaName.add(item.city.name)
-                    areaCode.add(item.city.code)
-                }
-            }
+        for(item in info.value!!.transferPlace){
+            areaName.add(item.areaName)
+            areaCode.add(item.areaCode)
         }
 
-//        map["transfer_areaName"] = Gson().toJson(areaName)
-//        map["transfer_areaCode"] = Gson().toJson(areaCode)
-//
-//        map["goodsName"] = info.value!!.info.receive[info.value!!.info.receive.size - 1].goods
-//
-//        map["name"] = name!!
-//        map["personnelType"] = "0"
-//        map["certificateType"] = "41"
-//        map["certificateNo"] = number!!
-//        map["mobile"] = phone!!
-//        map["licensePlateNo"] = info.value!!.driver.number
-//        map["licensePlateType"] = "01"
-//
-
-  //      Log.e("-shy-", "map=" + Gson().toJson(map))
 
 
         viewModelScope.launch {
 
-
-//            var it= repository().lreq { NetEngine.service.insure(map) }
-//
-//            if(it.ok(true)){
-//
-//                val intent = Intent()
-//                var con = repository().context as Activity
-//                con.setResult(Activity.RESULT_OK, intent)
-//                con.finish()
-//            }
-
-
-            var it = repository().lreq { NetEngine.service.insure(info.value!!.order.order_id,money!!,
-                    payMoney!!, schemeCode!!,   info.value!!.info.send[info.value!!.info.send.size - 1].city.name,
-                    info.value!!.info.send[info.value!!.info.send.size - 1].city.code,
-                    info.value!!.info.receive[info.value!!.info.receive.size - 1].city.name,
-                    info.value!!.info.receive[info.value!!.info.receive.size - 1].city.code,
-                    areaName,  areaCode,
-                    info.value!!.info.receive[info.value!!.info.receive.size - 1].goods,
-                    name!!,"0","41",
-                    number!!,phone!!,
-                    info.value!!.driver.number,"01"
-            ) }
+            var it = repository().lreq {
+                NetEngine.service.insure(order_id!!, money!!,
+                        payMoney!!, schemeCode!!,
+                        info.value!!.startPlace.areaName,
+                        info.value!!.startPlace.areaCode,
+                        info.value!!.finishPlace.areaName,
+                        info.value!!.finishPlace.areaCode,
+                        areaName, areaCode,
+                        info.value!!.goodsInfoList[0].goodsName,
+                        name!!, "0", "41",
+                        number!!, phone!!,
+                        info.value!!.vehicleInfoList[0].licensePlateNo,
+                        "01"
+                )
+            }
 
             if (it.ok(true)) {
 
                 val intent = Intent()
                 var con = repository().context as Activity
+                var bundle=Bundle()
+                bundle.putString("money",payMoney!!)
+                intent.putExtras(bundle)
                 con.setResult(Activity.RESULT_OK, intent)
                 con.finish()
             }
@@ -278,6 +249,31 @@ class BuyInsureVModel(application: Application) : BViewModel<BRepository>(applic
     }
 
 
+
+    fun getDatailsInfo(order_id: String) {//详情
+
+        name = User.get()!!.name
+        phone = User.get()!!.mobile
+
+        viewModelScope.launch {
+            var it = repository().lreq { NetEngine.service.baoxianGetInfo(order_id) }
+
+            if (it.ok()) {
+                var bean = it.data()
+                info.value = bean
+                if (null != bean) {
+                    number = bean.insurantInfoList[0].certificateNo
+                    money=bean.amount
+                    priceFormat.value=bean.payMoney
+                    schemeName.value=bean.goodsInfoList[0].schemeName
+                    schemeCodeName.value=bean.goodsInfoList[0].rate
+
+                }
+            }
+        }
+
+    }
+
 }
 
 

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

@@ -94,6 +94,11 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
 
     val payMoney:MutableLiveData<String> = MutableLiveData<String>()
 
+    //保险
+
+    val isInsureShow: MutableLiveData<Boolean> = MutableLiveData<Boolean>(false)
+
+    val insureMoney:MutableLiveData<String> = MutableLiveData<String>()
 
 
     @Bindable
@@ -115,6 +120,13 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
                             info.value = it.data()
                             is_collect.value=it.data()!!.driver.is_collect
                             order_state = info.value!!.order.order_state
+                            if(info.value!!.is_baoxian==1&&info.value!!.info.is_insurance==1){
+                                isInsureShow.value=true
+                                insureMoney.value=info.value!!.baoxian_money
+                            }else{
+                                isInsureShow.value=false
+                            }
+
                             when (info.value!!.order.order_state) {
                                 10 -> tvTitle.value = "运输轨迹"
                                 20 -> tvTitle.value = "运输轨迹"
@@ -709,11 +721,11 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
 
 
 
-    fun toBuy(){
+    fun toBuy(is_baoxian:Int){
         UiSwitch.bundleRes(repository().context as Activity,
                 BuyInsureActivity::class.java,
-                B.with().putInt("type", 1)
-                        .putSR("info",info.value)
+                B.with().putInt("type", is_baoxian)
+                        .putString("order_id",info.value!!.order.order_id)
                         .ok(),
                 MIntentAction.REQUEST_CHOSE_INSURE)
     }

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

@@ -4,7 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <import type="android.view.View" />
+
         <import type="com.quansu.heifengwuliu.BuildConfig" />
 
         <variable
@@ -29,525 +31,536 @@
                 android:layout_height="match_parent"
                 android:scrollbars="none">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="17dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginEnd="16dp"
-                        android:orientation="vertical"
-                        android:paddingStart="11dp"
-                        android:paddingEnd="8dp"
-                        app:qmui_backgroundColor="@color/white"
-                        app:qmui_borderColor="@color/white"
-                        app:qmui_radius="@dimen/dp_4">
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="19dp"
-                            android:text="投保人信息"
-                            android:textColor="#26292F"
-                            android:textSize="15sp" />
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="14dp"
-                            android:layout_marginBottom="20dp">
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="8dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
 
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="投保人"
+                                android:layout_marginTop="19dp"
+                                android:text="投保人信息"
                                 android:textColor="#26292F"
-                                android:textSize="14sp" />
+                                android:textSize="15sp" />
 
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                android:text="山东鑫运必达物流科技有限责任公司" />
+                                android:layout_marginTop="14dp"
+                                android:layout_marginBottom="20dp">
 
 
-                        </LinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="投保人"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.applicantInfo.name}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="17dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginEnd="16dp"
-                        android:orientation="vertical"
-                        android:paddingStart="11dp"
-                        android:paddingEnd="8dp"
-                        app:qmui_backgroundColor="@color/white"
-                        app:qmui_borderColor="@color/white"
-                        app:qmui_radius="@dimen/dp_4">
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="19dp"
-                            android:text="被保人信息"
-                            android:textColor="#26292F"
-                            android:textSize="15sp" />
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp"
-                            android:gravity="center"
-                            android:orientation="horizontal">
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="8dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="姓名"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_16">
+                                android:layout_marginTop="19dp"
+                                android:text="被保人信息"
+                                android:textColor="#26292F"
+                                android:textSize="15sp" />
+
 
-                            </TextView>
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:gravity="center"
+                                android:orientation="horizontal">
 
-                            <EditText
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:background="@null"
-                                android:text="@={vm.name}"
-                                android:gravity="center_vertical|right"
-                                android:hint="请输入被保人姓名"
-                                android:textColor="@color/text_title"
-                                android:textColorHint="#979899"
-                                android:textSize="@dimen/sp_13"></EditText>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="姓名"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_16">
 
+                                </TextView>
 
-                        </LinearLayout>
+                                <EditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="@dimen/dp_10"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:gravity="center_vertical|right"
+                                    android:hint="请输入被保人姓名"
+                                    android:text="@={vm.name}"
+                                    android:textColor="@color/text_title"
+                                    android:textColorHint="#979899"
+                                    android:textSize="@dimen/sp_13"></EditText>
 
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp"
+                            </LinearLayout>
 
-                            android:gravity="center"
-                            android:orientation="horizontal">
 
-                            <TextView
-                                android:layout_width="wrap_content"
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="企业统一信用代码"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_16">
+                                android:layout_marginTop="13dp"
 
-                            </TextView>
+                                android:gravity="center"
+                                android:orientation="horizontal">
 
-                            <EditText
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:background="@null"
-                                android:text="@={vm.number}"
-                                android:gravity="center_vertical|right"
-                                android:hint="请输入企业统一信用代码"
-                                android:textColor="@color/text_title"
-                                android:textColorHint="#979899"
-                                android:textSize="@dimen/sp_13"></EditText>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="企业统一信用代码"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_16">
 
+                                </TextView>
 
-                        </LinearLayout>
+                                <EditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="@dimen/dp_10"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:gravity="center_vertical|right"
+                                    android:hint="请输入企业统一信用代码"
+                                    android:text="@={vm.number}"
+                                    android:textColor="@color/text_title"
+                                    android:textColorHint="#979899"
+                                    android:textSize="@dimen/sp_13"></EditText>
 
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp"
-                            android:layout_marginBottom="19dp"
-                            android:gravity="center"
-                            android:orientation="horizontal">
+                            </LinearLayout>
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="手机号"
-                                android:textColor="@color/text_title"
-                                android:textSize="@dimen/sp_16">
 
-                            </TextView>
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:layout_marginBottom="19dp"
+                                android:gravity="center"
+                                android:orientation="horizontal">
 
-                            <EditText
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:background="@null"
-                                android:text="@={vm.phone}"
-                                android:gravity="center_vertical|right"
-                                android:hint="请输入手机号"
-                                android:inputType="phone"
-                                android:textColor="@color/text_title"
-                                android:textColorHint="#979899"
-                                android:textSize="@dimen/sp_13"></EditText>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="手机号"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_16">
 
+                                </TextView>
 
-                        </LinearLayout>
+                                <EditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="@dimen/dp_10"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:gravity="center_vertical|right"
+                                    android:hint="请输入手机号"
+                                    android:inputType="phone"
+                                    android:text="@={vm.phone}"
+                                    android:textColor="@color/text_title"
+                                    android:textColorHint="#979899"
+                                    android:textSize="@dimen/sp_13"></EditText>
 
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                            </LinearLayout>
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="17dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginEnd="16dp"
-                        android:orientation="vertical"
-                        android:paddingStart="11dp"
-                        android:paddingEnd="8dp"
-                        app:qmui_backgroundColor="@color/white"
-                        app:qmui_borderColor="@color/white"
-                        app:qmui_radius="@dimen/dp_4">
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="19dp"
-                            android:text="车辆信息"
-                            android:textColor="#26292F"
-                            android:textSize="15sp" />
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="14dp"
-                            android:layout_marginBottom="20dp">
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="8dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
 
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="车牌号"
+                                android:layout_marginTop="19dp"
+                                android:text="车辆信息"
                                 android:textColor="#26292F"
-                                android:textSize="14sp" />
+                                android:textSize="15sp" />
 
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:text="@{vm.info.driver.number}"
-                                android:textSize="14sp"
-                                tools:text="鲁Q99999" />
-
-
-                        </LinearLayout>
+                                android:layout_marginTop="14dp"
+                                android:layout_marginBottom="20dp">
 
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="车牌号"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="17dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginEnd="16dp"
-                        android:orientation="vertical"
-                        android:paddingStart="11dp"
-                        android:paddingEnd="8dp"
-                        app:qmui_backgroundColor="@color/white"
-                        app:qmui_borderColor="@color/white"
-                        app:qmui_radius="@dimen/dp_4">
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="19dp"
-                            android:text="货物信息"
-                            android:textColor="#26292F"
-                            android:textSize="15sp" />
-
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp">
-
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.vehicleInfoList[0].licensePlateNo}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="鲁Q99999" />
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="货物名称"
-                                android:textColor="#26292F"
-                                android:textSize="14sp" />
 
+                            </LinearLayout>
 
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].goods}"
-                                tools:text="水泥" />
 
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                        </LinearLayout>
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
-                            android:onClick="@{v->vm.choseType()}"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp">
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="8dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
 
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="货物类型"
+                                android:layout_marginTop="19dp"
+                                android:text="货物信息"
                                 android:textColor="#26292F"
-                                android:textSize="14sp" />
+                                android:textSize="15sp" />
 
 
-                            <TextView
-                                android:layout_width="0dp"
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="right"
-                                android:text="@{vm.schemeName}"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                tools:text="水泥" />
+                                android:layout_marginTop="13dp">
 
-                            <ImageView
-                                android:layout_width="8dp"
-                                android:layout_height="13dp"
-                                android:layout_marginStart="4dp"
-                                android:src="@drawable/ic_insure_back" />
 
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="货物名称"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
-                        </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp">
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.goodsInfoList[0].goodsName}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="水泥" />
 
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="保险费率"
-                                android:textColor="#26292F"
-                                android:textSize="14sp" />
-
+                            </LinearLayout>
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:text="@{vm.schemeCodeName}"
-                                android:textSize="14sp"
-                                tools:text="水泥" />
+                                android:layout_marginTop="13dp"
+                                android:gravity="center_vertical"
+                                android:onClick="@{v->vm.choseType()}">
+
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="货物类型"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
+
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{vm.schemeName}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="水泥" />
+
+                                <ImageView
+                                    android:layout_width="8dp"
+                                    android:layout_height="13dp"
+                                    android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
+                                    android:layout_marginStart="4dp"
+                                    android:src="@drawable/ic_insure_back" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp">
 
 
-                        </LinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="保险费率"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp">
 
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.schemeCodeName}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="水泥" />
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="起运地"
-                                android:textColor="#26292F"
-                                android:textSize="14sp" />
 
+                            </LinearLayout>
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                android:text="@{vm.info.info.send[vm.info.info.send.size()-1].province.name+vm.info.info.send[vm.info.info.send.size()-1].city.name+vm.info.info.send[vm.info.info.send.size()-1].area.name+vm.info.info.send[vm.info.info.send.size()-1].address}"
-                                tools:text="水泥" />
+                                android:layout_marginTop="13dp">
 
 
-                        </LinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="起运地"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp"
-                            android:layout_marginBottom="19dp">
 
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.startPlace.areaName}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="水泥" />
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="目的地"
-                                android:textColor="#26292F"
-                                android:textSize="14sp" />
 
+                            </LinearLayout>
 
-                            <TextView
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:text="@{vm.info.info.receive[vm.info.info.receive.size()-1].province.name+vm.info.info.receive[vm.info.info.receive.size()-1].city.name+vm.info.info.receive[vm.info.info.receive.size()-1].area.name+vm.info.info.receive[vm.info.info.receive.size()-1].address}"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                tools:text="水泥" />
+                                android:layout_marginTop="13dp"
+                                android:layout_marginBottom="19dp">
 
 
-                        </LinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="目的地"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.info.finishPlace.areaName}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="水泥" />
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="17dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginEnd="16dp"
-                        android:orientation="vertical"
-                        android:paddingStart="11dp"
-                        android:paddingEnd="8dp"
-                        app:qmui_backgroundColor="@color/white"
-                        app:qmui_borderColor="@color/white"
-                        app:qmui_radius="@dimen/dp_4">
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="19dp"
-                            android:text="保险计算器"
-                            android:textColor="#26292F"
-                            android:textSize="15sp" />
+                            </LinearLayout>
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                        <LinearLayout
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp">
+                            android:layout_marginStart="17dp"
+                            android:layout_marginTop="12dp"
+                            android:layout_marginEnd="16dp"
+                            android:orientation="vertical"
+                            android:paddingStart="11dp"
+                            android:paddingEnd="8dp"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_borderColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
 
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="保额"
+                                android:layout_marginTop="19dp"
+                                android:text="保险计算器"
                                 android:textColor="#26292F"
-                                android:textSize="14sp" />
+                                android:textSize="15sp" />
 
 
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp">
+
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="保额"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
+
+
+                                <EditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="@dimen/dp_10"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:gravity="center_vertical|right"
+                                    android:hint="@{@string/insure_tips+vm.minAmount}"
+                                    android:text="@={vm.money}"
+                                    android:textColor="@color/text_title"
+                                    android:textColorHint="#979899"
+                                    android:textSize="@dimen/sp_13"></EditText>
+
+
+                                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                                    android:layout_width="68dp"
+                                    android:layout_height="26dp"
+                                    android:layout_marginStart="8dp"
+                                    android:onClick="@{v->vm.sumMoney()}"
+                                    android:text="计算保费"
+                                    android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
+                                    android:textColor="#F6C553"
+                                    android:textSize="14sp"
+                                    app:qmui_backgroundColor="#FDF9F1"
+                                    app:qmui_borderColor="#F5BF41"
+                                    app:qmui_borderWidth="1dp"
+                                    app:qmui_radius="2dp" />
+
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="13dp"
+                                android:layout_marginBottom="20dp">
 
-                            <EditText
-                                android:layout_width="0dp"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/dp_10"
-                                android:layout_weight="1"
-                                android:background="@null"
-                                android:gravity="center_vertical|right"
-                                android:hint="@{@string/insure_tips+vm.minAmount}"
-                                android:text="@={vm.money}"
-                                android:textColor="@color/text_title"
-                                android:textColorHint="#979899"
-                                android:textSize="@dimen/sp_13"></EditText>
 
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="保费金额"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp" />
 
-                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                                android:layout_width="68dp"
-                                android:layout_height="26dp"
-                                android:layout_marginStart="8dp"
-                                android:text="计算保费"
-                                android:textColor="#F6C553"
-                                android:onClick="@{v->vm.sumMoney()}"
-                                android:textSize="14sp"
-                                app:qmui_backgroundColor="#FDF9F1"
-                                app:qmui_borderColor="#F5BF41"
-                                app:qmui_borderWidth="1dp"
-                                app:qmui_radius="2dp" />
 
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="right"
+                                    android:text="@{vm.priceFormat}"
+                                    android:textColor="#26292F"
+                                    android:textSize="14sp"
+                                    tools:text="300元" />
 
-                        </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="13dp"
-                            android:layout_marginBottom="20dp">
+                            </LinearLayout>
 
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp" />
+                    </LinearLayout>
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="保费金额"
-                                android:textColor="#26292F"
-                                android:textSize="14sp" />
 
 
-                            <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="right"
-                                android:textColor="#26292F"
-                                android:textSize="14sp"
-                                android:text="@{vm.priceFormat}"
-                                tools:text="300元" />
 
 
-                        </LinearLayout>
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="80dp"/>
-                </LinearLayout>
             </ScrollView>
 
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_marginStart="16dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
+                android:layout_marginStart="16dp"
                 android:layout_marginEnd="15dp"
-                android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
                 android:onClick="@{v->vm.putInsure()}"
-                android:layout_height="wrap_content">
+                android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}">
+
                 <ImageView
                     android:layout_width="match_parent"
                     android:layout_height="71dp"
@@ -556,18 +569,17 @@
                 <TextView
                     android:id="@+id/tv_tips"
                     android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:text="立即投保"
                     android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:layout_height="wrap_content">
+                    android:textSize="16sp">
 
                 </TextView>
 
             </FrameLayout>
 
 
-
         </FrameLayout>
     </LinearLayout>
 </layout>

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

@@ -361,13 +361,14 @@
                                         android:layout_marginStart="2dp"
                                         android:paddingStart="10dp"
                                         android:paddingEnd="10dp"
-                                        android:text="购买保险"
-                                        android:textColor="#F6C553"
-                                        android:onClick="@{v->vm.toBuy()}"
+                                        android:text="@{vm.info.is_baoxian==1?@string/buy_insure_on:@string/buy_insure_off}"
+                                        android:textColor="@{vm.info.is_baoxian==1?@color/insure_text_on:@color/insure_text_off}"
+                                        android:onClick="@{v->vm.toBuy(vm.info.is_baoxian)}"
                                         android:textSize="14sp"
-                                        app:qmui_backgroundColor="#FDF9F1"
-                                        app:qmui_borderColor="#F5BF41"
+                                        app:qmui_backgroundColor="@{vm.info.is_baoxian==1?@color/insure_on:@color/insure_off}"
+                                        app:qmui_borderColor="@{vm.info.is_baoxian==1?@color/insure_boder_on:@color/insure_boder_off}"
                                         app:qmui_borderWidth="1dp"
+                                        android:visibility="@{vm.info.info.is_insurance==1?View.VISIBLE:View.GONE}"
                                         app:qmui_radius="2dp" />
 
 
@@ -619,6 +620,52 @@
 
                         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="50dp"
+                            android:layout_marginStart="@dimen/dp_17"
+                            android:layout_marginTop="@dimen/dp_12"
+                            android:layout_marginEnd="@dimen/dp_16"
+                            android:layout_marginBottom="9dp"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:paddingStart="21dp"
+                            android:paddingEnd="16dp"
+                            android:visibility="@{vm.isInsureShow?View.VISIBLE:View.GONE}"
+                            app:layout_goneMarginTop="@dimen/dp_10"
+                            app:qmui_backgroundColor="@color/white"
+                            app:qmui_radius="@dimen/dp_4">
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="保险费"
+                                    android:textColor="#767778"
+                                    android:textSize="@dimen/sp_14"></TextView>
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:gravity="right"
+                                    android:text="@{@string/total_img+vm.insureMoney}"
+                                    android:textColor="@color/text_title"
+                                    android:textSize="@dimen/sp_14"
+                                    tools:text="￥30000"></TextView>
+
+
+                            </LinearLayout>
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
 
                         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:layout_width="match_parent"

app/src/main/res/values/colors.xml

@@ -225,5 +225,16 @@
 
     <color name="pay_off">#333333</color>
 
+    <color name="insure_on">#EBEBEB</color>
+    <color name="insure_off">#FDF9F1</color>
+
+    <color name="insure_boder_on">#A0A0A0</color>
+    <color name="insure_boder_off">#F5BF41</color>
+
+
+
+    <color name="insure_text_on">#9E9E9E</color>
+    <color name="insure_text_off">#F6C553</color>
+
 
 </resources >

app/src/main/res/values/strings.xml

@@ -517,5 +517,8 @@ Api 已达到使用限制
     <string name="order_information">订单信息</string>
     <string name="insure_tips">请输入保额最小</string>
 
+    <string name="buy_insure_off">购买保险</string>
+    <string name="buy_insure_on">已购买保险</string>
+
 
 </resources >