From 6666e651e35ef6ae079247da975c58098111c13c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:50:25 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index ec4bed3..43a2774 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -156,6 +156,7 @@
}
break;
+ case 5:
case 2: {
text = mContext.getString(R.string.my_power_station_off_line);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
@@ -166,17 +167,18 @@
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
}
break;
- case 4: {
+ case 4:
+ {
text = mContext.getString(R.string.my_power_station_malfunction);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
}
//5:绂荤嚎鏈夋晠闅淥ffline_fault
break;
- case 5: {
- text = mContext.getString(R.string.Offline_fault);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
- }
- break;
+// case 5: {
+// text = mContext.getString(R.string.Offline_fault);
+// drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+// }
+// break;
}
textView.setText(text);
textView.setBackground(drawable);
--
Gitblit v1.8.0