2023年12月20日17:24:20

mac

2023-12-20 0f91b37f7711481b9671409d0de08873d77060eb

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

@@ -305,9 +305,9 @@
                    break;
                }
            }
            HdlLogLogic.print("uni===原生接收uni发来的数据===大类->" + topic + "\r\n" + data, false);
            HdlLogLogic.print("uni===原生接收uni发来的数据===大类->" + topic + "\r\n" + data, true);
        } catch (Exception e) {
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + e.getMessage(), false);
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + e.getMessage(), true);
        }

    }
@@ -465,7 +465,14 @@
                } else {
                    HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//下载失败，删除不完整固件文件;
                }

                if (isBoolean) {
                HdlLogLogic.print("写入新固件文件到内存成功.", true);
                    uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                } else {
                    HdlLogLogic.print("用户取消下载固件升级文件.", true);
                    uniCallbackData(null, -2, "用户取消下载驱动升级文件", callback);
                }
            }

            @Override
@@ -490,15 +497,14 @@
        String module = "FW#" + imageId;

        //升级本地优先->云端升级
        boolean isLocalConnect = HdlDeviceLogic.getInstance().isLocalConnect(deviceMac);
        if (isLocalConnect) {
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
            //本地
            //1,建立本地服务；
            //2,告诉网关手机ip和端口；
            //实例化 获取ip 地址
            if (HdlOtaLogic.getInstance().mServiceStart) {
                HdlOtaLogic.getInstance().unLocalService();
            }
            HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                @Override
                public void onServiceConnected(ComponentName name, IBinder service) {
@@ -532,7 +538,6 @@
                    uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                }
            });

        } else {
            //远程升级需要检测在逆变器有没有连接上云
            HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
@@ -567,8 +572,47 @@
                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                }
            });
                }
            }

            @Override
            public void onFailure(HDLException e) {
                //远程升级需要检测在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().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) {
                                uniCallbackData(obj, callback);
                            }

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

        }

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

    }

    /**
@@ -666,7 +710,13 @@
                } else {
                    HdlFileLogic.getInstance().deleteFile(drivePathFileName);//下载失败，删除不完整驱动文件;
                }
                if (isBoolean) {
                HdlLogLogic.print("写入新驱动文件到内存成功.", true);
                    uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                } else {
                    HdlLogLogic.print("用户取消下载驱动升级文件.", true);
                    uniCallbackData(null, -2, "用户取消下载驱动升级文件", callback);
                }
            }

            @Override
@@ -690,8 +740,10 @@
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String module = driverCode + "#" + imageId;
        //升级本地优先->云端升级
        boolean isLocalConnect = HdlDeviceLogic.getInstance().isLocalConnect(deviceMac);
        if (isLocalConnect) {
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
            //本地
            //1,建立本地服务；
            // 2，告诉网关手机ip和端口；
@@ -763,8 +815,47 @@
                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                }
            });
                }
            }

            @Override
            public void onFailure(HDLException e) {
                //远程升级需要【检测】在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().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) {
                                uniCallbackData(obj, callback);
                            }

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

        }

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

    }

    /**
@@ -772,6 +863,7 @@
     */
    private void uniCancelDownloadingUpgradeFile(Object data, DCUniMPJSCallback callback) {
        HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
        uniCallbackData(null, 0, "取消下载成功.", callback);
    }

    /**