From 03972ad1d3ce6ffe0be0395c0a4d5dcb4474031f Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 16 六月 2023 15:54:16 +0800
Subject: [PATCH] 修改公费支付方式
---
app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 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 5120cc4..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
@@ -47,17 +48,6 @@
private val datas = arrayListOf<Order>()
private val adapter by lazy {
when (type) {
- in (1..3) -> TripOrderAdapter(datas,object :StringCallback{
- override fun onRlt(rlt: String) {
- val payThankDialog = PayThankDialog()
- payThankDialog.setCallback(object : PayThankDialog.Callback {
- override fun onOk(way: Int,money:Double) {
- pay(way, rlt.toInt(),money = money)
- }
- })
- payThankDialog.show(childFragmentManager, "thank")
- }
- })
TYPE_CHARTER -> CharterOrderAdapter(datas, object : OrderCallback {
override fun onDel(position: Int) {
cancelCharterOrder(position)
@@ -73,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) {
@@ -185,7 +177,7 @@
)
}
}
- Const.OrderType.TYPE_CROSS_CITY,Const.OrderType.TYPE_THROUGH_BUS -> {
+ Const.OrderType.TYPE_CROSS_CITY,Const.OrderType.TYPE_THROUGH_BUS,Const.OrderType.TYPE_AIRBUS -> {
when (order.state) {
in (1..6) -> startActivityForResult<TripActivity>(
1,
@@ -219,6 +211,55 @@
"id" to order.orderId,
"type" to order.orderType
)
+ }
+ }
+ }
+ 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
+ )
}
}
}
@@ -348,8 +389,9 @@
const val TYPE_LOGISTICS_SAME = 4
const val TYPE_LOGISTICS_CROSS = 5
const val TYPE_CHARTER = 6
- const val TYPE_THROUGH_BUS = 7
- const val TYPE_OFFICIAL = 8
+ const val TYPE_THROUGH_BUS = 8
+ const val TYPE_AIR = 9
+ const val TYPE_OFFICIAL = 10
fun newInstance(type: Int): TripOrderFragment {
val tripOrderFragment = TripOrderFragment()
tripOrderFragment.arguments = bundleOf("type" to type)
--
Gitblit v1.7.1