1.删除地址。

app/build.gradle

@@ -122,4 +122,10 @@ dependencies {
 
     //微信sdk
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+    //侧滑删除
+//    implementation 'com.github.mcxtzhang:SwipeDelMenuLayout:V1.2.5'
+     //时间选择器
+    implementation 'com.contrarywind:Android-PickerView:4.1.9'
+
+
 }

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

@@ -20,6 +20,7 @@ import com.ysnows.base.route.IGaode
 import com.ysnows.base.utils.UiSwitch
 
 /**
+ * 添加收货/卸货地址
  *Created by shihuiyun
  *on 2020/9/11
  */
@@ -27,14 +28,7 @@ class AddressAddActivity : MBActivity<AddressAddVModel, ActivityAddressaddBindin
 
 
     var type = "0"//0发货 1卸货
-    var province_code = ""
-    var city_code = ""
-    var area_code = ""
     var addr_id="0"
-    var lat=""
-    var lng=""
-    var is_default=1//默认为1
-
 
     override fun vmClass(): Class<AddressAddVModel> {
         return AddressAddVModel::class.java
@@ -43,98 +37,33 @@ class AddressAddActivity : MBActivity<AddressAddVModel, ActivityAddressaddBindin
     override fun __before() {
         super.__before()
         var bundle = intent.extras
-        if (null != bundle) type = bundle.getString("type")
+        if (null != bundle)
+            type = bundle.getString("type","")
+           addr_id=bundle.getString("addr_id","")
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-    }
 
-    override fun listeners() {
-        super.listeners()
-        binding.llPosition.setOnClickListener {
-            UiSwitch.singleRes(this, AreaSelectActivity::class.java,
-                    MIntentAction.REQUEST_CODE_TWO)
-        }
-        binding.llChoseMap.setOnClickListener {
-            //地图
-            choseMap()
-        }
-        binding.imgDefault.setOnClickListener {
-
-            if(is_default==1){
-                binding.imgDefault.setImageResource(R.drawable.ic_default_off)
-                is_default=0
-            }else{
-                binding.imgDefault.setImageResource(R.drawable.ic_default_on)
-                is_default=1
+        if(!TextUtils.isEmpty(addr_id)&&addr_id!="0"){
+            vm.getAddressInfo(addr_id)
+            titleBar()?.setRightText("删除")
+            titleBar()?.tvRight!!.setOnClickListener {
+                //删除
+                vm.setAddressDel(addr_id)
             }
-
-        }
-
-
-        binding.llSave.setOnClickListener {
-            //添加地址
-            if (TextUtils.isEmpty(binding.etName.text.toString().trim { it <= ' ' })) {
-                toast("请输入联系人")
-                return@setOnClickListener
-            }
-
-            if (TextUtils.isEmpty(binding.etTel.text.toString().trim { it <= ' ' })) {
-                toast("请输入手机号码")
-                return@setOnClickListener
-            }
-            if(TextUtils.isEmpty(province_code)){
-                toast("请选择地区")
-                return@setOnClickListener
-            }
-
-            if (TextUtils.isEmpty(binding.etDetailsAddress.text.toString().trim { it <= ' ' })) {
-                toast("请输入详细地址")
-                return@setOnClickListener
-            }
-
-            vm.setAdd(addr_id,lat,lng,province_code,city_code,area_code,
-                    binding.etDetailsAddress.text.toString(),binding.etName.text.toString(),
-                    binding.etTel.text.toString(),type,is_default.toString())
-
-
-
         }
     }
 
-    private fun choseMap() {
-
-        AndPermission.with(this)
-                .runtime()
-                .permission(Permission.ACCESS_COARSE_LOCATION,
-                        Permission.ACCESS_FINE_LOCATION,
-                        Permission.WRITE_EXTERNAL_STORAGE,
-                        Permission.READ_EXTERNAL_STORAGE,
-                        Permission.READ_PHONE_STATE
-                )
-                .onGranted { data ->
-                    CCRetrofit.instance()
-                            .with(this)
-                            .create(IGaode::class.java)
-                            .selectLocation()
-                            .subscribe()
-
-                }
-                .start()
-
-    }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (MIntentAction.REQUEST_CODE_TWO === requestCode && resultCode == Activity.RESULT_OK) {
             val bundle = data!!.extras
             if (null != bundle) {
-                var name = bundle.getString("name")
-                province_code = bundle.getString("province_code")
-                city_code = bundle.getString("city_code")
-                area_code = bundle.getString("area_code")
-                binding.tvPosition.text = name
+
+                vm.setCityValue(bundle.getString("province_code"),bundle.getString("city_code"),
+                        bundle.getString("area_code"),bundle.getString("name"))
 
             }
 
@@ -161,9 +90,9 @@ class AddressAddActivity : MBActivity<AddressAddVModel, ActivityAddressaddBindin
     fun getPosition(bean: PositionBean) {
 
 //        var provincename = bean.provincename
-        lat = bean.latitude
-        lng = bean.longitude
-        binding.etDetailsAddress.setText(bean.position)
+
+        vm.setMapValue(bean.latitude,bean.longitude,bean.position)
+
 
     }
 }

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

@@ -39,9 +39,6 @@ class SettingsActivity : MBActivity<SettingsVModel, ActivitySettingsBinding>() {
 
 
 
-
-
-
         binding.btnLogout.onClick {
             message(R.string.enture_logout, negativeEnable = true, positiveAction = { dialog, _ ->
                 MMKVManager.instance().clearAll()
@@ -95,4 +92,4 @@ class SettingsActivity : MBActivity<SettingsVModel, ActivitySettingsBinding>() {
     }
 
 
-}
+}

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

@@ -21,10 +21,11 @@ import com.quansu.heifengwuliu.base.MBFragment
 import com.quansu.heifengwuliu.config.ConfigRx
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.FragmentOwnersingleBinding
+import com.quansu.heifengwuliu.inte.ChoiceData
+import com.quansu.heifengwuliu.utils.PopupUtils
+import com.quansu.heifengwuliu.vmodel.OwnerSingleVModel
 import com.yanzhenjie.permission.AndPermission
 import com.yanzhenjie.permission.runtime.Permission
-import com.ysnows.base.base.BRepository
-import com.ysnows.base.base.BViewModel
 import com.ysnows.base.ccretrofit.CCRetrofit
 import com.ysnows.base.model.PositionBean
 import com.ysnows.base.route.IGaode
@@ -36,7 +37,7 @@ import com.ysnows.base.utils.UiSwitch
  *Created by shihuiyun
  *on 2020/9/11
  */
-class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersingleBinding>() {
+class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBinding>() {
     var cats = emptyArray<String>()
     private var type = 1// 1:/装货 2卸货
 
@@ -48,6 +49,17 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         initTab()
         initData()
     }
+    override fun vmClass(): Class<OwnerSingleVModel> {
+        return OwnerSingleVModel::class.java
+    }
+
+    override fun listeners() {
+        super.listeners()
+        binding.tvPublish.setOnClickListener {
+            //发布
+
+        }
+    }
 
 
     private fun initTab() {
@@ -169,6 +181,22 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
             UiSwitch.singleRes(this, AreaSelectActivity::class.java,
                     MIntentAction.REQUEST_CODE_TWO)
         }
+        binding.viewEnter.tvChoseTime.setOnClickListener {
+            //选择时间
+            PopupUtils.setChoseTime(context, binding.viewEnter.tvChoseTime, object : ChoiceData {
+                override fun onRestuse(id: String?) {
+
+                }
+            })
+        }
+
+        binding.viewOut.tvChoseTime.setOnClickListener {
+            PopupUtils.setChoseTime(context, binding.viewOut.tvChoseTime, object : ChoiceData {
+                override fun onRestuse(id: String?) {
+
+                }
+            })
+        }
 
 
     }

app/src/main/java/com/quansu/heifengwuliu/inte/ChoiceData.kt

@@ -0,0 +1,10 @@
+package com.quansu.heifengwuliu.inte
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/13
+ */
+interface ChoiceData {
+    fun onRestuse(id: String?)
+
+}

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

@@ -0,0 +1,30 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/11
+ */
+ class AddressDetailsBean : IModel {
+    var py: String? = null
+    var name: String? = null
+    var mobile: String? = null
+    var address: String? = null
+    var lat: String = ""
+    var lng: String = ""
+
+    var province: String = ""
+    var city: String = ""
+    var area: String = ""
+    var type: String = ""
+
+    var is_default: Int=1;
+
+
+
+
+
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/utils/PopupUtils.java

@@ -0,0 +1,49 @@
+package com.quansu.heifengwuliu.utils;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.bigkoo.pickerview.builder.TimePickerBuilder;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.bigkoo.pickerview.view.TimePickerView;
+import com.quansu.heifengwuliu.inte.ChoiceData;
+import com.ysnows.base.utils.TimeUtil;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Created by shihuiyun
+ * on 2020/9/13
+ */
+public class PopupUtils {
+
+    /**
+     * 有回调
+     * 选择时间
+     */
+    public static void setChoseTime(Context context, TextView tv, ChoiceData choiceData) {
+        Calendar startDate = Calendar.getInstance();
+        startDate.set(1980, 0, 23);
+
+        Calendar endDate = Calendar.getInstance();
+
+        TimePickerView timePickerView = new TimePickerBuilder(context, new OnTimeSelectListener() {
+            @Override
+            public void onTimeSelect(Date date, View v) {
+                tv.setText(TimeUtil.getTime(date));
+                if(null!=choiceData){
+                    choiceData.onRestuse(TimeUtil.getTime(date));
+                }
+
+            }
+        }).setRangDate(startDate, endDate)
+                .setDate(endDate)
+                .setType(new boolean[]{true, true, true, false, false, false})
+                .build();
+
+        timePickerView.setDate(Calendar.getInstance());
+        timePickerView.show();
+    }
+}

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

@@ -168,4 +168,22 @@ interface ApiService {
                     @Field("is_default") is_default: String?): Observable<Response<Any>>
 
 
+
+    /**
+     * 获取详情-地址
+     * @return
+     */
+    @GET("api/address/addressGet")
+    fun getAddress(@Query("addr_id") addr_id: String?): Observable<Response<AddressDetailsBean>>
+
+
+
+    /**
+     * 删除-地址
+     * @return
+     */
+    @GET("api/address/addressDel")
+    fun setAddressDel(@Query("addr_id") addr_id: String?): Observable<Response<Any>>
+
+
 }

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

@@ -3,30 +3,194 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Activity
 import android.content.Intent
+import android.text.TextUtils
+import android.util.Log
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.activity.AddressAddActivity
+import com.quansu.heifengwuliu.activity.AreaSelectActivity
+import com.quansu.heifengwuliu.config.MIntentAction
+import com.quansu.heifengwuliu.model.AddressDetailsBean
 import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.yanzhenjie.permission.AndPermission
+import com.yanzhenjie.permission.runtime.Permission
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.ccretrofit.CCRetrofit
+import com.ysnows.base.route.IGaode
+import com.ysnows.base.utils.UiSwitch
 
 open class AddressAddVModel : BViewModel<BRepository>() {
 
+    var checked: MutableLiveData<Int> = MutableLiveData()
+    var cityname: MutableLiveData<String> = MutableLiveData()
 
-    fun setAdd( addr_id:String,lat:String,lng:String,province:String,
-                city:String,area:String,address:String,
-                name:String,mobile:String,type:String,
-                is_default:String){
-        repository().lreq(NetEngine.service.addressEdit(addr_id,lat,lng,province,city,area,address,
-                name, mobile,type,is_default))
+    var lat = ""
+    var lng = ""
+    var province = ""
+    var city = ""
+    var area = ""
+    var type = "0"//默认发货
+    var addr_id="0"////默认添加
+
+    init {
+        checked.value = 1//默认选中
+
+    }
+
+    fun setMapValue(lat_data: String, lng_data: String, position: String) {
+        lat = lat_data
+        lng = lng_data
+        address = position
+    }
+
+    fun setCityValue(province_code: String, city_code: String, area_code: String, name: String) {
+        province = province_code
+        city = city_code
+        area = area_code
+        cityname.value = name
+
+    }
+
+
+    @Bindable
+    open var name: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.name)
+        }
+
+    @Bindable
+    open var phone: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.phone)
+        }
+
+    @Bindable
+    open var address: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.address)
+        }
+
+
+    fun choseMap() {
+        //地图选点
+        AndPermission.with(repository().context)
+                .runtime()
+                .permission(Permission.ACCESS_COARSE_LOCATION,
+                        Permission.ACCESS_FINE_LOCATION,
+                        Permission.WRITE_EXTERNAL_STORAGE,
+                        Permission.READ_EXTERNAL_STORAGE,
+                        Permission.READ_PHONE_STATE
+                )
+                .onGranted { data ->
+                    CCRetrofit.instance()
+                            .with(repository().context)
+                            .create(IGaode::class.java)
+                            .selectLocation()
+                            .subscribe()
+
+                }
+                .start()
+
+
+    }
+
+
+    fun choseCity() {
+        //选择省市区
+        UiSwitch.singleRes(repository().context as AddressAddActivity, AreaSelectActivity::class.java,
+                MIntentAction.REQUEST_CODE_TWO)
+    }
+
+
+    fun setSave() {
+        //保存数据
+        Log.e("-shy-", "name=: " +name)
+        Log.e("-shy-", "phone=: " +phone)
+
+
+        if (name.isNullOrEmpty()) {
+            toast("请输入联系人")
+            return
+        }
+        if (phone.isNullOrEmpty()) {
+
+            toast("请输入手机号码")
+            return
+        }
+        if (TextUtils.isEmpty(province)) {
+            toast("请选择地区")
+            return
+        }
+        if (address.isNullOrEmpty()) {
+            toast("请输入详细地址")
+            return
+        }
+
+        repository().lreq(NetEngine.service.addressEdit(addr_id, lat, lng, province, city, area, address,
+                name, phone, type, checked.value.toString()))
                 .doOnNext() { res ->
                     if (res.ok(true)) {
                         val intent = Intent()
-                        var con= repository().context as Activity
+                        var con = repository().context as Activity
                         con.setResult(Activity.RESULT_OK, intent)
                         con.finish()
                     }
                 }
                 .subscribe()
+
+
+
+    }
+
+
+    fun choseDefault() {
+        //选择默认
+        if (checked.value == 1) checked.value = 0 else checked.value = 1
+
+    }
+
+
+    //获取地址详情
+    fun getAddressInfo(addr_id: String) {
+
+        this.addr_id=addr_id
+        repository().lreq(NetEngine.service.getAddress(addr_id))
+                .doOnNext() {
+                    if (it.ok()) {
+                        var info=it.data() as AddressDetailsBean
+                        //设置值
+                        name=info.name
+                        phone=info.mobile
+                        address=info.address
+                        lat=info.lat
+                        lng=info.lng
+                        province=info.province
+                        city=info.city
+                        area=info.area
+                        type=info.type
+                        checked.value=info.is_default
+
+                    }
+                }
     }
 
+    fun setAddressDel(addr_id: String) {
+        //删除
+        repository().lreq(NetEngine.service.setAddressDel(addr_id))
+                .doOnNext() {
+                    if (it.ok()) {
+                        val intent = Intent()
+                        var con = repository().context as Activity
+                        con.setResult(Activity.RESULT_OK, intent)
+                        con.finish()
+                    }
+                }
+    }
 
 
 }

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

