Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 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);
@@ -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);