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 | 158 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 139 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index e804707..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,7 @@
package com.okgoincar.slab
+import android.content.Context
+import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
@@ -42,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=服务结束）
@@ -82,10 +120,49 @@
ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom_blacl)
ll_info_top.setBackgroundResource(R.drawable.bg_slab_main_8_black)
rl_back.setBackgroundResource(R.color.black_191919)
+ iv_back_slab.setImageResource(R.mipmap.icon_back_slab)
+ tv_title_slab.textColor(this,R.color.write)
+ tv_name.textColor(this,R.color.write)
+ tv_car_num.textColor(this,R.color.write)
+ tv_phone.textColor(this,R.color.write)
+ tv_phone.setDrawableLeft(R.mipmap.icon_dial_slab)
+ tv_time.textColor(this,R.color.write)
+ tv_start_address.textColor(this,R.color.write)
+ tv_end_address.textColor(this,R.color.write)
+ tv_red_money.textColor(this,R.color.write)
+ tv_end_address.textColor(this,R.color.write)
+
+ tv_code_num.textColor(this,R.color.write)
+ tv_name_car_man.textColor(this,R.color.write)
+ tv_car_num_var.textColor(this,R.color.write)
+ tv_star_num.textColor(this,R.color.write)
+ tv_company.textColor(this,R.color.write)
+ tv_time_send_prove.textColor(this,R.color.write)
+ tv_current_time.textColor(this,R.color.write)
} else {
- ll_order_top.setBackgroundResource(R.drawable.bg_slab_main_8_bottom)
- ll_info_top.setBackgroundResource(R.drawable.bg_slab_main_8)
- rl_back.setBackgroundResource(R.drawable.bg_slab_main)
+ 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)
+ tv_name.textColor(this,R.color.black)
+ tv_car_num.textColor(this,R.color.black)
+ tv_phone.textColor(this,R.color.black)
+ tv_phone.setDrawableNull()
+ tv_time.textColor(this,R.color.black)
+ tv_start_address.textColor(this,R.color.black)
+ tv_end_address.textColor(this,R.color.black)
+ tv_red_money.textColor(this,R.color.black)
+ tv_end_address.textColor(this,R.color.black)
+
+ tv_code_num.textColor(this,R.color.black)
+ tv_name_car_man.textColor(this,R.color.black)
+ tv_car_num_var.textColor(this,R.color.black)
+ tv_star_num.textColor(this,R.color.black)
+ tv_company.textColor(this,R.color.black)
+ tv_time_send_prove.textColor(this,R.color.black)
+ tv_current_time.textColor(this,R.color.black)
+
}
}
@@ -98,6 +175,7 @@
initMineLocation()
onclick()
addSockectCancel()
+ changeMode()
MyApplication.getInstance()!!.initUpPoint()
}
@@ -122,21 +200,35 @@
super.onBackPressed()
}
+ fun changeMode(){
+ if (tv_change.text == "收起") {
+ rl_map.invisible()
+ rl_persion_info.visible()
+ tv_change.text = "地图"
+ tv_change.textColor(this, R.color.main_yellow)
+ tv_change.setBackgroundResource(R.drawable.bg_orange_slab_line_4)
+ } else {
+ rl_map.visible()
+ rl_persion_info.invisible()
+ tv_change.text = "收起"
+ tv_change.textColor(this, R.color.white)
+ tv_change.setBackgroundResource(R.drawable.bg_login)
+ }
+ }
+
+
+
private fun onclick() {
+ btn_start.clickDelay {
+ callStatue(this,5)
+ }
+
+ btn_end.clickDelay {
+ callOver(this,10.0)
+ }
+
tv_change.clickDelay {
- if (tv_change.text == "收起") {
- rl_map.invisible()
- rl_persion_info.visible()
- tv_change.text = "地图"
- tv_change.textColor(this, R.color.main_yellow)
- tv_change.setBackgroundResource(R.drawable.bg_orange_slab_line_4)
- } else {
- rl_map.visible()
- rl_persion_info.invisible()
- tv_change.text = "收起"
- tv_change.textColor(this, R.color.white)
- tv_change.setBackgroundResource(R.drawable.bg_login)
- }
+ changeMode()
}
iv_move.setOnClickListener {
orderBean.let {
@@ -228,8 +320,12 @@
var payType = 1 //支付方式（1=OK平台收款，2=其他方式收款）
if (getNowTimeBlack()) {
pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_slab_main_8_black)
+ pop.contentView.tv_cancel.textColor(this,R.color.white)
+ pop.contentView.tv_ok.textColor(this,R.color.white)
} else {
- pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_slab_main_8)
+ pop.contentView.rl_back_pop.setBackgroundResource(R.drawable.bg_white_round_2)
+ pop.contentView.tv_cancel.textColor(this,R.color.black)
+ pop.contentView.tv_ok.textColor(this,R.color.black)
}
pop.showDown(window.decorView)
pop.contentView.tv_cancel.setOnClickListener {
@@ -264,8 +360,10 @@
})
if (getNowTimeBlack()) {
pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_green_4_black)
+ pop.contentView.tv_view_two_base.textColor(this,R.color.white)
} else {
- pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_green_4)
+ pop.contentView.rl_top_slab.setBackgroundResource(R.drawable.bg_white_round_2)
+ pop.contentView.tv_view_two_base.textColor(this,R.color.black)
}
pop.showCenter(window.decorView)
}
@@ -357,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()
}
@@ -383,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()
@@ -456,6 +557,8 @@
getAllMark(it)
when (it.data.orderState) {
2, 3 -> {
+ toast("点亮网约")
+ clickBroad()
iv_to_gd.visible()
makeMarker?.isVisible = true
carMarker?.isVisible = true
@@ -470,6 +573,8 @@
}
}
4 -> {
+ toast("点亮网约")
+ clickBroad()
iv_to_gd.gone()
closeLine()
carMarker?.isVisible = true
@@ -498,6 +603,13 @@
}
}
+ fun clickBroad(){
+ var intent = Intent();
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK;
+ intent.action = "wisdom.intent.action.topLight";
+ intent.putExtra("state",0)
+ sendBroadcast(intent);
+ }
private fun startTimeStart(waitTime: Int) {
if (!isTimeStart) {
@@ -580,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