1.添加地址。

app/src/main/AndroidManifest.xml

@@ -85,6 +85,7 @@
         <activity android:name=".activity.ComVerityActivity" />
         <activity android:name=".activity.CollectionActivity" />
         <activity android:name=".activity.AddressAddActivity"/>
+        <activity android:name=".activity.AreaSelectActivity"/>
 
     </application >
 

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

@@ -1,30 +1,169 @@
 package com.quansu.heifengwuliu.activity
 
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import com.hwangjr.rxbus.annotation.Subscribe
+import com.hwangjr.rxbus.annotation.Tag
+import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.config.ConfigRx
+import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivityAddressaddBinding
-import com.ysnows.base.base.BRepository
-import com.ysnows.base.base.BViewModel
+import com.quansu.heifengwuliu.vmodel.AddressAddVModel
+import com.yanzhenjie.permission.AndPermission
+import com.yanzhenjie.permission.runtime.Permission
+import com.ysnows.base.ccretrofit.CCRetrofit
+import com.ysnows.base.model.PositionBean
+import com.ysnows.base.route.IGaode
+import com.ysnows.base.utils.UiSwitch
 
 /**
  *Created by shihuiyun
  *on 2020/9/11
  */
-class AddressAddActivity : MBActivity<BViewModel<BRepository>, ActivityAddressaddBinding>(){
+class AddressAddActivity : MBActivity<AddressAddVModel, ActivityAddressaddBinding>() {
 
 
-    var type="0"//0发货 1卸货
+    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
+    }
+
     override fun __before() {
         super.__before()
-        var bundle=intent.extras
-        if(null!=bundle) type=bundle.getString("type")
+        var bundle = intent.extras
+        if (null != bundle) type = bundle.getString("type")
+    }
+
+    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
+            }
+
+        }
+
+
+        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
+
+            }
+
+
+        }
+
+
+    }
+
+
     override fun binding(): ActivityAddressaddBinding {
         return ActivityAddressaddBinding.inflate(layoutInflater)
 
     }
 
+    override val isRxbus: Boolean
+        get() = true
+
     override fun title(): String? {
-        return if(type=="0") "添加发货地址" else "添加卸货地址"
+        return if (type == "0") "添加发货地址" else "添加卸货地址"
+    }
+
+    @Subscribe(tags = [Tag(ConfigRx.ADD_POSITION)])
+    fun getPosition(bean: PositionBean) {
+
+//        var provincename = bean.provincename
+        lat = bean.latitude
+        lng = bean.longitude
+        binding.etDetailsAddress.setText(bean.position)
+
     }
 }

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

