From 37a3189d71102d0997a349af6666448a4b8c6666 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 02 六月 2023 14:26:41 +0800
Subject: [PATCH] 现场测试反馈问题

---
 app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 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..9656572 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()
@@ -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