@@ -0,0 +1,39 @@
+package com.quansu.heifengwuliu.vmodel
+
+
+import androidx.lifecycle.MutableLiveData
+import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+open class OwnerSingleVModel : BViewModel<BRepository>() {
+
+    var unit: MutableLiveData<String> = MutableLiveData()
+
+
+    fun choseUnits() {
+        //选择单车运量
+
+        QMUIBottomSheet.BottomListSheetBuilder(repository().context)
+                .addItem("吨")
+                .addItem("方")
+                .addItem("件")
+                .setOnSheetItemClickListener { dialog, itemView, position, tag ->
+
+                    when(position){
+                        0->unit.value="吨"
+                        1->unit.value="方"
+                        2->unit.value="件"
+                        else ->unit.value=""
+                    }
+                    dialog.dismiss()
+
+                }
+                .build()
+                .show()
+
+
+    }
+
+
+}

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

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
-
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.AddressAddVModel" />
     </data >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:orientation="vertical"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_height="match_parent">
 
         <LinearLayout
@@ -44,21 +46,15 @@
                     android:textSize="16sp"></TextView>
 
 
-                <EditText
+                <com.ysnows.base.widget.DelEditText
                     android:id="@+id/et_name"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="36dp"
                     android:layout_marginStart="21dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/bg_order_scnner"