@@ -0,0 +1,112 @@
+package com.quansu.heifengwuliu.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.adapter.AreaSelectAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityAreaselectBinding
+import com.quansu.heifengwuliu.model.AreaBean
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.quansu.heifengwuliu.vmodel.AreaSelectVModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+//城市选择
+class AreaSelectActivity : MBRActivity<AreaSelectVModel, AreaSelectAdapter, ActivityAreaselectBinding>() {
+
+    var code="0"//默认市
+    var type=1
+    var name=""
+    var province_code=""//省的编码
+    var city_code=""//市的编码
+    var area_code=""//区的编码
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        adapter().setOnItemClickListener { adapter, view, position ->
+            var bean=adapter.getItem(position) as AreaBean
+
+            if(type==1){
+                code=bean.code
+                province_code=bean.code
+                name=bean.name
+                type++
+                onRefresh()
+                return@setOnItemClickListener
+            }
+            if(type==2){
+                code=bean.code
+                city_code=bean.code
+                name += bean.name
+                type++
+
+                onRefresh()
+                return@setOnItemClickListener
+            }
+            if(type==3){
+                area_code=bean.code
+                name += bean.name
+
+                val intent = Intent()
+                val bundle = Bundle()
+                bundle.putString("name", name)
+                bundle.putString("province_code", province_code)
+                bundle.putString("city_code", city_code)
+                bundle.putString("area_code", area_code)
+                intent.putExtras(bundle)
+                setResult(Activity.RESULT_OK, intent)
+                finish()
+
+                return@setOnItemClickListener
+            }
+
+        }
+    }
+
+
+    override fun title(): String {
+        return getStr(R.string.chose_city)!!
+    }
+
+    override fun initAdapter(): AreaSelectAdapter = AreaSelectAdapter(vm)
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.getArea(code, vm?.repository()?.autoPage()!!)
+    }
+
+    override fun binding(): ActivityAreaselectBinding {
+        return ActivityAreaselectBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<AreaSelectVModel> {
+        return AreaSelectVModel::class.java
+    }
+
+    override fun needLoadMore(): Boolean {
+        return false
+    }
+
+    override fun onListReceive(res: IResponse<*>) {
+        super.onListReceive(res)
+        if(res.empty()&&type>1){
+            val intent = Intent()
+            val bundle = Bundle()
+            bundle.putString("name", name)
+            bundle.putString("province_code", province_code)
+            bundle.putString("city_code", city_code)
+            bundle.putString("area_code", area_code)
+            intent.putExtras(bundle)
+            setResult(Activity.RESULT_OK, intent)
+            finish()
+        }
+    }
+
+
+
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/adapter/AreaSelectAdapter.java

@@ -0,0 +1,28 @@
+package com.quansu.heifengwuliu.adapter;
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder;
+import com.quansu.heifengwuliu.R;
+import com.quansu.heifengwuliu.databinding.ItemAreaselectBinding;
+import com.quansu.heifengwuliu.model.AreaBean;
+import com.quansu.heifengwuliu.vmodel.AreaSelectVModel;
+import com.ysnows.base.base.BAdapter;
+
+import org.jetbrains.annotations.NotNull;
+
+public class AreaSelectAdapter extends BAdapter<AreaBean, BaseDataBindingHolder<ItemAreaselectBinding>> {
+
+    private AreaSelectVModel vm;
+
+    public AreaSelectAdapter(AreaSelectVModel vm) {
+        super(R.layout.item_areaselect, null);
+        this.vm = vm;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseDataBindingHolder<ItemAreaselectBinding> helper, AreaBean todo) {
+        ItemAreaselectBinding binding = helper.getDataBinding();
+        binding.setItem(todo);
+        binding.setVm(vm);
+
+    }
+}

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

@@ -3,5 +3,7 @@ package com.quansu.heifengwuliu.config
 object MIntentAction {
     const val ACTION_UPDATE_APP_WIDGET: String = "action_update_app_widget"
     const val REQUEST_CODE_ONE = 10086
+    const val REQUEST_CODE_TWO = 10087
+
 
 }

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

@@ -1,9 +1,10 @@
 package com.quansu.heifengwuliu.fragment
 
+import android.app.Activity
+import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
@@ -14,6 +15,7 @@ import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import com.quansu.heifengwuliu.activity.AddressActivity
+import com.quansu.heifengwuliu.activity.AreaSelectActivity
 import com.quansu.heifengwuliu.adapter.BaseFragmentPagerAdapter
 import com.quansu.heifengwuliu.base.MBFragment
 import com.quansu.heifengwuliu.config.ConfigRx
@@ -36,7 +38,7 @@ import com.ysnows.base.utils.UiSwitch
  */
 class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersingleBinding>() {
     var cats = emptyArray<String>()
-    private var type = 1
+    private var type = 1// 1:/装货 2卸货
 
     private var selectViewpage = 0
 
@@ -47,6 +49,7 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         initData()
     }
 
+
     private fun initTab() {
 
         cats = arrayOf("1", "2", "3", "4", "5", "6", "11", "23", "18", "30", "33", "100", "101", "1003")
@@ -93,44 +96,6 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         tabs.forEach {
             binding.tabs.addTab(it)
         }
-//        binding.tabs.addOnTabSelectedListener(object : QMUITabSegment.OnTabSelectedListener {
-//            //mTabSegment选项被选中的监听
-//            /**
-//             * 当某个 Tab 被选中时会触发
-//             *
-//             * @param index 被选中的 Tab 下标
-//             */
-//            override fun onTabSelected(index: Int) {
-//                outtabs=index
-//            }
-//
-//            /**
-//             * 当某个 Tab 被取消选中时会触发
-//             *
-//             * @param index 被取消选中的 Tab 下标
-//             */
-//            override fun onTabUnselected(index: Int) {}
-//
-//            /**
-//             * 当某个 Tab 处于被选中状态下再次被点击时会触发
-//             *
-//             * @param index 被再次点击的 Tab 下标
-//             */
-//            override fun onTabReselected(index: Int) {
-//                outtabs=index
-//            }
-//
-//            /**
-//             * 当某个 Tab 被双击时会触发
-//             *
-//             * @param index 被双击的 Tab 下标
-//             */
-//            override fun onDoubleTap(index: Int) {
-//                outtabs=index
-//            }
-//        })
-
-
         binding.tabs.setupWithViewPager(binding.qmViewPager, false)
 
 
@@ -139,7 +104,7 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
 
             selectViewpage = binding.qmViewPager.currentItem
 
-            if(selectViewpage<cats.size-1){
+            if (selectViewpage < cats.size - 1) {
                 binding.qmViewPager.currentItem = selectViewpage + 1
             }
 
@@ -148,7 +113,7 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         binding.imgDown.setOnClickListener {
             toast("222")
             selectViewpage = binding.qmViewPager.currentItem
-            if(selectViewpage<cats.size-1){
+            if (selectViewpage < cats.size - 1) {
                 binding.qmViewPager.currentItem = selectViewpage + 1
             }
 
@@ -159,7 +124,7 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
         binding.imgUp.setOnClickListener {
             selectViewpage = binding.qmViewPager.currentItem
 
-            if(selectViewpage<cats.size-1&&selectViewpage>0){
+            if (selectViewpage < cats.size - 1 && selectViewpage > 0) {
                 binding.qmViewPager.currentItem = selectViewpage - 1
             }
         }
@@ -193,6 +158,42 @@ class OwnerSingleFragment : MBFragment<BViewModel<BRepository>, FragmentOwnersin
                     B.with().putString("type", "1").ok(), MIntentAction.REQUEST_CODE_ONE)
         }
 
+        binding.viewEnter.tvCity.setOnClickListener {
+
+            type = 2
+            UiSwitch.singleRes(this, AreaSelectActivity::class.java,
+                    MIntentAction.REQUEST_CODE_TWO)
+        }
+        binding.viewOut.tvCity.setOnClickListener {
+            type = 1
+            UiSwitch.singleRes(this, AreaSelectActivity::class.java,
+                    MIntentAction.REQUEST_CODE_TWO)
+        }
+
+
+    }
+
+
+    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")
+                var province_code=bundle.getString("province_code")
+                var city_code=bundle.getString("city_code")
+                var area_code=bundle.getString("area_code")
+                if(type==1){
+                    binding.viewOut.tvCity.text=name
+                }else{
+                    binding.viewEnter.tvCity.text=name
+                }
+
+            }
+
+
+        }
+
 
     }
 

