1.货源详情修改。

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

@@ -2,7 +2,6 @@ package com.quansu.heifengwuliu.activity
 
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.View
 import androidx.lifecycle.Observer
 import com.quansu.heifengwuliu.adapter.OrderInfoInadapter
 import com.quansu.heifengwuliu.adapter.OrderInfoadapter
@@ -17,16 +16,17 @@ import com.quansu.heifengwuliu.vmodel.SourceDetailsVModel
  *on 2020/9/15
  */
 class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetailsBinding>() {
-    var type=""//0运单详情 1 货源详情
+    var type=1//0运单详情（显示运输轨迹按钮，下一步按钮） 1 货源详情（取消发布 再来一单 接单车辆）
     override fun __before() {
         super.__before()
-        var type=intent?.extras?.getString("type", "0")
+        var type=intent?.extras?.getInt("type", 1)
+
 
     }
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
-
+        vm.type.value=type
         var info_id=intent?.extras?.getString("info_id", "")
 
         if(!TextUtils.isEmpty(info_id)) {
@@ -54,7 +54,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
        var  outList = bean.order.send
        adapterOut!!.addData(outList)
        //入
-       var adapterIn= OrderInfoInadapter()
+       var adapterIn= OrderInfoInadapter(bean.order.type)
        binding.recyclerViewIn.adapter=adapterIn
        var  inList = bean.order.receive
        adapterIn!!.addData(inList)
@@ -67,7 +67,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
 
 
     override fun title(): String? {
-        return if(type=="1") "货源详情" else "运单详情"
+        return if(type==1) "货源详情" else "运单详情"
     }
 
     override fun vmClass(): Class<SourceDetailsVModel> {

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

@@ -6,9 +6,10 @@ import com.quansu.heifengwuliu.databinding.ItemEnterinfoBinding
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.ysnows.base.base.BAdapter
 
-class OrderInfoInadapter() : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
+class OrderInfoInadapter(val type:Int) : BAdapter<DataInfoBean.OrderBean.ReceiveBean, BaseDataBindingHolder<ItemEnterinfoBinding>>(R.layout.item_enterinfo) {
 
     override fun convert(holder: BaseDataBindingHolder<ItemEnterinfoBinding>, item: DataInfoBean.OrderBean.ReceiveBean) {
+         holder.dataBinding?.type=type
         holder.dataBinding?.item = item
     }
 }

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

@@ -8,6 +8,8 @@ import com.ysnows.base.inter.IModel
  *on 2020/9/14
  * 订单状态 info_state：10->待支付  20->待接单  30->进行中 40-> 已完成  100->已取消
  * is_pay:0未支付 1已支付
+ *
+ * type：1一装一卸  2一装多卸
  */
 data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<String>,
                         var car_type: List<CarTypeBean>, var order: OrderBean,var default_send:DefaultSdendBean,
@@ -44,7 +46,7 @@ data class DataInfoBean(var goods_type: List<SelectData>, var nums_type: List<St
                          var uid: String, var price: String,
                          var total: String,
                          var nums: String, var is_public: String,
-                         var is_insurance: String, var type: String,
+                         var is_insurance: String, 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/vmodel/OrderListVModel.kt

@@ -33,7 +33,7 @@ class OrderListVModel : BRViewModel<BRRepository>() {
         //到详情界面
         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
             putString("info_id", info_id)
-            putString("type", "0")
+            putInt("type", 1)
         })
 
 

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

@@ -82,7 +82,7 @@ open class OwnerMoreVModel : BViewModel<BRepository>() {
                         var  bean=it.data() as InfoEditBean
                         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
                             putString("info_id", bean.info_id)
-                            putString("type","1")
+                            putInt("type",1)
                         })
 
                     }

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

@@ -85,7 +85,7 @@ open class OwnerSingleVModel : BViewModel<BRepository>() {
                         var  bean=it.data() as InfoEditBean
                         UiSwitch.bundle(repository().context, SourceDetailsActivity::class.java, Bundle().apply {
                             putString("info_id", bean.info_id)
-                            putString("type","1")
+                            putInt("type",1)
                         })
 
                     }

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

@@ -1,15 +1,11 @@
 package com.quansu.heifengwuliu.vmodel
 
-import android.app.Activity
-import android.content.Intent
+
 import android.view.inputmethod.EditorInfo
 import androidx.databinding.Bindable
 import com.quansu.heifengwuliu.BR
-import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
-import com.ysnows.base.net.IResponse
-import io.reactivex.Observable
 
 open abstract class SearchVModel : BRViewModel<BRRepository>() {
     @Bindable

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

@@ -30,6 +30,10 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
 
     val info: MutableLiveData<DataInfoBean> = MutableLiveData<DataInfoBean>()
 
+    //0运单详情（显示运输轨迹按钮，下一步按钮） 1 货源详情（取消发布 再来一单 接单车辆）
+    val type: MutableLiveData<Int> = MutableLiveData<Int>()
+
+
     fun getInfo(info_id: String) {
         repository().lreq(NetEngine.service.infoGet(info_id))
                 .doOnNext() {
@@ -146,5 +150,31 @@ open class SourceDetailsVModel : BViewModel<BRepository>() {
 
     }
 
+    fun goTrack(){
+        //运输轨迹
+
+    }
+
+    fun goStep(){
+        //下一步
+
+    }
+
+
+
+   fun isShowCancelBut(info_state:Int):Boolean{
+        //取消按钮
+         return type.value==1&&(info_state==10||info_state==20)
+    }
+
+    fun isShowReceiveVehicle(info_state:Int):Boolean{
+        //接单车辆按钮
+        return type.value==1&&(info_state==30||info_state==40)
+
+    }
+
+
+
+
 
 }

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

@@ -66,7 +66,7 @@
                         android:layout_marginEnd="@dimen/dp_10"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="@{vm.info.order.receive[0].province.name+vm.info.order.receive[0].city.name+vm.info.order.receive[0].area.name}"
+                        android:text="@{vm.info.order.receive[vm.info.order.receive.size()-1].province.name+vm.info.order.receive[vm.info.order.receive.size()-1].city.name+vm.info.order.receive[vm.info.order.receive.size()-1].area.name}"
                         android:textColor="#BC5B55"
                         android:textSize="@dimen/sp_15"
                         tools:text="河北 唐山"></TextView>
@@ -93,6 +93,122 @@
                 </androidx.recyclerview.widget.RecyclerView>
 
 
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:orientation="horizontal"
+                android:padding="@dimen/dp_10"
+                android:gravity="center_vertical"
+                android:visibility="@{vm.type==0?View.VISIBLE :View.GONE}"
+                app:layout_goneMarginTop="@dimen/dp_10"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_radius="@dimen/dp_10">
+
+
+                <ImageView
+                    android:layout_width="60dp"
+                    android:src="@drawable/ic_phone_enter"
+                    android:layout_height="60dp">
+
+                </ImageView>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_height="match_parent">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="@dimen/dp_6"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/sp_15"
+                            android:textColor="@color/text_title"
+                            tools:text="乔治"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:textSize="@dimen/sp_15"
+                            android:textColor="@color/text_title"
+                            tools:text="18535965350"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                        <ImageView
+                            android:layout_width="20dp"
+                            android:src="@drawable/ic_collect_off"
+                            android:layout_height="20dp">
+
+                        </ImageView>
+
+
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="@dimen/dp_4"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/sp_15"
+                            android:textColor="@color/text_title"
+                            tools:text="鲁QAA888"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/sp_15"
+                            android:textColor="@color/text_title"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginEnd="@dimen/dp_10"
+                            android:text="/"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:textSize="@dimen/sp_15"
+                            android:textColor="@color/text_title"
+                            tools:text="平板车 13米"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_height="wrap_content">
+                        </TextView>
+
+
+
+                    </LinearLayout>
+
+
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:src="@drawable/ic_phone_out"
+                    android:layout_height="20dp">
+
+                </ImageView>
 
 
 
@@ -100,6 +216,11 @@
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
+
+
+
+
+
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -144,12 +265,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_10"
+                    android:visibility="@{vm.info.order.type==1?View.VISIBLE :View.GONE}"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="@dimen/dp_80"
-
                         android:layout_height="wrap_content"
                         android:textColor="@color/text_title1"
                         android:textSize="@dimen/sp_15"
@@ -312,7 +433,7 @@
                 android:layout_marginStart="@dimen/dp_10"
                 android:onClick="@{v->vm.setCancelOrder(vm.info.order.info_id)}"
                 android:text="取消发布"
-                android:visibility="@{vm.info.order.info_state==10||vm.info.order.info_state==20? View.VISIBLE :View.GONE}"
+                android:visibility="@{vm.isShowCancelBut(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
                 android:textColor="@color/text_title"
                 app:qmui_borderColor="@color/color_line"
                 app:qmui_radius="@dimen/dp_4">
@@ -325,6 +446,7 @@
                 android:layout_height="@dimen/dp_40"
                 android:layout_marginStart="@dimen/dp_15"
                 android:text="再来一单"
+                android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
                 android:onClick="@{v->vm.anotherOne()}"
                 android:textColor="@color/text_title"
                 app:qmui_borderColor="@color/color_line"
@@ -339,7 +461,22 @@
                 android:layout_marginStart="@dimen/dp_15"
                 android:text="接单车辆"
                 android:onClick="@{v->vm.goDriverList()}"
-                android:visibility="@{vm.info.order.info_state==30||vm.info.order.info_state==40? View.VISIBLE :View.GONE}"
+                android:visibility="@{vm.isShowReceiveVehicle(vm.info.order.info_state)?View.VISIBLE:View.GONE}"
+                android:textColor="@color/text_title"
+                app:qmui_borderColor="@color/color_line"
+                app:qmui_radius="@dimen/dp_4">
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_track"
+                android:layout_width="120dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="@dimen/dp_15"
+                android:text="运输轨迹"
+                android:onClick="@{v->vm.goTrack()}"
+                android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
                 android:textColor="@color/text_title"
                 app:qmui_borderColor="@color/color_line"
                 app:qmui_radius="@dimen/dp_4">
@@ -347,6 +484,20 @@
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
 
 
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/but_step"
+                android:layout_width="120dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginStart="@dimen/dp_15"
+                android:text="下一步"
+                android:onClick="@{v->vm.goStep()}"
+                android:visibility="@{vm.type==0?View.VISIBLE:View.GONE}"
+                android:textColor="@color/text_title"
+                app:qmui_borderColor="@color/color_line"
+                app:qmui_radius="@dimen/dp_4">
+
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton>
+
 
 
 

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

@@ -3,12 +3,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <data >
+        <import type="android.view.View" />
 
-
+        <variable
+            name="type"
+            type="Integer" />
         <variable
             name="item"
             type="com.quansu.heifengwuliu.model.DataInfoBean.OrderBean.ReceiveBean" />
-
     </data >
 
     <LinearLayout
@@ -114,6 +116,74 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:visibility="@{type==2?View.VISIBLE:View.GONE}"
+            android:layout_marginTop="@dimen/dp_5"
+            android:layout_marginBottom="@dimen/dp_5"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="35dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_15"
+                    android:text="货物信息："></TextView>
+
+                <TextView
+
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@{item.goods+@string/spot+item.nums+item.nums_type.name}"
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_15"
+                    tools:text="水泥 35吨"></TextView>
+
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="35dp"
+                android:layout_marginTop="@dimen/dp_5"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_15"
+                    android:text="总价："></TextView>
+
+                <TextView
+
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@{@string/total_img+item.total}"
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_15"
+                    tools:text="水泥 35吨"></TextView>
+
+
+            </LinearLayout>
+
+
+
+        </LinearLayout>
+
 
 
     </LinearLayout>