From c4ae4589c6c001329ebb731589b209e8ddcbf7ca Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 24 三月 2026 16:03:59 +0800
Subject: [PATCH] 2026年03月24日16:03:57
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 79cab54..8e395b6 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
@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.PowerStationType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -45,15 +46,26 @@
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
CloudInverterDeviceBean deviceBean = this.mList.get(position);
holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
- if(UserConfigManage.getInstance().isArabicLanguage()) {
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
holder.device_details_sn_tv.setText(":SN");
}
holder.device_details_sn_value_tv.setText(deviceBean.getOsn());
holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc());
- holder.device_label_power_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getOutputActivePower(),UnitType.kW));
- holder.device_label_power_unit.setText(HdlCommonLogic.convertKWUnit(deviceBean.getOutputActivePower()));
- holder.device_label_day_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getTotalElectricityPvToday(),UnitType.kWh));
- holder.device_label_day_unit.setText(HdlCommonLogic.convertKWHUnit(deviceBean.getOutputActivePower()));
+ if (deviceBean.getDeviceType().equals(PowerStationType.BMS)) {
+ holder.device_label_power_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getChargeToday(), UnitType.kW));
+ holder.device_label_power_unit.setText(HdlCommonLogic.convertKWUnit(deviceBean.getChargeToday()));
+ holder.device_label_power_type_tv.setText(mContext.getString(R.string.chargeToday));
+ holder.device_label_day_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getDischargeToday(), UnitType.kWh));
+ holder.device_label_day_unit.setText(HdlCommonLogic.convertKWHUnit(deviceBean.getDischargeToday()));
+ holder.device_label_day_type_tv.setText(mContext.getString(R.string.dischargeToday));
+ } else {
+ holder.device_label_power_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getOutputActivePower(), UnitType.kW));
+ holder.device_label_power_unit.setText(HdlCommonLogic.convertKWUnit(deviceBean.getOutputActivePower()));
+ holder.device_label_power_type_tv.setText(mContext.getString(R.string.active_power));
+ holder.device_label_day_value_tv.setText(HdlCommonLogic.convertDoubleValue(deviceBean.getTotalElectricityPvToday(), UnitType.kWh));
+ holder.device_label_day_unit.setText(HdlCommonLogic.convertKWHUnit(deviceBean.getOutputActivePower()));
+ holder.device_label_day_type_tv.setText(mContext.getString(R.string.day_power_generation));
+ }
holder.device_label_location_tv.setText(deviceBean.getHomeAddress());
setTextViewStyle(holder.device_label_state_tv, deviceBean.getDeviceStatus());
holder.itemView.setTag(position);
@@ -141,8 +153,10 @@
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_power_type_tv;//鏈夊姛鍔熺巼鏂囨湰
public TextView device_label_day_value_tv;//褰撴棩鍙戠數閲�
public TextView device_label_day_unit;//褰撴棩鍙戠數閲忓崟浣�
+ public TextView device_label_day_type_tv;//褰撴棩鍙戠數閲忔枃鏈�
public TextView device_label_location_tv;//鐢电珯鍦板潃
public TextView device_label_state_tv;//璁惧鐘舵��(1:杩炴帴涓�,2:鏁呴殰,3:姝ｅ父(杩愯),4:绂荤嚎)
@@ -156,8 +170,10 @@
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_power_type_tv = itemView.findViewById(R.id.device_label_power_type_tv);
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_day_type_tv = itemView.findViewById(R.id.device_label_day_type_tv);
device_label_location_tv = itemView.findViewById(R.id.device_label_location_tv);
device_label_state_tv = itemView.findViewById(R.id.device_state_tv);
--
Gitblit v1.8.0