From 71a056d02f9084af82bd6fe3962e5b46d5628e4f Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 11 八月 2020 21:56:10 +0800
Subject: [PATCH] 8.11
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..02a0379 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -17,6 +17,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 +61,11 @@
tv_sure.text = strBtn + it.toString() + "秒"
}
}
+
tv_close.clickDelay {
finish()
}
+
tv_sure.clickDelay {
if (type == 1){
showGetOrder()
@@ -78,8 +81,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+"公里"
+ }
}
}
@@ -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