From 0361f47762f9958f2ec91fdb62bfc98de4e162a6 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期一, 14 四月 2025 15:16:17 +0800
Subject: [PATCH] save
---
app/src/main/java/com/xianning/driver/ui/main/OrderOverActivity.kt | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/xianning/driver/ui/main/OrderOverActivity.kt b/app/src/main/java/com/xianning/driver/ui/main/OrderOverActivity.kt
index 94709f9..8984a00 100644
--- a/app/src/main/java/com/xianning/driver/ui/main/OrderOverActivity.kt
+++ b/app/src/main/java/com/xianning/driver/ui/main/OrderOverActivity.kt
@@ -28,6 +28,7 @@
import kotlinx.android.synthetic.main.include_order_top.*
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
+import org.jetbrains.anko.toast
class OrderOverActivity : MyBaseActivity() {
@@ -52,6 +53,7 @@
MyApplication.currentOrderId = ""
ll_pay_result.gone()
tv_show_pay_over.gone()
+ tv_login.gone()
}
override fun initView() {
@@ -81,6 +83,7 @@
}
private fun showUi(orderBean: OrderBean?) {
+ tv_login.gone()
orderBean?.let {
tv_name.text = it.data.nickName
tv_car_num.text = it.data.historyNum.toString() + "次乘车"
@@ -111,10 +114,15 @@
}
6, 7 -> {
if (it.data.payManner == 2) {
- tv_show_pay_over.visible()
+// tv_show_pay_over.visible()
setTitleText("已完成")
- ll_pay_result.gone()
- } else {
+// ll_pay_result.gone()
+ showPayResultText(it, it.data.orderState)
+ addSocketLisener()
+ } else if (it.data.payManner == 3){
+ setTitleText("已完成")
+ tv_show_pay_over.visible()
+ }else {
addSocketLisener()
showPayResultText(it, it.data.orderState)
}
@@ -123,7 +131,12 @@
if (it.data.payManner == 2) {
tv_show_pay_over.visible()
setTitleText("已完成")
- ll_pay_result.gone()
+// ll_pay_result.gone()
+ showPayResultText(it, it.data.orderState)
+
+ } else if (it.data.payManner == 3){
+ setTitleText("已完成")
+ tv_show_pay_over.visible()
} else {
showPayResultText(it, it.data.orderState)
}
@@ -185,17 +198,19 @@
if (statue in 6..7) {
tv_pay_result_title.text = "待乘客支付"
setTitleText("待支付")
+// if (it.data.payManner == 2)
+// tv_login.visible()
} else {
tv_pay_result_title.text = "乘客已支付"
setTitleText("已完成")
ll_pay_result.visible()
}
tv_pay_result_money.text = "￥" + it.data.orderMoney.toString()
- when (orderType) {
- "2" -> {
- tv_pay_result_small_money.text = "其中含红包费用：¥" + it.data.tipMoney.toString()
+ when (it.data.payManner) {
+ 2 -> {
+ tv_pay_result_small_money.text = ""
}
- "1" -> {
+ else -> {
tv_pay_result_small_money.text = "查看收费明细"
tv_pay_result_small_money.clickDelay {
startActivity<MajorMoneyDetailActivity>(
@@ -214,6 +229,16 @@
}
override fun setOnclick() {
-
+ tv_login.setOnClickListener {
+ DialogUtil.getDelAndSureDialog(this, "是否确认收款？", {}, {
+ val mapByAny = getMapByAny()
+ mapByAny["orderId"] = orderId
+ mapByAny["orderType"] = orderType
+ callNet(Api.confirm,mapByAny){
+ toast("操作成功")
+ initView()
+ }
+ })
+ }
}
}
\ No newline at end of file
--
Gitblit v1.7.1