1.货源信息接口。

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

@@ -2,7 +2,9 @@ package com.quansu.heifengwuliu.activity
 
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Observer
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.databinding.ActivityHomeBinding
@@ -33,8 +35,14 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
             mIndex = savedInstanceState.getInt("currTabIndex")
         }
         super.initCreate(savedInstanceState)
-        initMainMenu()
-        binding.mainMenu.switchTab(0)
+
+        vm.user.observe(this, Observer {
+            initMainMenu(it.type)
+            binding.mainMenu.switchTab(0)
+
+        })
+
+
     }
 
     override fun vmClass(): Class<HomeVModel> {
@@ -50,39 +58,46 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
     }
 
 
-    private fun initMainMenu() {
-
-        // val oneFragment = IndexFragment()
-        val oneFragment = DeliverGoodsFragment()
-        val twoFragment = WayBillFragment()
-        val threeFragment = MineFragment()
-        val menuTabBuilder = binding.mainMenu.tabBuilder()
-                .setSelectColor(Color.parseColor("#2E4E71"))
-                .setNormalColor(Color.parseColor("#666666"))
-        val one = menuTabBuilder
-                .setFragment(oneFragment)
-                .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index))
-                .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index_focus))
-                .setText(getString(R.string.home))
-                .build(context())
-        val two = menuTabBuilder
-                .setFragment(twoFragment)
-                .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle))
-                .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle_focus))
-                .setText(getString(R.string.waybill))
-                .build(context())
-        val three = menuTabBuilder
-                .setFragment(threeFragment)
-                .setText(getString(R.string.my))
-                .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_tyre))
-                .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_tyre_focus))
-                .build(context())
-
-        binding.mainMenu
-                .addTab(one)
-                .addTab(two)
-                .addTab(three)
-                .rendor()
+    private fun initMainMenu(type:Int) {
+
+        if(type==1) {//1是司机 2是货主
+            // val oneFragment = IndexFragment()
+        }else {
+            Log.e("-shy-", "initMainMenu: ")
+
+            binding.mainMenu.clear()
+            val oneFragment = DeliverGoodsFragment()
+            val twoFragment = WayBillFragment()
+            val threeFragment = MineFragment()
+            val menuTabBuilder = binding.mainMenu.tabBuilder()
+                    .setSelectColor(Color.parseColor("#2E4E71"))
+                    .setNormalColor(Color.parseColor("#666666"))
+            val one = menuTabBuilder
+                    .setFragment(oneFragment)
+                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index))
+                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_index_focus))
+                    .setText(getString(R.string.home))
+                    .build(context())
+            val two = menuTabBuilder
+                    .setFragment(twoFragment)
+                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle))
+                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_vehicle_focus))
+                    .setText(getString(R.string.source_information))
+                    .build(context())
+            val three = menuTabBuilder
+                    .setFragment(threeFragment)
+                    .setText(getString(R.string.my))
+                    .setNormalDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_tyre))
+                    .setSelectedDrawable(ContextCompat.getDrawable(context(), R.drawable.menu_tyre_focus))
+                    .build(context())
+
+            binding.mainMenu
+                    .addTab(one)
+                    .addTab(two)
+                    .addTab(three)
+                    .rendor()
+
+        }
     }
 
     override val isRxbus: Boolean

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

@@ -3,11 +3,14 @@ package com.quansu.heifengwuliu.adapter
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.ItemOrderBinding
+import com.quansu.heifengwuliu.model.InfoListBean
 import com.quansu.heifengwuliu.model.Order
+import com.quansu.heifengwuliu.vmodel.OrderListVModel
 import com.ysnows.base.base.BAdapter
 
