From 7804ce8edeba51418b5fde2d306e5f476dfb5993 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 18 三月 2026 10:03:22 +0800
Subject: [PATCH] 合并最新代码
---
app/src/main/java/com/driver/igotrip/bean/CloseRecordBean.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/bean/CloseRecordBean.java b/app/src/main/java/com/driver/igotrip/bean/CloseRecordBean.java
index 8594df1..bfcafd5 100644
--- a/app/src/main/java/com/driver/igotrip/bean/CloseRecordBean.java
+++ b/app/src/main/java/com/driver/igotrip/bean/CloseRecordBean.java
@@ -129,31 +129,27 @@
}
public String getStateStr(Context ctx) {
- int nas = 0;
if (state == 1){
- nas = R.string.处理中;
+ return ctx.getString(R.string.处理中);
+ } else if (state == 2){
+ return ctx.getString(R.string.已提现);
+ } else if (state == 3){
+ return ctx.getString(R.string.提现失败);
+ } else {
+ return "";
}
- if (state == 2){
- nas = R.string.已提现;
- }
- if (state == 3){
- nas = R.string.提现失败;
- }
- return ctx.getString(nas);
}
public int getCorlor(Context ctx) {
- int nas = 0;
if (state == 1){
- nas = R.color.color_2378D2;
+ return ctx.getResources().getColor(R.color.color_2378D2);
+ } else if (state == 2){
+ return ctx.getResources().getColor(R.color.color_5DB03D);
+ } else if (state == 3){
+ return ctx.getResources().getColor(R.color.color_F35646);
+ } else {
+ return ctx.getResources().getColor(R.color.black);
}
- if (state == 2){
- nas = R.color.color_5DB03D;
- }
- if (state == 3){
- nas = R.color.color_F35646;
- }
- return ctx.getResources().getColor(nas);
}
}
}
--
Gitblit v1.7.1