From a141213b3234d2d83ffb6a5d2d42ede0e722d949 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 13 六月 2023 11:57:21 +0800
Subject: [PATCH] 公务出行开发完成
---
app/src/main/java/com/kuanzhai/user/ui/mine/TripOrderFragment.kt | 18 ++++--------------
1 files changed, 4 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..6694c25 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
@@ -47,17 +47,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)
@@ -185,7 +174,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,
@@ -348,8 +337,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