-class OrderListAdapter : BAdapter<Order, BaseDataBindingHolder<ItemOrderBinding>>(R.layout.item_order) {
-    override fun convert(holder: BaseDataBindingHolder<ItemOrderBinding>, item: Order) {
+class OrderListAdapter(val vm: OrderListVModel) : BAdapter<InfoListBean, BaseDataBindingHolder<ItemOrderBinding>>(R.layout.item_order) {
+    override fun convert(holder: BaseDataBindingHolder<ItemOrderBinding>, item: InfoListBean) {
         holder.dataBinding?.item = item
+        holder.dataBinding?.vm=vm
     }
-}
+}

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

@@ -1,12 +1,12 @@
 package com.quansu.heifengwuliu.fragment
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.quansu.heifengwuliu.adapter.OrderListAdapter
 import com.quansu.heifengwuliu.base.MBRFragment
 import com.quansu.heifengwuliu.databinding.FragmentOrderListBinding
-import com.quansu.heifengwuliu.model.Order
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.quansu.heifengwuliu.vmodel.OrderListVModel
 import com.ysnows.base.net.IResponse
@@ -14,20 +14,30 @@ import io.reactivex.Observable
 
 class OrderListFragment : MBRFragment<OrderListVModel, OrderListAdapter, FragmentOrderListBinding>() {
 
+    var info_state:String=""
+
+    override fun __before(savedInstanceState: Bundle?) {
+        super.__before(savedInstanceState)
+        val arguments = arguments
+        if(null!=arguments) info_state=arguments.getString("info_state")
+
+        Log.e("-shy-", "info_state="+info_state )
+
+    }
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        adapter().setList(arrayListOf(Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1)
-        ))
+//        adapter().setList(arrayListOf(Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1), Order(1)
+//        ))
 
     }
 
     override fun initAdapter(): OrderListAdapter {
-        return OrderListAdapter()
+        return OrderListAdapter(vm)
     }
 
     override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.taskList("", vm.repository().autoPage())
+        return NetEngine.service.infoList(info_state, vm.repository().autoPage())
     }
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentOrderListBinding {
@@ -41,4 +51,4 @@ class OrderListFragment : MBRFragment<OrderListVModel, OrderListAdapter, Fragmen
     override fun vmClass(): Class<OrderListVModel> {
         return OrderListVModel::class.java
     }
-}
+}

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

@@ -1,7 +1,6 @@
 package com.quansu.heifengwuliu.fragment
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
@@ -15,12 +14,12 @@ import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.quansu.heifengwuliu.activity.AddressActivity
 import com.quansu.heifengwuliu.activity.AreaSelectActivity
-import com.quansu.heifengwuliu.activity.SourceDetailsActivity
 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.inte.ChoiceListData
 import com.quansu.heifengwuliu.model.AddressBean
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.model.bean.ReceiveBean
@@ -47,6 +46,8 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
     private var selectViewpage = 0
     var goodsTypeList = ArrayList<String>()
+    var goodsTypeCode = ArrayList<String>()
+
     var numsTypeList = ArrayList<String>()
 
     var insurance = ArrayList<String>()
@@ -72,6 +73,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
     var time_in: String = ""
 
     var info_id:String="0"
+    var goods_type_code="0"
 
 
 
@@ -81,7 +83,10 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
         vm.info.observe(this, Observer {
             //观察
-            goodsTypeList.addAll(it.goods_type)
+            for(item in it.goods_type){
+                goodsTypeList.add(item.name)
+                goodsTypeCode.add(item.code)
+            }
             numsTypeList.addAll(it.nums_type)
             initTab(it)
 
@@ -106,8 +111,8 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
         binding.llChoseUnits.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context(), binding.llChoseUnits, numsTypeList, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+            PopuListUtils.showQMUIPopup(context(), binding.llChoseUnits, numsTypeList,null, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
                     vm.unit.value = name
                 }
             })
