2026年03月31日17:12:34

wjc

2026-03-31 56f5de5eb6c1501175e7a36b10cf3d1b57284b47

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -1376,6 +1376,7 @@
                        jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                        jsonObject.addProperty("homeName", houseIdBean.getHomeName());
                        jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
                        jsonObject.addProperty("powerStationType", houseIdBean.getPowerStationType());
                        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                        uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
                        uniCallBackBaseBean.setData(jsonObject);
@@ -2025,32 +2026,11 @@
                    });
                } else {
                    HdlLogLogic.print("在线升级---", true);
                    //远程升级需要检测在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    //2026年03月31日14:59:10 云端会校验设备状态
                    HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                            if (cloudInverterDeviceBean == null) {
                                uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                                return;
                            }
                            if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
                                uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                                return;
                            }
                            //4:运行
                            HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniSuccessCallback(type, obj, callback);
                                }

                                @Override
                                public void onFailure(HDLException e) {
                                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                                }
                            });

                        public void onSuccess(Boolean obj) {
                            uniSuccessCallback(type, obj, callback);
                        }

                        @Override
@@ -2058,38 +2038,50 @@
                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                        }
                    });
//                    //远程升级需要检测在逆变器有没有连接上云
//                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, plantType, new CloudCallBeak<CloudInverterDeviceBean>() {
//                        @Override
//                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
//                            if (cloudInverterDeviceBean == null) {
//                                uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
//                                return;
//                            }
//                            if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
//                                uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
//                                return;
//                            }
//                            //4:运行
//                            HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
//                                @Override
//                                public void onSuccess(Boolean obj) {
//                                    uniSuccessCallback(type, obj, callback);
//                                }
//
//                                @Override
//                                public void onFailure(HDLException e) {
//                                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                                }
//                            });
//
//                        }
//
//                        @Override
//                        public void onFailure(HDLException e) {
//                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                        }
//                    });
                }
            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级---", true);
                //远程升级需要检测在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                //2026年03月31日14:59:10 云端会校验设备状态
                HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
                            uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                            return;
                        }
                        //4:运行
                        HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniSuccessCallback(type, obj, callback);
                            }

                            @Override
                            public void onFailure(HDLException e) {
                                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                            }
                        });

                    public void onSuccess(Boolean obj) {
                        uniSuccessCallback(type, obj, callback);
                    }

                    @Override
@@ -2097,6 +2089,39 @@
                        uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                    }
                });
//                //远程升级需要检测在逆变器有没有连接上云
//                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, plantType, new CloudCallBeak<CloudInverterDeviceBean>() {
//                    @Override
//                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
//                        if (cloudInverterDeviceBean == null) {
//                            uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
//                            return;
//                        }
//                        if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
//                            uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
//                            return;
//                        }
//                        //4:运行
//                        HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
//                            @Override
//                            public void onSuccess(Boolean obj) {
//                                uniSuccessCallback(type, obj, callback);
//                            }
//
//                            @Override
//                            public void onFailure(HDLException e) {
//                                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                            }
//                        });
//
//                    }
//
//                    @Override
//                    public void onFailure(HDLException e) {
//                        uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                    }
//                });
            }
        });

@@ -2228,6 +2253,7 @@
    private void uniUpgradeGatewayDriver(String type, Object data, DCUniMPJSCallback callback) {

        String homeId = UserConfigManage.getInstance().getHomeId();
        String plantType = getKeyValue("plantType", getKeyValue("data", data));
        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//逆变器设备mac（查找socket）
        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//逆变器设备oid
        String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动版本id
@@ -2279,32 +2305,11 @@
                    });
                } else {
                    HdlLogLogic.print("在线升级---", true);
                    //远程升级需要【检测】在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    //2026年03月31日14:59:10 云端会校验设备状态
                    HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                        @Override
                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                            if (cloudInverterDeviceBean == null) {
                                uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                                return;
                            }
                            if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
                                uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                                return;
                            }
                            //4:运行
                            HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniSuccessCallback(type, obj, callback);
                                }

                                @Override
                                public void onFailure(HDLException e) {
                                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                                }
                            });

                        public void onSuccess(Boolean obj) {
                            uniSuccessCallback(type, obj, callback);
                        }

                        @Override
@@ -2312,38 +2317,50 @@
                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                        }
                    });
//                    //远程升级需要【检测】在逆变器有没有连接上云
//                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, plantType, new CloudCallBeak<CloudInverterDeviceBean>() {
//                        @Override
//                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
//                            if (cloudInverterDeviceBean == null) {
//                                uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
//                                return;
//                            }
//                            if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
//                                uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
//                                return;
//                            }
//                            //4:运行
//                            HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
//                                @Override
//                                public void onSuccess(Boolean obj) {
//                                    uniSuccessCallback(type, obj, callback);
//                                }
//
//                                @Override
//                                public void onFailure(HDLException e) {
//                                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                                }
//                            });
//
//                        }
//
//                        @Override
//                        public void onFailure(HDLException e) {
//                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                        }
//                    });
                }
            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级---", true);
                //远程升级需要【检测】在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                //2026年03月31日14:59:10 云端会校验设备状态
                HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
                            uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                            return;
                        }
                        //4:运行
                        HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniSuccessCallback(type, obj, callback);
                            }

                            @Override
                            public void onFailure(HDLException e) {
                                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                            }
                        });

                    public void onSuccess(Boolean obj) {
                        uniSuccessCallback(type, obj, callback);
                    }

                    @Override
@@ -2351,6 +2368,39 @@
                        uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                    }
                });
//                //远程升级需要【检测】在逆变器有没有连接上云
//                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, plantType, new CloudCallBeak<CloudInverterDeviceBean>() {
//                    @Override
//                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
//                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
//                        if (cloudInverterDeviceBean == null) {
//                            uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
//                            return;
//                        }
//                        if (cloudInverterDeviceBean.getDeviceStatus() == 1 || cloudInverterDeviceBean.getDeviceStatus() == 4) {
//                            uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_not_cloud_upgrade_fails), callback);
//                            return;
//                        }
//                        //4:运行
//                        HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
//                            @Override
//                            public void onSuccess(Boolean obj) {
//                                uniSuccessCallback(type, obj, callback);
//                            }
//
//                            @Override
//                            public void onFailure(HDLException e) {
//                                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                            }
//                        });
//
//                    }
//
//                    @Override
//                    public void onFailure(HDLException e) {
//                        uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
//                    }
//                });
            }
        });

@@ -2844,10 +2894,6 @@
    private void uniGetCurrentHomeLocalAndCloudGatewayList(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String plantType = getKeyValue("plantType", getKeyValue("data", data));
        if (plantType.equals("bms")) {
            plantType = PowerStationType.BMS;
        }
//        plantType = PowerStationType.BMS;//模拟测试
//        UserConfigManage.getInstance().setHomeId(homeId);
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, plantType, new CloudCallBeak<List<GatewayBean>>() {
            @Override