-                    android:gravity="center_vertical"
-                    android:hint="请输入"
-                    android:paddingStart="11dp"
-                    android:textColor="#2F2F31"
-                    android:textColorHint="#929390"
-                    android:textSize="14sp">
-
-                </EditText>
+                    android:background="@null"
+                    android:hint="@string/please_input_user_name"
+                    android:text="@={vm.name}"
+                    android:textSize="@dimen/sp_15" />
 
 
             </LinearLayout>
@@ -93,22 +89,18 @@
                     android:textColor="#FB6D4C"
                     android:textSize="16sp"></TextView>
 
-                <EditText
+
+                <com.ysnows.base.widget.DelEditText
                     android:id="@+id/et_tel"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="36dp"
                     android:layout_marginStart="21dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/bg_order_scnner"
-                    android:gravity="center_vertical"
-                    android:hint="请输入"
-                    android:inputType="phone"
-                    android:paddingStart="11dp"
-                    android:textColor="#2F2F31"
-                    android:textColorHint="#929390"
-                    android:textSize="14sp">
+                    android:background="@null"
+                    android:hint="@string/please_input_user_phone"
+                    android:text="@={vm.phone}"
+                    android:textSize="@dimen/sp_15" />
+
 
-                </EditText>
 
 
             </LinearLayout>
