Merge branch '1.2.0' into 1.5.1_google

wjc

2025-04-30 f91ef956cf482ed4ce0885dc47794b783c20c415

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java

@@ -48,10 +48,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.convertDoubleValue(deviceBean.getOutputActivePower(), UnitType.kW));
        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.getTotalElectricityPvToday()));
        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);