From a0ad95363367656656136bf204596a1dcb74c217 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 20 六月 2025 16:26:32 +0800
Subject: [PATCH] 2025年06月20日16:26:30
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 16 +++++++++++-----
1 files changed, 11 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 645f92b..114f5e1 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
@@ -47,8 +47,10 @@
holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
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.getOutputActivePower(), UnitType.kW, false));
- holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getTotalElectricityPvToday(), UnitType.kWh, false));
+ 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()));
holder.device_label_location_tv.setText(deviceBean.getHomeAddress());
setTextViewStyle(holder.device_label_state_tv, deviceBean.getDeviceStatus());
holder.itemView.setTag(position);
@@ -118,7 +120,7 @@
}
- textView.setText(text);
+// textView.setText(text);
textView.setBackground(drawable);
@@ -134,19 +136,23 @@
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_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_state_tv);
--
Gitblit v1.8.0