From 5e2e1fc7fc23d5fa035608bc415e9eac73ce2e37 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 13:11:20 +0800
Subject: [PATCH] 2024年11月27日13:11:17
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 0a2c879..3263f89 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
@@ -61,7 +61,7 @@
HouseIdBean houseIdBean = this.mList.get(position);
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
//瑁呮満瀹归噺
- String capacity = mContext.getString(R.string.string_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp);
+ String capacity = HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp, false);
holder.capacityTv.setText(capacity);
//鍙戠數鍔熺巼
holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW));
@@ -160,7 +160,7 @@
private void setTextViewStyle(TextView textView, int state_value) {
String text = mContext.getString(R.string.my_power_station_operation);
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_06b92a);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
if (mPowerStationStatus.equals(PowerStationStatus.All)) {
switch (state_value) {
case 1: {
@@ -170,18 +170,18 @@
case 2: {
text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
}
break;
case 3: {
text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
}
break;
case 4:
case 5: {
text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
}
//5:绂荤嚎鏈夋晠闅淥ffline_fault
break;
@@ -193,13 +193,13 @@
}
} else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) {
text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
} else if (mPowerStationStatus.equals(PowerStationStatus.off)) {
text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
} else if (mPowerStationStatus.equals(PowerStationStatus.connecting)) {
text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
}
textView.setText(text);
textView.setBackground(drawable);
@@ -229,11 +229,11 @@
super(itemView);
homeIconIv = itemView.findViewById(R.id.device_details_image_iv);
homeNameTv = itemView.findViewById(R.id.device_details_name_tv);
- capacityTv = itemView.findViewById(R.id.device_details_sn_tv);
+ capacityTv = itemView.findViewById(R.id.device_details_value_tv);
power_value_tv = itemView.findViewById(R.id.power_value_tv);
day_value_tv = itemView.findViewById(R.id.day_value_tv);
month_value_tv = itemView.findViewById(R.id.month_value_tv);
- stateTv = itemView.findViewById(R.id.fragment_house_list_line_state_tv);
+ stateTv = itemView.findViewById(R.id.device_state_tv);
item_parent_rl = itemView.findViewById(R.id.item_parent_rl);
move_home_ll = itemView.findViewById(R.id.move_ll);
del_home_ll = itemView.findViewById(R.id.del_ll);
--
Gitblit v1.8.0