From adf8013576cbdd12e5ebea8ff7e32baf5d558b27 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 13 六月 2023 18:30:19 +0800
Subject: [PATCH] 公务出行订单列表
---
app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt b/app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt
index 6694c25..403ab67 100644
--- a/app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt
+++ b/app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt
@@ -22,6 +22,7 @@
import com.kuanzhai.user.ui.crosscity.PayCrossActivity
import com.kuanzhai.user.ui.mine.adapter.CharterOrderAdapter
import com.kuanzhai.user.ui.mine.adapter.LogisticsAdapter
+import com.kuanzhai.user.ui.mine.adapter.OfficialOrderAdapter
import com.kuanzhai.user.ui.mine.adapter.TripOrderAdapter
import com.kuanzhai.user.ui.trip.OrderCancelDetailActivity
import com.kuanzhai.user.ui.trip.OrderDetailActivity
@@ -62,6 +63,8 @@
payThankDialog.show(childFragmentManager, "thank")
}
})
+ TYPE_OFFICIAL -> OfficialOrderAdapter(datas)
+
TYPE_LOGISTICS_SAME, TYPE_LOGISTICS_CROSS -> LogisticsAdapter(datas,
object : LogisticsAdapter.ClickCallback {
override fun onPay(index: Int) {
@@ -211,6 +214,55 @@
}
}
}
+ Const.OrderType.TYPE_OFFICIAL->{
+ if (order.auditStatus == 2){
+ startActivityForResult<OrderCancelDetailActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ } else if (order.auditStatus == 0){
+ startActivityForResult<TripActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ }else{
+ when (order.state) {
+ in (1..6) -> startActivityForResult<TripActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ 10 -> {
+ startActivityForResult<OrderCancelDetailActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ }
+ 11 -> {
+ startActivityForResult<TripActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ }
+ 7, 12 ->
+ startActivityForResult<OrderDetailActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ else ->
+ startActivityForResult<OrderDetailWithMapActivity>(
+ 1,
+ "id" to order.orderId,
+ "type" to order.orderType
+ )
+ }
+ }
+ }
}
}
}
--
Gitblit v1.7.1