@@ -126,6 +118,7 @@
                 android:id="@+id/ll_position"
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
+                android:onClick="@{v->vm.choseCity()}"
                 android:gravity="center_vertical"
                >
 
@@ -149,6 +142,7 @@
                     android:ellipsize="middle"
                     android:gravity="right"
                     android:hint="请选择位置"
+                    android:text="@{vm.cityname}"
                     android:singleLine="true"
                     android:textColor="#2F2F31"
                     android:textColorHint="#929390"
@@ -201,6 +195,7 @@
                         android:id="@+id/ll_chose_map"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:onClick="@{v->vm.choseMap()}"
                         android:gravity="center_vertical">
 
                         <TextView
@@ -223,8 +218,7 @@
 
 
 
-
-                <EditText
+                <com.ysnows.base.widget.DelEditText
                     android:id="@+id/et_details_address"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -232,12 +226,13 @@
                     android:background="@drawable/bg_order_scnner"
                     android:gravity="center_vertical"
                     android:hint="街道门牌信息"
+                    android:text="@{vm.address}"
                     android:paddingStart="11dp"
                     android:textColor="#2F2F31"
                     android:textColorHint="#929390"
                     android:layout_marginTop="10dp"
-                    android:textSize="14sp">
-                </EditText>
+                    android:textSize="@dimen/sp_15" />
+
 
 
 
