2023年12月21日11:58:13

mac

2023-12-21 f9956641e92cce3ece4cdff523a6e453f159d268

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

@@ -2,8 +2,6 @@


import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.text.TextUtils;
@@ -15,7 +13,6 @@
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.HDLApp;
@@ -23,7 +20,6 @@
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -271,10 +267,18 @@
                    //设备取消驱动,固件下载升级文件
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: {
                        this.uniCancelDownloadingUpgradeFile(data, callback);
//                        HdlThreadLogic.runSubThread(new Runnable() {
//                            @Override
//                            public void run() {
//                                HdlLogLogic.print("当前线程名称取消下载====" + Thread.currentThread().getName());
//                                uniCancelDownloadingUpgradeFile(data, callback);
//                            }
//                        });
                    }
                    break;
                    //设备驱动,固件取消升级
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: {

                        this.uniCancelUpgrade(data, callback);
                    }
                    break;
@@ -458,7 +462,11 @@
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {
                String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                        //不在子线程读流会卡死主线程
                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                if (isBoolean) {
                    HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧固件文件;
@@ -470,9 +478,12 @@
                    HdlLogLogic.print("写入新固件文件到内存成功.", true);
                    uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                } else {
                    HdlLogLogic.print("用户取消下载固件升级文件.", true);
                    uniCallbackData(null, -2, "用户取消下载驱动升级文件", callback);
                            HdlLogLogic.print("下载固件升级文件失败.", true);
                            uniCallbackData(null, -2, "下载固件升级文件失败", callback);
                }
                    }
                });

            }

            @Override
@@ -703,7 +714,12 @@
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {

                String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                        //不在子线程读流会卡死主线程
                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
                if (isBoolean) {
                    HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧驱动文件;
@@ -714,10 +730,13 @@
                    HdlLogLogic.print("写入新驱动文件到内存成功.", true);
                    uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                } else {
                    HdlLogLogic.print("用户取消下载驱动升级文件.", true);
                    uniCallbackData(null, -2, "用户取消下载驱动升级文件", callback);
                            HdlLogLogic.print("下载驱动升级文件失败.", true);
                            uniCallbackData(null, -2, "下载驱动升级文件失败", callback);
                }
            }
                });

            }

            @Override
            public void onFailure(HDLException e) {