@@ -115,17 +120,20 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
 
         binding.llGoodsType.setOnClickListener {
-            PopuListUtils.showQMUIPopup(context(), binding.llGoodsType, goodsTypeList, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+
+            PopuListUtils.showQMUIPopup(context(), binding.llGoodsType, goodsTypeList,goodsTypeCode, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
+                    goods_type_code=code!!
                     vm.goodstype.value = name
+
                 }
             })
         }
 
         binding.llIsInsurance.setOnClickListener {
 
-            PopuListUtils.showQMUIPopup(context(), binding.tvIsInsurance, insurance, object : ChoiceData {
-                override fun onRestuse(name: String?) {
+            PopuListUtils.showQMUIPopup(context(), binding.tvIsInsurance, insurance,null, object : ChoiceListData {
+                override fun onRestuse(code: String?,name: String?) {
                     vm.insurance.value = name
                     is_insurance = if (name.equals("是")) 1 else 0
 
@@ -265,7 +273,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, vm.goodstype.value.toString(), nums, vm.unit.value.toString(), price, total
+                goods_name, goods_type_code, nums, vm.unit.value.toString(), price, total
         )
 
         if (is_agree==0) {

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

@@ -11,6 +11,7 @@ import com.quansu.heifengwuliu.base.MBTabFragment
 import com.quansu.heifengwuliu.databinding.FragmentWaybillBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.B
 
 /**
  *Created by shihuiyun
@@ -37,6 +38,39 @@ class WayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWaybillBi
     }
 
     override fun getPageItem(position: Int): Fragment {
+        var ownerFragment = OrderListFragment()
+        when (position) {
+            0 -> {
+                ownerFragment.arguments = B().putString("info_state", "0").ok()
+                return ownerFragment
+            }
+            1 -> {
+                ownerFragment.arguments = B().putString("info_state", "20").ok()
+                return ownerFragment
+
+            }
+            2 -> {
+                ownerFragment.arguments = B().putString("info_state", "30").ok()
+                return ownerFragment
+
+            }
+            3 -> {
+                ownerFragment.arguments = B().putString("info_state", "40").ok()
+                return ownerFragment
+
+            }
+            4 -> {
+                var ownerFragment = OrderListFragment()
+                ownerFragment.arguments = B().putString("info_state", "100").ok()
+                return ownerFragment
+
+            }
+            else->{
+                ownerFragment.arguments = B().putString("info_state", "0").ok()
+                return ownerFragment
+            }
+
+        }
         return OrderListFragment()
     }
 
@@ -70,5 +104,4 @@ class WayBillFragment : MBTabFragment<BViewModel<BRepository>, FragmentWaybillBi
     }
 
 
-
 }

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

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

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

@@ -7,9 +7,14 @@ import com.ysnows.base.inter.IModel
  *on 2020/9/14
  * 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
  */
-data class DataInfoBean(var goods_type: List<String>, var nums_type: List<String>,
+data class DataInfoBean(var goods_type: List<GoodsTypeBean>, var nums_type: List<String>,
                         var car_type: List<CarTypeBean>, var order: OrderBean) : IModel {
 
+
+    data class GoodsTypeBean(var code: String, var name: String): IModel{
+
+    }
+
     data class CarTypeBean(var type_id: String, var type_name: String,
                            var type_icon: String, var type_img: String) : IModel {
 

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

@@ -0,0 +1,72 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/14
+ * 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
+ */
+data class InfoListBean(var info_id: String, var info_state: Int,
+                        var info_sn: String, var is_pay: String,
+                        var uid: String, var price: String,
+                        var total: String, var driver: String,
+                        var nums: String, var is_public: String,
+                        var is_insurance: String, var type: String,
+                        var data: String, var pay_time: String,
+                        var create_time: String, var update_time: String,
+                        var delete_time: String, var send: List<SendBean>,
+                        var receive: List<ReceiveBean>) : IModel {
+
+
+    data class ReceiveBean(var data_id: String, var info_id: String, var lat: String,
+                           var lng: String, var address: String, var name: String, var mobile: String, var goods: String,
+                           var goods_type: GoodsTypeBean, var nums: String, var nums_type: NumsTypeBean, var price: String, var total: String,
+                           var time: String, var type: String, var create_time: String, var update_time: String, var delete_time: String,
+                           var province: ProvinceBean, var city: CityBean, var area: AreaBean
+    ) : IModel {
+        data class ProvinceBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class CityBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class AreaBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class GoodsTypeBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class NumsTypeBean(var name: String, var code: String) : IModel {
+
+        }
+
+
+    }
+
+    data class SendBean(var data_id: String, var info_id: String, var lat: String,
+                        var lng: String, var address: String, var name: String, var mobile: String,
+                        var time: String, var type: String,
+                        var province: ProvinceBean, var city: CityBean, var area: AreaBean
+    ) : IModel {
+
+        data class ProvinceBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class CityBean(var name: String, var code: String) : IModel {
+
+        }
+
+        data class AreaBean(var name: String, var code: String) : IModel {
+
+        }
+
+    }
+
+
+}

app/src/main/java/com/quansu/heifengwuliu/utils/PopuListUtils.kt

@@ -10,6 +10,7 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopup
 import com.qmuiteam.qmui.widget.popup.QMUIPopups
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.inte.ChoiceData
+import com.quansu.heifengwuliu.inte.ChoiceListData
 
 /**
  *Created by shihuiyun
@@ -17,13 +18,19 @@ import com.quansu.heifengwuliu.inte.ChoiceData
  */
 object PopuListUtils{
 
-    fun showQMUIPopup(context:Context, view: View, data: ArrayList<String>, choseData: ChoiceData){
+
+
+    fun showQMUIPopup(context:Context, view: View, data: ArrayList<String>, code: ArrayList<String>?, choseData: ChoiceListData){
         var mNormalPopup: QMUIPopup? =null
         val adapter: ArrayAdapter<*> = ArrayAdapter<Any?>(context,  R.layout.simple_list_item, data as List<String>)
         val onItemClickListener = AdapterView.OnItemClickListener { adapterView, view, i, l ->
 
             if(null!=choseData) {
-                choseData.onRestuse(data[i])
+                if(null!=code) {
+                    choseData.onRestuse(code[i],data[i])
+                }else{
+                    choseData.onRestuse("",data[i])
+                }
             }
 
             mNormalPopup?.dismiss()
@@ -44,4 +51,6 @@ object PopuListUtils{
                 .show(view)
     }
 
+
+
 }

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

@@ -142,7 +142,7 @@ 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("p") p: Int): Observable<Response<ArrayList<AddressBean>>>
 
 
     /**
@@ -229,5 +229,13 @@ interface ApiService {
     @GET("api/info/infoCancel")
     fun infoCancel(@Query("info_id") info_id: String?): Observable<Response<Any>>
 
+    /**
+     * 货源列表
+     * @return
+     */
+    @GET("api/info/infoList")
+    fun infoList(@Query("info_state") info_state: String?, @Query("p") p: Int): Observable<Response<ArrayList<InfoListBean>>>
+
+
 
 }

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

@@ -1,11 +1,40 @@
 package com.quansu.heifengwuliu.vmodel
 
+import android.os.Bundle
+import com.quansu.heifengwuliu.activity.SourceDetailsActivity
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.utils.UiSwitch
 
 class OrderListVModel : BRViewModel<BRRepository>() {
 
-    override fun firstReq() {
+//    override fun firstReq() {
 //        super.firstReq()
+//    }
+
+
+
+    fun getOrderStatus(status:Int):String{
+        return when (status){
+            10-> "待支付"
+            20-> "待接单"
+            30-> "进行中"
+            40-> "已完成"
+            40-> "已取消"
+            else-> ""
+        }
+
+    }
+
+    fun gotoInfoDetails(info_id:String){
+        //到详情界面
+        UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
+            putString("info_id", info_id)
+            putString("type","0")
+        })
+
+
     }
-}
+
+
+}

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

@@ -3,10 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <data >
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.OrderListVModel" />
 
         <variable
             name="item"
-            type="com.quansu.heifengwuliu.model.Order" />
+            type="com.quansu.heifengwuliu.model.InfoListBean" />
 
     </data >
 
@@ -14,6 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/dp_10"
+        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
         app:qmui_borderColor="@color/gray_lite"
         app:qmui_borderWidth="@dimen/dp_1"
@@ -24,6 +28,7 @@
             android:layout_height="match_parent"
             android:paddingStart="@dimen/dp_10"
             android:paddingEnd="@dimen/dp_10"
+            android:onClick="@{v->vm.gotoInfoDetails(item.info_id)}"
             android:paddingBottom="@dimen/dp_5" >
 
             <TextView
@@ -40,7 +45,7 @@
                 android:id="@+id/tv_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text=" YD20200901171059066"
+                android:text="@{item.info_sn}"
                 app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
                 app:layout_constraintStart_toEndOf="@id/tv_number_name"
                 app:layout_constraintTop_toTopOf="@id/tv_number_name" />
@@ -49,7 +54,8 @@
                 android:id="@+id/tv_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="待接单(0/1)"
+                android:text="@{vm.getOrderStatus(item.info_state)}"
+                tools:text="待接单(0/1)"
                 app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/tv_number_name" />
@@ -83,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp_10"
-                android:text="山东 临沂"
+                android:text="@{item.send[0].province.name+item.send[0].city.name+item.send[0].area.name}"
                 android:textColor="@color/blue"
                 app:layout_constraintBottom_toBottomOf="@id/img_arrow"
                 app:layout_constraintEnd_toStartOf="@id/img_arrow"
@@ -94,7 +100,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
-                android:text="北京 中关村"
+                android:text="@{item.receive[0].province.name+item.receive[0].city.name+item.receive[0].area.name}"
                 android:textColor="@color/red_400"
                 app:layout_constraintBottom_toBottomOf="@id/img_arrow"
                 app:layout_constraintStart_toEndOf="@id/img_arrow"
@@ -134,7 +140,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
-                android:text="苹果(农产品) · 35吨"
+                android:text="@{item.receive[0].goods+item.receive[0].nums+item.receive[0].nums_type.name}"
                 app:layout_constraintBottom_toBottomOf="@id/img_goods"
                 app:layout_constraintStart_toEndOf="@id/img_goods"
                 app:layout_constraintTop_toTopOf="@id/img_goods" />
@@ -152,4 +158,4 @@
 
     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
 
-</layout >
+</layout >

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

@@ -444,12 +444,9 @@ Api 已达到使用限制
     <string name="waybill_number" >运单号: </string >
     <string name="source_information" >货源信息</string >
     <string name="filter" >筛选</string >
-
     <string name="chose_city" >选择省份</string >
     <string name="total_img" >￥</string >
     <string name="spot" >.</string >
 
 
-
-
 </resources >

base/src/main/java/com/ysnows/base/widget/tablayout/TabLayout.java

@@ -73,7 +73,7 @@ public class TabLayout extends RecyclerView implements OnItemClickListener {
         adapter = new MainMenuAdapter();
         setAdapter(adapter);
         adapter.setOnItemClickListener(this);
-        adapter.setAnimationEnable(true);
+//        adapter.setAnimationEnable(false);
         adapter.setAnimationFirstOnly(false);
         adapter.setAnimationWithDefault(BaseQuickAdapter.AnimationType.ScaleIn);
     }
@@ -85,6 +85,12 @@ public class TabLayout extends RecyclerView implements OnItemClickListener {
         setLayoutManager(layoutManager);
         adapter.setList(tabs);
     }
+    public void clear(){
+        tabs.clear();
+//        adapter.clearList();
+    }
+
+
 
     public TabLayout addTab(Tab tab) {
         tabs.add(tab);