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

@@ -44,11 +44,14 @@
    public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
        CloudInverterDeviceBean deviceBean = this.mList.get(position);


        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 +121,7 @@


        }
        textView.setText(text);
//        textView.setText(text);
        textView.setBackground(drawable);


@@ -134,19 +137,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);