From 0fb44d953ab25a53d228b4c1f9381df80e70ee03 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 21 六月 2021 15:32:23 +0800
Subject: [PATCH] 1。4:处理预约单导致串单的问题 隐藏预约单
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 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 aa3823b..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.*
@@ -48,6 +46,7 @@
//设置竖屏显示
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
callOrderDetail()
+ callVideo()
var strBtn = "抢单"
if (type == 2){
strBtn = "确定"
@@ -59,9 +58,11 @@
tv_sure.text = strBtn + it.toString() + "秒"
}
}
+
tv_close.clickDelay {
finish()
}
+
tv_sure.clickDelay {
if (type == 1){
showGetOrder()
@@ -71,6 +72,23 @@
}
}
setblack(getNowTimeBlack())
+ }
+
+ private fun callVideo() {
+ 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+"公里"
+ }
+ }
}
override fun initView() {
@@ -102,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
@@ -115,8 +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))
}
})
}
@@ -130,6 +151,7 @@
tv_start.textColor(this,R.color.white)
tv_end.textColor(this,R.color.white)
tv_money.textColor(this,R.color.white)
+ tv_title.textColor(this,R.color.slab_yellow_zhong)
}else{
rl_top_back.setBackgroundResource(R.color.white)
ll_order_top.setBackgroundResource(R.color.white)
@@ -137,7 +159,7 @@
tv_start.textColor(this,R.color.black)
tv_end.textColor(this,R.color.black)
tv_money.textColor(this,R.color.black)
-
+ tv_title.textColor(this,R.color.yellow_ffa72d)
}
}
@@ -147,7 +169,7 @@
map["orderId"] = orderId
map["orderType"] = orderType
showDialog()
- callNet(this, Api.grabOrder, map, {
+ callNet(this, Api.grabOrder_, map, {
dismissDialog()
Toast.create(this).show("抢单成功")
onBackPressed()
--
Gitblit v1.7.1