@@ -269,9 +264,10 @@
                 <ImageView
                     android:id="@+id/img_default"
                     android:layout_width="40dp"
-                    android:layout_height="28dp"
+                    android:layout_height="match_parent"
                     android:layout_marginLeft="18dp"
-                    android:src="@drawable/ic_default_on">
+                    android:onClick="@{v->vm.choseDefault()}"
+                    android:src="@{vm.checked==1?@drawable/ic_default_on:@drawable/ic_default_off,default=@drawable/ic_default_on}">
 
                 </ImageView>
 
@@ -286,6 +282,7 @@
                 android:layout_marginBottom="20dp"
                 android:layout_marginTop="@dimen/dp_40"
                 android:layout_marginEnd="10dp"
+                android:onClick="@{v->vm.setSave()}"
                 android:orientation="horizontal"
                 android:gravity="center"
                 app:qmui_backgroundColor="#5D76F4"

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

@@ -134,8 +134,7 @@
                 android:paddingBottom="@dimen/dp_4"
                 android:text="@{vm.codeTip,default=@string/get_sms_code}"
                 android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/sp_12"
-                 />
+                android:textSize="@dimen/sp_12" />
         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout

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

@@ -5,6 +5,10 @@
 
     <data>
 
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.OwnerSingleVModel" />
+
     </data>
 
     <LinearLayout
@@ -85,8 +89,6 @@
                 </LinearLayout>
 
 
-
-
                 <com.quansu.heifengwuliu.widget.AddressItemView
                     android:id="@+id/view_out"
                     android:layout_width="match_parent"
@@ -214,23 +216,32 @@
                             android:gravity="center_vertical|right"
                             android:hint="请输入单车运输数量"
                             android:textColor="#101010"
+                            android:text="@{vm.unit}"
                             android:textColorHint="#BBBBBB"
                             android:textSize="@dimen/sp_15"></EditText>
 
-                        <TextView
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_10"
-                            android:layout_marginEnd="@dimen/dp_10"
-                            android:hint="请选择单位"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></TextView>
-
-                        <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
-
+                            android:onClick="@{v->vm.choseUnits()}"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="@dimen/dp_10"
+                                android:layout_marginEnd="@dimen/dp_10"
+                                android:hint="请选择单位"
+                                android:textColor="#101010"
+                                android:textColorHint="#BBBBBB"
+                                android:textSize="@dimen/sp_15"></TextView>
+
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:src="@drawable/mine_right" />
+                        </LinearLayout>
 
                     </LinearLayout>
 
@@ -552,6 +563,7 @@
                     </LinearLayout>
 
                     <TextView
+                        android:id="@+id/tv_publish"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
                         android:background="#5D76F4"

base/build.gradle

@@ -43,11 +43,8 @@ dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.billy.android:cc:2.1.5'
 
-    debugImplementation('com.github.ChuckerTeam.Chucker:library:3.2.0') {
-        exclude group: 'com.android.support', module: 'support-v4'
-    }
-    releaseImplementation('com.github.ChuckerTeam.Chucker:library-no-op:3.2.0') {
-        exclude group: 'com.android.support', module: 'support-v4'
-    }
+    debugImplementation 'com.github.ChuckerTeam.Chucker:library:3.2.0'
+    releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.2.0'
+
 
 }