From d19fdba76572d8261c9b9013a1fc2798c436a1ba Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 14 十二月 2020 19:18:16 +0800
Subject: [PATCH] 1:新增版本号
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 94 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
index cf2315a..0294eb9 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -5,9 +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.*
import com.amap.api.maps.model.LatLng
import com.okgoincar.netUtls.*
import com.okgoincar.slab.util.UiUtil
@@ -16,10 +14,9 @@
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.activity_fill_out_slab.ll_order_top
-import kotlinx.android.synthetic.main.activity_fill_out_slab.tv_sure
-import kotlinx.android.synthetic.main.activity_fill_out_slab.tv_time
+import com.okgoincar.slab.cargo.CargoActivity
import kotlinx.android.synthetic.main.item_get_order.*
import kotlinx.android.synthetic.main.item_map_market.view.*
import org.jetbrains.anko.startActivity
@@ -34,29 +31,65 @@
intent?.getStringExtra("orderType")
}
+ val timeDown by lazy {
+ intent?.getIntExtra("time",-1)
+ }
+ val type by lazy {
+ intent?.getIntExtra("type",-1)
+ }
+
lateinit var time: CountDownTimer
- @SuppressLint("SourceLockedOrientationActivity")
+ @SuppressLint("SourceLockedOrientationActivity", "SetTextI18n")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
//设置竖屏显示
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
callOrderDetail()
- time = timeOver {
+ callVideo()
+ var strBtn = "抢单"
+ if (type == 2){
+ strBtn = "确定"
+ }
+ time = timeOver ((timeDown!!.toLong() * 1000L)){
if (it == 0) {
finish()
} else {
- tv_sure.text = "抢单" + it.toString() + "秒"
+ tv_sure.text = strBtn + it.toString() + "秒"
}
}
+
tv_close.clickDelay {
finish()
}
+
tv_sure.clickDelay {
- showGetOrder()
+ if (type == 1){
+ showGetOrder()
+ }else if (type == 2){
+ onBackPressed()
+ this.startActivity<SlabTripActivity>("orderId" to orderId, "orderType" to orderType)
+ }
}
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() {
@@ -91,6 +124,19 @@
tv_end.text = data.endAddress
tv_money.text = data.tipMoney.toString() + "元红包"
tv_reassign.text = data.type
+ if (orderType == "5" || orderType == "4"){
+ toast("确少货物数量")
+ tv_name.visible()
+ tv_cargo_num.visible()
+ tv_money.visible()
+ tv_name.text = data.nickName+"-"+data.phone
+ tv_cargo_num.text = "普通小件X"+data.peopleNumber
+ if (data.tipMoney != null && data.tipMoney > 0.0){
+ tv_money.text = doubleTwo(data.tipMoney)+"元加急费"
+ }else{
+ tv_money.gone()
+ }
+ }
AMapKit.initRouteLine(
this,
LatLng(MyApplication.getLocation().latitude, MyApplication.getLocation().longitude),
@@ -101,7 +147,8 @@
lineTance: Float,
lineTime: Long
) {
- tv_title.text = "距您约" + AMapKit.getTance(lineTance)
+// MyApplication.getTTsManager().setVideoText("收到新的"+
+// UiUtil.getNameByType(orderType!!)+"订单，"+"从"+data.startAddress+"出发，距您约"+AMapKit.getTance(lineTance))
}
})
}
@@ -111,9 +158,19 @@
if (nowTimeBlack){
rl_top_back.setBackgroundResource(R.color.black_mode_383838)
ll_order_top.setBackgroundResource(R.color.black_mode_383838)
+ tv_time.textColor(this,R.color.white)
+ 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.green_154c49)
- ll_order_top.setBackgroundResource(R.color.green_154c49)
+ rl_top_back.setBackgroundResource(R.color.white)
+ ll_order_top.setBackgroundResource(R.color.white)
+ tv_time.textColor(this,R.color.black)
+ 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)
}
}
@@ -123,11 +180,18 @@
map["orderId"] = orderId
map["orderType"] = orderType
showDialog()
- callNet(this, Api.grabOrder, map, {
+ callNet(this, Api.grabOrder_, map, {
dismissDialog()
Toast.create(this).show("抢单成功")
onBackPressed()
- this.startActivity<SlabTripActivity>("orderId" to orderId, "orderType" to orderType)
+ when(orderType){
+ "1","2","3" -> {
+ this.startActivity<SlabTripActivity>("orderId" to orderId, "orderType" to orderType)
+ }
+ "4","5" -> {
+ this.startActivity<CargoActivity>("orderId" to orderId, "orderType" to orderType)
+ }
+ }
},{
toast(it!!)
dismissDialog()
--
Gitblit v1.7.1