app/src/main/java/com/quansu/heifengwuliu/model/AreaBean.java

@@ -0,0 +1,27 @@
+package com.quansu.heifengwuliu.model;
+
+import com.ysnows.base.model.DbModel;
+
+public class AreaBean extends DbModel {
+
+
+    /**
+     * id : 35
+     * pid : 0
+     * code : 130000
+     * name : 河北省
+     * type : 1
+     * create_time : 1583424000
+     * update_time : 1583424000
+     * delete_time : null
+     */
+
+    public String id;
+    public String pid;
+    public String code;
+    public String name;
+    public String type;
+    public String create_time;
+    public String update_time;
+    public String delete_time;
+}

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

@@ -142,7 +142,30 @@ interface ApiService {
      */
     @GET("api/address/addressList")
     fun addressList(@Query("type") type: String?,
-                    @Query("k") k: String,@Query("page") page: Int): Observable<Response<ArrayList<AddressBean>>>
+                    @Query("k") k: String, @Query("page") page: Int): Observable<Response<ArrayList<AddressBean>>>
+
+
+    /**
+     * 获取区域
+     * @return
+     */
+    @GET("api/common/getArea")
+    fun getArea(@Query("code") code: String?, @Query("page") page: Int): Observable<Response<ArrayList<AreaBean>>>
+
+
+    /**
+     * 添加编辑地址
+     *
+     * @return
+     */
+    @POST("api/address/addressEdit")
+    @FormUrlEncoded
+    fun addressEdit(@Field("addr_id") addr_id: String?, @Field("lat") lat: String?,
+                    @Field("lng") lng: String?, @Field("province") province: String?,
+                    @Field("city") city: String?, @Field("area") area: String?,
+                    @Field("address") address: String?, @Field("name") name: String?,
+                    @Field("mobile") mobile: String?, @Field("type") type: String?,
+                    @Field("is_default") is_default: String?): Observable<Response<Any>>
 
 
 }

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

