1.修改单车运量单位.

app/src/main/java/com/quansu/heifengwuliu/adapter/CarEnterAdapter.kt

@@ -122,7 +122,12 @@ class CarEnterAdapter(val vm: OwnerMoreVModel) : BAdapter<ReceiveBean, BaseDataB
             //选择单位
             PopuBottomUtils.showListString(context,  numsTypeList, object : ChoiceData {
                 override fun onRestuse(name: String?) {
-                    item.nums_type = name!!
+                    item.nums_type_name = name!!
+                    for((index,ss) in numsTypeList.withIndex()){
+                        if(ss == name){
+                            item.nums_type=index.toString()
+                        }
+                    }
                     holder.dataBinding?.tvChoseUnits!!.text = name
                 }
             })
@@ -130,8 +135,6 @@ class CarEnterAdapter(val vm: OwnerMoreVModel) : BAdapter<ReceiveBean, BaseDataB
         }
 
 
-
-
         //----
         val textWatcher: TextWatcher = object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}

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

@@ -156,7 +156,7 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
 
         }
 
-        binding.tvPublish.setOnClickListener {
+        binding.flPublish.setOnClickListener {
             //提交
             judgeValue()
         }
@@ -276,7 +276,7 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
     private fun addList() {
 
         var bean = ReceiveBean("", "", "", "", "", "", "", "", "",
-                "1", "", "", "", "", "", "", "", "","")
+                "1", "", "", "", "","", "", "", "", "","")
         receiveList.add(bean)
         adapter!!.addData(bean)
         toast("添加一条")
@@ -367,12 +367,12 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
             var pca = info.default_receive.province?.name + info.default_receive.city?.name + info.default_receive.area?.name
 
             bean = ReceiveBean(info.default_receive.lat, info.default_receive.lng, info.default_receive.province!!.code, info.default_receive.city!!.code, info.default_receive.area!!.code, "", "", "", "",
-                    "1", "", "", info.car_type[0].weight, "吨", "", "", pca, "",info.default_receive.city!!.name)
+                    "1", "", "", info.car_type[0].weight, "0","吨", "", "", pca, "",info.default_receive.city!!.name)
 
         }else{
 
              bean = ReceiveBean("", "", "", "", "", "", "", "", "",
-                    "1", "", "", "", "", "", "", "", "","")
+                    "1", "", "", "", "","", "", "", "", "","")
 
         }
 
@@ -693,7 +693,7 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
                     var pca = item.province.name + item.city.name + item.area.name
 
                     var bean = ReceiveBean(item.lat, item.lng, item.province.code, item.city.code, item.area.code, item.address, item.name, item.mobile, item.time,
-                            "1", item.goods, item.goods_type.code, item.nums, item.nums_type.name, item.price, item.total, pca, item.goods_type.name,item.city.name)
+                            "1", item.goods, item.goods_type.code, item.nums, item.nums_type.code,item.nums_type.name, item.price, item.total, pca, item.goods_type.name,item.city.name)
                     receiveList.add(bean)
 
                 }

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

@@ -127,6 +127,12 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             PopuBottomUtils.showListString(context(), numsTypeList, object : ChoiceData {
                 override fun onRestuse(name: String?) {
                     vm.unit.value = name
+                    for((index,ss) in numsTypeList.withIndex()){
+                        if(ss == name){
+                            vm.unit_code=index.toString()
+                        }
+                    }
+
                 }
             })
         }
@@ -306,10 +312,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
         var nums = binding.etSingCarNums.text.toString().trim()
 
-        if (TextUtils.isEmpty(vm.unit.value)) {
-            toast("请输入单车运量数量")
-            return
-        }
+
         var price = binding.etSingCarPrice.text.toString().trim()
         var total = binding.etSingCarTotal.text.toString().trim()
         if (TextUtils.isEmpty(total)) {
@@ -324,7 +327,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
         var address_in = binding.viewEnter.getEtDetailedAddress()!!.text.toString().trim()
 
         var receiveBean = ReceiveBean(lat_in, lng_in, province_in, city_in, area_in, address_in, name_in, mobile_in, time_in, "1",
-                goods_name, goods_type_code, nums, vm.unit.value!!, price, total, "", "", ""
+                goods_name, goods_type_code, nums,  vm.unit_code,vm.unit.value!!, price, total, "", "", ""
         )
 
         if (is_agree == 0) {
@@ -766,6 +769,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
                 //单车运量
                 binding.etSingCarNums.setText(order.receive[0].nums)
                 vm.unit.value = order.receive[0].nums_type.name
+                vm.unit_code= order.receive[0].nums_type.code
                 //单价
                 binding.etSingCarPrice.setText(order.receive[0].price)
                 //总价

app/src/main/java/com/quansu/heifengwuliu/model/bean/ReceiveBean.kt

@@ -14,6 +14,7 @@ data class ReceiveBean (var lat: String, var lng: String, var province: String,
                         var area:String, var address:String, var name:String, var mobile:String,
                         var time:String,var type:String,
                         var goods:String,var goods_type:String,var nums:String,
-                        var nums_type:String,var price:String,var total:String,
+                        var nums_type:String,var nums_type_name:String,
+                        var price:String,var total:String,
                         var pca:String,var goods_type_name:String,var city_name:String): IModel {
 }

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

@@ -19,6 +19,7 @@ import com.ysnows.base.utils.UiSwitch
 open class OwnerSingleVModel(application: Application) : BViewModel<BRepository>(application) {
 
     var unit: MutableLiveData<String> = MutableLiveData(unitValues)
+    var unit_code:String=""
     var goodstype: MutableLiveData<String> = MutableLiveData()
 
     var insurance: MutableLiveData<String> = MutableLiveData()
@@ -32,6 +33,7 @@ open class OwnerSingleVModel(application: Application) : BViewModel<BRepository>
     val isDialogShow:MutableLiveData<Boolean> = MutableLiveData()
 
 
+
     companion object {
 
         const val isPushValue = 1

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

@@ -370,6 +370,7 @@
             </ScrollView>
 
             <FrameLayout
+                android:id="@+id/fl_publish"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
@@ -383,7 +384,6 @@
                     android:src="@drawable/ic_details_grab" />
 
                 <TextView
-                    android:id="@+id/tv_publish"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"

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

@@ -408,7 +408,7 @@
                         android:textColor="#636465"
                         android:textSize="13sp"
                         android:textColorHint="#BBBBBB"
-                        android:text="@{item.nums_type}"
+                        android:text="@{item.nums_type_name}"
                         android:hint="单位"
                         tools:text="黄色" />