From 0118ba9749c850ba32b789011883c353a735f1fb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 四月 2025 19:25:33 +0800
Subject: [PATCH] 2025年04月22日19:25:13 优化功率单位转化

---
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 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 a445f25..d2d9071 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,17 +61,18 @@
         HouseIdBean houseIdBean = this.mList.get(position);
         holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
         //瑁呮満瀹归噺
-        String capacity = HdlCommonLogic.getBigDecimal(houseIdBean.getInstalledCapacity()).toString();
-        holder.capacityTv.setText(capacity);
+        holder.capacityTv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
+        holder.capacity_kwp_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
+
         //鍙戠數鍔熺巼
-        holder.power_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getPower()));
-        holder.power_kw_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getPower(), UnitType.kW));
+        holder.power_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getPower(), UnitType.kW));
+        holder.power_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getPower()));
         //褰撴棩鍙戠數閲�
-        holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
-        holder.day_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getTodayElectricity(), UnitType.kWh));
+        holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity(), UnitType.kWh));
+        holder.day_kwh_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity()));
         //鐢垫睜瀹归噺
-        holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity()));
-        holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getBatteryCapacity(), UnitType.kWh));
+        holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(), UnitType.kWh));
+        holder.month_kwh_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));
 
         holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
         holder.item_parent_rl.setTag(position);
@@ -219,6 +220,7 @@
         public ImageView homeIconIv;//浣忓畢鍥剧墖
         public TextView homeNameTv;//浣忓畢鍚嶇О
         public TextView capacityTv;//瑁呮満瀹归噺
+        public TextView capacity_kwp_unit;//瑁呮満瀹归噺鍗曚綅
         public TextView power_value_tv;//鍙戠數鍔熺巼
         public TextView power_kw_unit;//鍙戠數鍔熺巼鍗曚綅
         public TextView day_value_tv;//褰撴棩鍙戠數閲�
@@ -237,6 +239,7 @@
             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_value_tv);
+            capacity_kwp_unit = itemView.findViewById(R.id.capacity_kwp_unit);
             power_value_tv = itemView.findViewById(R.id.power_value_tv);
             power_kw_unit = itemView.findViewById(R.id.power_kw_unit);
             day_value_tv = itemView.findViewById(R.id.day_value_tv);

--
Gitblit v1.8.0