From d2c92897e22b2c1992eceaef585f967a06b6ea84 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:59:29 +0800
Subject: [PATCH] 11.30  首页列表添加 其他数据用来展示页面 不空

---
 app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index b8fa6de..87aa844 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:司机点
@@ -367,8 +366,11 @@
     private fun initMineLocation() {
         AMapKit.initLocation(this, AMapLocationListener {
             it?.let {
-                MyApplication.aMapLocation = it
-                carMarker!!.position = LatLng(it.latitude, it.longitude)
+//                toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
+                if (it.errorCode == 0) {
+                    MyApplication.aMapLocation = it
+                    carMarker!!.position = LatLng(it.latitude, it.longitude)
+                }
             }
             orderBean.let {
                 when (it.data.orderState) {
@@ -448,7 +450,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 =
@@ -661,11 +667,11 @@
     override fun onEventMainThread(event: BaseEvent?) {
         super.onEventMainThread(event)
         when (event!!.code) {
-            BaseEvent.REAGASSIGN_SUCCESS -> {
-                MyApplication.currentOrderId = ""
-                MyApplication.currentOrderType = ""
-                finish()
-            }
+//            BaseEvent.REAGASSIGN_SUCCESS -> {
+//                MyApplication.currentOrderId = ""
+//                MyApplication.currentOrderType = ""
+//                finish()
+//            }
             BaseEvent.UP_TRIP -> {
                 callOrder()
             }

--
Gitblit v1.7.1