From 128cbeac95dbc995fe1760bbd0f0a985fa5d23ba Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 14 三月 2023 15:57:19 +0800
Subject: [PATCH] fix
---
app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt b/app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt
index d838c38..45c6f05 100644
--- a/app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt
+++ b/app/src/main/java/com/fuban/user/ui/trip/TripActivity.kt
@@ -279,9 +279,8 @@
getTrippingData()
tv_complain.visible()
tv_share.visible()
- if (type == Const.OrderType.TYPE_CROSS_CITY) //跨城行程中无法取消
- titleBar.getRightButton(0)?.gone()
-
+// if (type == Const.OrderType.TYPE_CROSS_CITY) //跨城行程中无法取消
+ titleBar.getRightButton(0)?.gone()
}else->{
startActivity<OrderDetailActivity>("id" to id,"type" to type)
finish()
@@ -463,7 +462,7 @@
val s = System.currentTimeMillis()
val i = Math.max(s - waittime,0L)
val c = String.format("司机到达预约地点，已等您%02d:%02d", i / 1000 / 60, i / 1000 % 60)
- tv_state.text = SpanBuilder(c).color(this,11,c.length,R.color.colorRed).build()
+ tv_state.text = SpanBuilder(c).color(this,12,c.length,R.color.colorRed).build()
FBApplication.intervalCount ++
if (FBApplication.intervalCount>7){
getTrippingData()
--
Gitblit v1.7.1