From ba70502796a47ae0d4087ec2d7c0970e618665d6 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 10 九月 2020 18:37:35 +0800
Subject: [PATCH] 9.10-1
---
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index 117a4a3..7c2de92 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -62,7 +62,6 @@
MoneyBroadCastReceiver.callStatue(contexts, i)
}
-
/***
* // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
* 页面一共4个marker 1：预约地点 2：起点 3终点 4：司机点
@@ -124,7 +123,7 @@
tv_name.textColor(this, R.color.black)
tv_car_num.textColor(this, R.color.black)
tv_phone.textColor(this, R.color.black)
- tv_phone.setDrawableNull()
+ tv_phone.setDrawableLeft(R.mipmap.car_phone_bkack)
tv_time.textColor(this, R.color.black)
tv_start_address.textColor(this, R.color.black)
tv_end_address.textColor(this, R.color.black)
@@ -448,7 +447,11 @@
private fun showDriverUI(data: UserInfoBean?) {
data?.let {
- tv_code_num.text = "证号：" + data.taxiAptitudeCard
+ if (data.taxiAptitudeCard.length > 7){
+ tv_code_num.text = "资格证号："+data.taxiAptitudeCard.substring(0,3)+"*******"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)
+ }else{
+ tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
+ }
tv_name_car_man.text = "姓名：" + it.name
tv_car_num_var.text = "车牌：" + it.licensePlate
recycler_view_start.layoutManager =
@@ -464,7 +467,7 @@
tv_current_time.text = DateUtil.getTime(
DateUtil.TYPE7,
System.currentTimeMillis()
- ) + "\n" + DateUtil.getWeek(System.currentTimeMillis())
+ ) + DateUtil.getWeek(System.currentTimeMillis())
}
}
@@ -533,7 +536,6 @@
getAllMark(it)
when (it.data.orderState) {
2, 3 -> {
- toast("点亮网约")
clickBroad()
iv_to_gd.visible()
makeMarker?.isVisible = true
@@ -549,7 +551,6 @@
}
}
4 -> {
- toast("点亮网约")
clickBroad()
iv_to_gd.gone()
closeLine()
--
Gitblit v1.7.1