From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
index c8c6074..611574c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
@@ -45,10 +45,12 @@
CloudInverterDeviceBean deviceBean = this.mList.get(position);
holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
- holder.device_details_sn_tv.setText("SN:"+deviceBean.getOsn());
+ holder.device_details_sn_tv.setText(deviceBean.getOsn());
holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc());
- holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kW));
- holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kWh));
+ holder.device_label_power_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getOutputActivePower(), 1000));
+ holder.device_label_power_unit.setText(HdlCommonLogic.convertUnit(deviceBean.getOutputActivePower(), UnitType.kW));
+ holder.device_label_day_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getTotalElectricityPvToday()));
+ holder.device_label_day_unit.setText(HdlCommonLogic.convertUnit(deviceBean.getOutputActivePower(), UnitType.kWh));
holder.device_label_location_tv.setText(deviceBean.getHomeAddress());
setTextViewStyle(holder.device_label_state_tv, deviceBean.getDeviceStatus());
holder.itemView.setTag(position);
@@ -94,16 +96,16 @@
*/
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);
switch (state_value) {
case 1: {
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 2: {
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);
}
break;
case 3: {
@@ -112,13 +114,13 @@
break;
case 4: {
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;
}
- textView.setText(text);
+// textView.setText(text);
textView.setBackground(drawable);
@@ -134,22 +136,26 @@
public TextView device_details_sn_tv;//mac
public TextView device_label_run_state_value_tv;//璁惧杩愯鐘舵��
public TextView device_label_power_value_tv;//鏈夊姛鍔熺巼
+ public TextView device_label_power_unit;//鏈夊姛鍔熺巼鍗曚綅
public TextView device_label_day_value_tv;//褰撴棩鍙戠數閲�
+ public TextView device_label_day_unit;//褰撴棩鍙戠數閲忓崟浣�
public TextView device_label_location_tv;//鐢电珯鍦板潃
public TextView device_label_state_tv;//璁惧鐘舵��(1:杩炴帴涓�,2:鏁呴殰,3:姝ｅ父(杩愯),4:绂荤嚎)
public MyViewHolder(@NonNull View itemView) {
super(itemView);
- device_icon_iv = itemView.findViewById(R.id.device_details_image_iv);
- homeNameTv = itemView.findViewById(R.id.device_details_name_tv);
- device_details_sn_tv = itemView.findViewById(R.id.device_details_sn_tv);
+ device_icon_iv = itemView.findViewById(R.id.home_image_iv);
+ homeNameTv = itemView.findViewById(R.id.home_name_tv);
+ device_details_sn_tv = itemView.findViewById(R.id.device_details_value_tv);
device_label_run_state_value_tv = itemView.findViewById(R.id.device_label_run_state_value_tv);
device_label_power_value_tv = itemView.findViewById(R.id.device_label_power_value_tv);
+ device_label_power_unit = itemView.findViewById(R.id.device_label_power_unit);
device_label_day_value_tv = itemView.findViewById(R.id.device_label_day_value_tv);
+ device_label_day_unit = itemView.findViewById(R.id.device_label_day_unit);
device_label_location_tv = itemView.findViewById(R.id.device_label_location_tv);
- device_label_state_tv = itemView.findViewById(R.id.device_label_state_tv);
+ device_label_state_tv = itemView.findViewById(R.id.device_state_tv);
}
}
--
Gitblit v1.8.0