From 6bed01a5a2468cd389d4e483dbeb90347b701310 Mon Sep 17 00:00:00 2001
From: 唐浩 <15928265276@163.com>
Date: 星期六, 18 七月 2020 15:31:42 +0800
Subject: [PATCH] commit
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 25 +++++++++++++++++++++----
1 files changed, 21 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 cf2315a..0793ea0 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -34,27 +34,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 +117,7 @@
lineTance: Float,
lineTime: Long
) {
+ MyApplication.getTTsManager().setVideoText("收到新的"+UiUtil.getNameByType(orderType!!)+"订单，"+"从"+data.startAddress+"出发，距您约"+AMapKit.getTance(lineTance))
tv_title.text = "距您约" + AMapKit.getTance(lineTance)
}
})
--
Gitblit v1.7.1