From a988e7c15f5ce63785b77e01c89bec2565668982 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期日, 25 六月 2023 14:59:39 +0800
Subject: [PATCH] 修改bug
---
app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt b/app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt
index 9cf84b3..d1987fa 100644
--- a/app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt
+++ b/app/src/main/java/com/kuanzhai/driver/ui/main/TripActivity.kt
@@ -69,7 +69,6 @@
lateinit var aMap: AMap
lateinit var orderBean: OrderBean
-
override fun setContentView() {
setContentView(R.layout.activity_trip)
}
@@ -256,12 +255,13 @@
}
}
5, 6 -> {
+ MyApplication.finishRecord()
it.data.orderState = 6
when(orderType){
"2" -> {
showMoneyTypeDialog()
}
- "1" -> {
+ "1","10" -> {
callStatue(6,{
startActivity<MajorSureMoneyActivity>(
"orderId" to orderId,
@@ -423,6 +423,7 @@
private fun callOrder() {
MyApplication.currentOrderId = orderId
+ MyApplication.recordRoomId = orderId
MyApplication.currentOrderType = orderType
var map = getMapByAny()
map["orderId"] = orderId
@@ -445,6 +446,10 @@
tv_red_money.gone()
}
tv_red_money.text = it.data.tipMoney.toString() + "元红包"
+ if (orderType == "10"){//公务出行
+ tv_red_money.text = "${it.data.peopleNumber}人"
+ tv_red_money.setCompoundDrawablesRelativeWithIntrinsicBounds(R.mipmap.icon_people_gray,0,0,0)
+ }
showStatueMapUI(it)
}
}
@@ -549,6 +554,8 @@
slide_btn.changeButtonText("乘客已上车")
}
5, 6 -> {
+ if (it.data.orderState == 5)
+ MyApplication.startRecord()
closeTimeStart()
iv_to_gd.visible()
tv_Right.gone()
--
Gitblit v1.7.1