From bd6a8872438a35d47821c5d5da7fe149e5fed3ab Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 21 六月 2023 09:53:36 +0800
Subject: [PATCH] 处理收不到广播

---
 app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
index 92884d6..99eb1e5 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -5,10 +5,7 @@
 import android.os.Bundle
 import android.os.CountDownTimer
 import cn.sinata.xldutils.activitys.DialogActivity
-import cn.sinata.xldutils.utils.Toast
-import cn.sinata.xldutils.utils.clickDelay
-import cn.sinata.xldutils.utils.getNowTimeBlack
-import cn.sinata.xldutils.utils.textColor
+import cn.sinata.xldutils.utils.*
 import com.amap.api.maps.model.LatLng
 import com.okgoincar.netUtls.*
 import com.okgoincar.slab.util.UiUtil
@@ -17,6 +14,7 @@
 import com.okgoincar.base.AMapKit
 import com.okgoincar.base.MyApplication
 import com.okgoincar.bean.OrderBean
+import com.okgoincar.bean.ServerVoiceBean
 import com.okgoincar.netUtls.Api
 import kotlinx.android.synthetic.main.item_get_order.*
 import kotlinx.android.synthetic.main.item_map_market.view.*
@@ -60,9 +58,11 @@
                 tv_sure.text = strBtn + it.toString() + "秒"
             }
         }
+
         tv_close.clickDelay {
             finish()
         }
+
         tv_sure.clickDelay {
             if (type == 1){
                 showGetOrder()
@@ -78,8 +78,16 @@
         var map = getMapByAny()
         map["orderId"] = orderId
         map["orderType"] = orderType
+        map["lat"] = MyApplication.getLocation().latitude
+        map["lon"] = MyApplication.getLocation().longitude
         callNet(this,Api.queryVoiceBroadcast,map){
-
+            var bean = Gson().fromJson<ServerVoiceBean>(it,ServerVoiceBean::class.java)
+            if (!bean.data.isNullOrEmpty()){
+                MyApplication.getTTsManager().setVideoText(bean.data)
+                var str = bean.data
+                str = str.substring(7,str.indexOf("公里"))
+                tv_title.text = "距您约"+str+"公里"
+            }
         }
     }
 
@@ -112,6 +120,9 @@
             tv_time.text = data.travelTime
             tv_car_type.text = UiUtil.getNameByType(orderType!!)
             tv_start.text = data.startAddress
+            if(data.endAddress.isNullOrEmpty()){
+                tv_end.gone()
+            }
             tv_end.text = data.endAddress
             tv_money.text = data.tipMoney.toString() + "元红包"
             tv_reassign.text = data.type
@@ -125,9 +136,8 @@
                         lineTance: Float,
                         lineTime: Long
                     ) {
-                        MyApplication.getTTsManager().setVideoText("收到新的"+
-                                UiUtil.getNameByType(orderType!!)+"订单,"+"从"+data.startAddress+"出发,距您约"+AMapKit.getTance(lineTance))
-                        tv_title.text = "距您约" + AMapKit.getTance(lineTance)
+//                        MyApplication.getTTsManager().setVideoText("收到新的"+
+//                                UiUtil.getNameByType(orderType!!)+"订单,"+"从"+data.startAddress+"出发,距您约"+AMapKit.getTance(lineTance))
                     }
                 })
         }

--
Gitblit v1.7.1