@@ -0,0 +1,32 @@
+package com.quansu.heifengwuliu.vmodel
+
+
+import android.app.Activity
+import android.content.Intent
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+open class AddressAddVModel : BViewModel<BRepository>() {
+
+
+    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))
+                .doOnNext() { res ->
+                    if (res.ok(true)) {
+                        val intent = Intent()
+                        var con= repository().context as Activity
+                        con.setResult(Activity.RESULT_OK, intent)
+                        con.finish()
+                    }
+                }
+                .subscribe()
+    }
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.quansu.heifengwuliu.vmodel
+
+import com.quansu.heifengwuliu.model.Todo
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+
+class AreaSelectVModel : BRViewModel<BRRepository>() {
+    fun check(item: Todo, position: Int) {
+        repository()
+                .lreq(NetEngine.service.taskChecked(item.id))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        item.checked = if (item.checked == 1) 0 else 1
+                        view()?.adapter()?.notifyItemChanged(position)
+                    }
+                }
+                .subscribe()
+    }
+}

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

@@ -179,37 +179,69 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="详细地址"
+                        android:textColor="#000000"
+                        android:textSize="16sp">
+
+                    </TextView>
+
+                    <LinearLayout
+                        android:id="@+id/ll_chose_map"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginEnd="@dimen/dp_10"
+                            android:text="地图选点"
+                            android:textColor="#5E5C5C"
+                            android:textSize="@dimen/sp_15"></TextView>
+
+                        <ImageView
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:src="@drawable/map_address" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="详细地址"
-                    android:textColor="#000000"
-                    android:textSize="16sp">
 
-                </TextView>
 
 
                 <EditText
                     android:id="@+id/et_details_address"
-                    android:layout_width="0dp"
-                    android:layout_height="36dp"
-                    android:layout_marginStart="29dp"
-                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="36dp"
                     android:background="@drawable/bg_order_scnner"
                     android:gravity="center_vertical"
                     android:hint="街道门牌信息"
                     android:paddingStart="11dp"
                     android:textColor="#2F2F31"
                     android:textColorHint="#929390"
+                    android:layout_marginTop="10dp"
                     android:textSize="14sp">
-
                 </EditText>
 
 
+
+
             </LinearLayout>
 
             <View
@@ -247,7 +279,7 @@
 
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                android:id="@+id/ll_center"
+                android:id="@+id/ll_save"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginStart="10dp"
@@ -255,8 +287,6 @@
                 android:layout_marginTop="@dimen/dp_40"
                 android:layout_marginEnd="10dp"
                 android:orientation="horizontal"
-                android:paddingTop="15dp"
-                android:paddingBottom="20dp"
                 android:gravity="center"
                 app:qmui_backgroundColor="#5D76F4"
                 app:qmui_borderColor="#5D76F4"

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+
+    </data >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_areaselect" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
+    </LinearLayout >
+
+</layout >

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

@@ -456,7 +456,6 @@
                     <ImageView
                         android:layout_width="20dp"
                         android:layout_height="20dp"
-                        android:layout_marginStart="35dp"
                         android:layout_marginEnd="@dimen/dp_10"
                         android:src="@drawable/ic_math" />
 
@@ -492,7 +491,6 @@
                     <ImageView
                         android:layout_width="20dp"
                         android:layout_height="20dp"
-                        android:layout_marginStart="35dp"
                         android:layout_marginEnd="@dimen/dp_10"
                         android:src="@drawable/ic_math" />
 

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <data >
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.AreaSelectVModel" />
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.AreaBean" />
+
+    </data >
+
+    <LinearLayout
+        android:id="@+id/rl_todo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/dp_10"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_10" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_marginStart="@dimen/dp_20"
+            tools:text="1223"
+            android:text="@{item.name}"
+            android:textSize="@dimen/sp_16"
+            android:textColor="@color/text_title"
+            android:gravity="center_vertical"
+            android:layout_height="40dp">
+
+        </TextView>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/dp_20"
+            android:background="@color/llGray" />
+    </LinearLayout >
+</layout >

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

@@ -1,5 +1,6 @@
 <?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 >
 
@@ -8,7 +9,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:orientation="vertical">
@@ -103,7 +103,7 @@
 
                     <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_10"
                         android:layout_marginEnd="@dimen/dp_10"
                         android:text="地图选点"

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

@@ -445,4 +445,7 @@ Api 已达到使用限制
     <string name="source_information" >货源信息</string >
     <string name="filter" >筛选</string >
 
+    <string name="chose_city" >选择省份</string >
+
+
 </resources >

base/src/main/java/com/ysnows/base/base/BRActivity.kt

@@ -73,6 +73,7 @@ abstract class BRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out BaseV
 
 
     override fun loadMore() {
+
         vm.repository().reqList(api() as Observable<IResponse<Any?>>).subscribe()
     }
 
@@ -148,4 +149,6 @@ abstract class BRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out BaseV
 
     override fun adapter(): A = mAdapter
 
-}
+
+
+}