From 75ba68eb8d65a32251704c604b3e27f3121808ce Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 07 一月 2021 09:22:58 +0800
Subject: [PATCH] Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small
---
app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
index 0294eb9..0ef278c 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabGetOrderFragment.kt
@@ -129,8 +129,10 @@
tv_name.visible()
tv_cargo_num.visible()
tv_money.visible()
+ tv_money.setDrawableLeft(R.mipmap.rocket_cargo)
tv_name.text = data.nickName+"-"+data.phone
- tv_cargo_num.text = "普通小件X"+data.peopleNumber
+ var cargoStrType = if (data.cargoType == "1") "普通小件X" else "贵重小件X"
+ tv_cargo_num.text = cargoStrType+data.peopleNumber
if (data.tipMoney != null && data.tipMoney > 0.0){
tv_money.text = doubleTwo(data.tipMoney)+"元加急费"
}else{
@@ -162,6 +164,8 @@
tv_start.textColor(this,R.color.white)
tv_end.textColor(this,R.color.white)
tv_money.textColor(this,R.color.white)
+ tv_name.textColor(this,R.color.white)
+ tv_cargo_num.textColor(this,R.color.white)
tv_title.textColor(this,R.color.slab_yellow_zhong)
}else{
rl_top_back.setBackgroundResource(R.color.white)
@@ -170,6 +174,8 @@
tv_start.textColor(this,R.color.black)
tv_end.textColor(this,R.color.black)
tv_money.textColor(this,R.color.black)
+ tv_name.textColor(this,R.color.black)
+ tv_cargo_num.textColor(this,R.color.black)
tv_title.textColor(this,R.color.yellow_ffa72d)
}
}
--
Gitblit v1.7.1