From 7e4a923b472a1ffb9d6deeb80302551ba4178ca3 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 20 六月 2023 17:40:28 +0800
Subject: [PATCH] 注册增加字段,收益明细增加类型
---
app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt b/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
index e8df588..646665f 100644
--- a/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
+++ b/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
@@ -67,7 +67,7 @@
}
override fun initView() {
- setTitleText("芳华代驾")
+ setTitleText("芳华代驾司机")
callOrder()
addSockectCancel()
MyApplication.getInstance()!!.initUpPoint()
@@ -328,7 +328,7 @@
iv_call.visible()
tv_more.visible()
}
- if (orderBean?.state?:0 > 140&&orderBean?.state?:0!=201)
+ if (orderBean?.state?:0 > 104&&orderBean?.state?:0!=201)
MyApplication.startRecord()
when (orderBean?.state) { //订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）
101,201 -> {
@@ -359,8 +359,7 @@
tv_length.text = "%d公里".format(orderBean!!.estimatedMileage.toDouble().toInt())
} else {
line1.gone()
- tv_length.gone()
- tv_2.gone()
+ ll_length.gone()
tv_1.text = "起步价"
tv_money.text = "%.2f元".format(orderBean!!.startPrice)
moveCamera(aMap, startMarker!!.position)
@@ -369,8 +368,7 @@
102, 103 -> {
showMarker2(orderBean!!.currentDistance.toFloat())
line1.gone()
- tv_length.gone()
- tv_2.gone()
+ ll_length.gone()
if (!orderBean?.endAddress.isNullOrEmpty()) {//有终点
tv_money.text = "%.2f元".format(orderBean!!.estimatedPrice)
} else {
@@ -415,14 +413,11 @@
countDownTimer?.cancel()
slide_btn.changeButtonText("开始服务")
line1.visible()
- tv_length.visible()
- tv_2.visible()
+ ll_length.visible()
line2.visible()
- tv_waiting.visible()
- tv_3.visible()
+ ll_waiting.visible()
line3.visible()
- tv_duration.visible()
- tv_4.visible()
+ ll_duration.visible()
//菜单项显示等待按钮
tv_wait.visible()
divider_3.visible()
@@ -444,14 +439,11 @@
showMarker4()
slide_btn.changeButtonText("到达目的地")
line1.visible()
- tv_length.visible()
- tv_2.visible()
+ ll_length.visible()
line2.visible()
- tv_waiting.visible()
- tv_3.visible()
+ ll_waiting.visible()
line3.visible()
- tv_duration.visible()
- tv_4.visible()
+ ll_duration.visible()
//菜单项只显示追加和等待按钮
tv_cancel.gone()
divider_1.gone()
--
Gitblit v1.7.1