From a7446bb3995654a2c5e8d03589111d16e0734bfc Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期五, 31 七月 2020 15:04:08 +0800
Subject: [PATCH] 7.31
---
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 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..7b7b313 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.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
@@ -82,10 +83,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 +138,7 @@
initMineLocation()
onclick()
addSockectCancel()
+ changeMode()
MyApplication.getInstance()!!.initUpPoint()
}
@@ -122,21 +163,25 @@
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() {
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 +273,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 +313,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 +408,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 +437,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 +510,8 @@
getAllMark(it)
when (it.data.orderState) {
2, 3 -> {
+ toast("点亮网约")
+ clickBroad()
iv_to_gd.visible()
makeMarker?.isVisible = true
carMarker?.isVisible = true
@@ -470,6 +526,8 @@
}
}
4 -> {
+ toast("点亮网约")
+ clickBroad()
iv_to_gd.gone()
closeLine()
carMarker?.isVisible = true
@@ -498,6 +556,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 +645,14 @@
MyApplication.currentOrderType = ""
finish()
}
+ BaseEvent.UP_TRIP ->{
+ callOrder()
+ }
+
+ BaseEvent.SURE_MONEY -> {
+ startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
+ finish()
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.7.1