Merge branch '1.2.0' into 1.5.1_google

wjc

2025-04-30 f91ef956cf482ed4ce0885dc47794b783c20c415

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

@@ -61,17 +61,21 @@
        HouseIdBean houseIdBean = this.mList.get(position);
        holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
        //装机容量
        String capacity = HdlCommonLogic.getBigDecimal(houseIdBean.getInstalledCapacity()).toString();
        holder.capacityTv.setText(capacity);
        //发电功率
        holder.power_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getPower()));
        holder.power_kw_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getPower(), UnitType.kW));
        //当日发电量
        holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
        holder.day_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getTodayElectricity(), UnitType.kWh));
        //当月发电量
        holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getMonthElectricity()));
        holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getMonthElectricity(), UnitType.kWh));
        holder.capacityTv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
        holder.capacity_kwp_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));

        //组串容量(创建电站时输入的组串容量)
        holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
        holder.pv_kw_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
        //当日发电
        holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity(), UnitType.kWh));
        holder.generation_today_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity()));
        //逆变器额定功率（单个逆变器额定功率*逆变器数量）
        holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower(), UnitType.kW));
        holder.output_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getInvPower()));
        //电池能量（容量*电池数量）
        holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(), UnitType.kWh));
        holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));

        holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
        holder.item_parent_rl.setTag(position);
@@ -101,8 +105,9 @@
                }
            }
        });
        holder.del_home_ll.setVisibility(View.GONE);
        if (houseIdBean.getDeliverStatus().equals("UNDELIVERED")) {
        holder.home_del_ll.setVisibility(View.GONE);

        if (houseIdBean.getDebugStatus().equals(DebugStatus.Debugging)) {
            //未交付完要显示删除按钮
            holder.del_home_ll.setVisibility(View.VISIBLE);
        }
@@ -159,7 +164,7 @@
     *                    设备在线 但是当前处于故障 状态：故障
     *                    设备在线（有上报过数据，没有故障）  状态：在线
     *                    设备离线 状态：离线
     * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障)
     * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障,6:部分离线)
     */
    private void setTextViewStyle(TextView textView, int state_value) {

@@ -172,7 +177,8 @@
                }
                break;

                case 2: {
                case 2:
                case 6: {
                    text = mContext.getString(R.string.my_power_station_off_line);
                    drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
                }
@@ -219,6 +225,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 +244,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);
@@ -261,4 +269,4 @@

    }

}
}