From a0b3598842d57f5dfb5736e8a4fff5a9d70191a5 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 06 八月 2020 20:55:52 +0800
Subject: [PATCH] 8.6
---
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index 49c612b..2035cf4 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -1,5 +1,6 @@
package com.okgoincar.slab
+import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Handler
@@ -43,12 +44,48 @@
import kotlinx.android.synthetic.main.dialog_select_pay_type.view.*
import kotlinx.android.synthetic.main.dialog_sure_and_del_slab.view.*
import kotlinx.android.synthetic.main.item_map_market.view.*
+import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
import java.util.concurrent.TimeUnit
class SlabTripActivity : MySlabBaseActivity() {
+
+ private fun callOver(contexts: Context, travelFee:Double){
+ if (MyApplication.currentOrderId.isEmpty()){
+ cn.sinata.xldutils.utils.toast("没有进行中的订单，无法结束")
+ return
+ }
+ var map = getMapByAny()
+ map["orderId"] = MyApplication.currentOrderId
+ map["orderType"] = MyApplication.currentOrderType
+ map["travelFee"] = travelFee
+ map["lat"] = MyApplication.getLocation().latitude
+ map["lon"] = MyApplication.getLocation().longitude
+ map["type"] = 1
+ callNet(contexts,Api.confirmFees_,map){
+ EventBus.getDefault().post(BaseEvent(BaseEvent.SURE_MONEY))
+ }
+
+ }
+
+ private fun callStatue(contexts: Context, i: Int) {
+ if (MyApplication.currentOrderId.isEmpty()){
+ cn.sinata.xldutils.utils.toast("没有进行中的订单，无法开始")
+ return
+ }
+ var map = getMapByAny()
+ map["orderId"] = MyApplication.currentOrderId
+ map["orderType"] = MyApplication.currentOrderType
+ map["state"] = i
+ map["lat"] = MyApplication.getLocation().latitude
+ map["lon"] = MyApplication.getLocation().longitude
+ callNet(contexts, Api.process, map) {
+ EventBus.getDefault().post(BaseEvent(BaseEvent.UP_TRIP))
+ }
+ }
+
/***
* // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
@@ -103,8 +140,8 @@
tv_time_send_prove.textColor(this,R.color.write)
tv_current_time.textColor(this,R.color.write)
} else {
- ll_order_top.setBackgroundResource(R.drawable.write)
- ll_info_top.setBackgroundResource(R.drawable.write)
+ ll_order_top.setBackgroundResource(R.drawable.write_bottom_10)
+ ll_info_top.setBackgroundResource(R.drawable.write_top_10)
rl_back.setBackgroundResource(R.drawable.write)
iv_back_slab.setImageResource(R.mipmap.icon_back_black)
tv_title_slab.textColor(this,R.color.black)
@@ -179,7 +216,17 @@
}
}
+
+
private fun onclick() {
+ btn_start.clickDelay {
+ callStatue(this,5)
+ }
+
+ btn_end.clickDelay {
+ callOver(this,10.0)
+ }
+
tv_change.clickDelay {
changeMode()
}
@@ -408,6 +455,9 @@
callNet(this, Api.queryOrderInfo, map) {
orderBean = gson.fromJson(it, OrderBean::class.java)
showUi(orderBean)
+// Handler(Looper.getMainLooper()).postDelayed({
+// startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
+// },1000)
}
callPersion()
}
@@ -434,7 +484,7 @@
recycler_view_start.adapter = SlabStartAdapter(it.score.toDouble())
tv_company.text = "公司：" + it.company
tv_time_send_prove.text = "发证日期：" + it.networkCarlssueDate
- GlideUtil.load(this, it.avatar, iv_head, 1)
+ GlideUtil.load(this, it.avatar, iv_head, 8)
tv_current_time.text = DateUtil.getTime(
DateUtil.TYPE7,
System.currentTimeMillis()
@@ -642,6 +692,14 @@
MyApplication.currentOrderType = ""
finish()
}
+ BaseEvent.UP_TRIP ->{
+ callOrder()
+ }
+
+ BaseEvent.SURE_MONEY -> {
+ startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to "2")
+ finish()
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.7.1