From 141376c835204f1f1c33ddfbd365a8162e022a9c Mon Sep 17 00:00:00 2001
From: GamblingDog <125975490@qq.com>
Date: 星期二, 09 九月 2025 11:12:01 +0800
Subject: [PATCH] 交付

---
 app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt b/app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt
index 22d545c..8a82562 100644
--- a/app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt
+++ b/app/src/main/java/com/xianning/driver/ui/adapter/MainAdapter.kt
@@ -11,7 +11,11 @@
 import com.xianning.driver.ui.main.OrderOverActivity
 import com.xianning.driver.ui.main.TripActivity
 import com.xianning.driver.ui.main.major.MajorSureMoneyActivity
+import com.xianning.driver.ui.main.major.MajorSureMoneyOfflineActivity
+import com.xianning.driver.ui.main.small_cargo.SmallCargoActivity
+import com.xianning.driver.ui.main.small_cargo.SmallOverActivity
 import com.xianning.driver.ui.mine.ComplainOrderActivity
+import com.xianning.driver.ui.to_city.TripCityActivity
 import kotlinx.android.synthetic.main.item_main_list.view.*
 import org.jetbrains.anko.startActivity
 
@@ -70,10 +74,16 @@
                 if (item.type == 4 || item.type == 5){
                     when(item.state){
                         1,2,3,4,5,7,8,9,12 ->{
-
+                            context.startActivity<SmallCargoActivity>(
+                                "orderId" to item.id.toString(),
+                                "orderType" to item.type.toString()
+                            )
                         }
                         6,10->{
-
+                            context.startActivity<SmallOverActivity>(
+                                "orderId" to item.id.toString(),
+                                "orderType" to item.type.toString()
+                            )
                         }
                         11 -> {
                             toast("订单改派中")
@@ -89,11 +99,16 @@
                                 context.startActivity<TripActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                             }
                             6 ->{
-                                if (item.type.toString() == "1"){
+//                                if (item.type.toString() == "1"){
+//                                    context.startActivity<MajorSureMoneyActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
+//                                }
+//                                if (item.type.toString() == "2"){
+//                                    context.startActivity<FillOutActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
+//                                }
+                                if (item.payManner == 2){
+                                    context.startActivity<MajorSureMoneyOfflineActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
+                                }else{
                                     context.startActivity<MajorSureMoneyActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
-                                }
-                                if (item.type.toString() == "2"){
-                                    context.startActivity<FillOutActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                                 }
                             }
                             7,12->{
@@ -112,7 +127,9 @@
                 }
                 if (item.type == 3){
                     if (item.state < 6){
+                        context.startActivity<TripCityActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                     }else if(item.state == 6 || item.state == 8|| item.state == 9){
+                        context.startActivity<TripCityActivity>("orderId" to item.id.toString() , "orderType" to item.type.toString())
                     }else{
                         when(item.state){
                             11 -> {

--
Gitblit v1.7.1