From 664834b83a4c50cac039bbfa49f5164ca9bf8e3c Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 07 八月 2020 17:05:17 +0800
Subject: [PATCH] 8.7
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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..a90ccdc 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -8,6 +8,7 @@
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 com.amap.api.maps.model.LatLng
import com.okgoincar.netUtls.*
import com.okgoincar.slab.util.UiUtil
@@ -17,9 +18,6 @@
import com.okgoincar.base.MyApplication
import com.okgoincar.bean.OrderBean
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 kotlinx.android.synthetic.main.item_get_order.*
import kotlinx.android.synthetic.main.item_map_market.view.*
import org.jetbrains.anko.startActivity
@@ -34,27 +32,43 @@
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 {
+ 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())
}
@@ -101,6 +115,7 @@
lineTance: Float,
lineTime: Long
) {
+ MyApplication.getTTsManager().setVideoText("收到新的"+UiUtil.getNameByType(orderType!!)+"订单，"+"从"+data.startAddress+"出发，距您约"+AMapKit.getTance(lineTance))
tv_title.text = "距您约" + AMapKit.getTance(lineTance)
}
})
@@ -111,9 +126,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,7 +148,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