From a09b4ae5f722fe3b86432ff97ea5f3f5076e12a4 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 24 十二月 2024 20:38:11 +0800 Subject: [PATCH] 2024年12月24日20:38:08 --- app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 de4eba6..906d1c7 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(), 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); @@ -134,7 +136,9 @@ 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:姝e父(杩愯),4:绂荤嚎) @@ -146,7 +150,9 @@ 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