From 75ba68eb8d65a32251704c604b3e27f3121808ce Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 07 一月 2021 09:22:58 +0800
Subject: [PATCH] Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small
---
app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt b/app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
index ece92d2..02749ec 100644
--- a/app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
+++ b/app/src/main/java/com/okgoincar/slab/adapter/SlabMainAdapter.kt
@@ -1,4 +1,4 @@
-package com.okgoincar.ui.adapter
+package com.okgoincar.slab.adapter
import android.view.View
import cn.sinata.xldutils.utils.clickDelay
@@ -9,10 +9,11 @@
import com.okgoincar.R
import com.okgoincar.base.BaseRvAdapter
import com.okgoincar.base.BaseViewHolder
-import com.okgoincar.base.MyApplication
import com.okgoincar.bean.OrderListBean
import com.okgoincar.slab.SlabMainActivity
import com.okgoincar.slab.SlabTripActivity
+import com.okgoincar.slab.cargo.CargoActivity
+import com.okgoincar.slab.cargo.SlabCargoOverActivity
import com.okgoincar.slab.util.DialogUtil
import kotlinx.android.synthetic.main.item_main_list_slab.view.*
import kotlinx.android.synthetic.main.item_main_list_slab.view.tv_end
@@ -35,7 +36,29 @@
it.itemView.tv_end.text = item.endAddress
it.itemView.tv_qian.text = item.redMoney.toString() + "元小费"
+
it.itemView.clickDelay {
+ if (item.type == 4 || item.type == 5){
+ when(item.state){
+ 1,2,3,4,5,7,8,9,12 ->{
+ context.startActivity<CargoActivity>(
+ "orderId" to item.id.toString(),
+ "orderType" to item.type.toString()
+ )
+ }
+ 6,10->{
+ context.startActivity<SlabCargoOverActivity>(
+ "orderId" to item.id.toString(),
+ "orderType" to item.type.toString()
+ )
+ }
+ 11 -> {
+ toast("订单改派中")
+ }
+ }
+
+ return@clickDelay
+ }
when (item.state) {
2, 3, 4, 5 -> {
context.startActivity<SlabTripActivity>(
--
Gitblit v1.7.1