From 2eb712cec24c7c6bb8c64dd332aa625efd8b7abe Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 21 七月 2020 11:56:17 +0800
Subject: [PATCH] first commit
---
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index 40495a0..49c612b 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -83,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)
+ ll_info_top.setBackgroundResource(R.drawable.write)
+ 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)
+
}
}
@@ -99,6 +138,7 @@
initMineLocation()
onclick()
addSockectCancel()
+ changeMode()
MyApplication.getInstance()!!.initUpPoint()
}
@@ -123,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 {
@@ -229,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 {
@@ -265,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)
}
--
Gitblit v1.7.1