lmw
2023-05-12 f67802a41f9e01444d1115f34ecc6e1beb05fc3b
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()