2023年11月23日21:28:21

mac

2023-11-23 3d9a11739a3972deea2aa45f2b4dd219740ffa70

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

@@ -88,11 +88,16 @@
    private Intent intentServer = null;

    private ServiceConnection mServiceConnection = null;
    /**
     * 服务是否开启 true=开启
     */
    public boolean mServiceStart = false;

    /**
     * true表示终止下载升级文件(用户行为)
     */
    private boolean stopDownload = false;


    //region -----固件升级---------

@@ -250,59 +255,6 @@

    }

    /**
     * 向云端获取【设备固件】升级包下载地址
     *
     * @param firmwareVersionId 固件版本Id
     */
    public void getDeviceFirmwareDownloadUrl(String firmwareVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
//        "protocolType":"bus",
//                "deviceModel":"029B9988",
//                "firmwareNameEn":"核心层",
//                "firmwareNameCn":"核心层",
//                "imageId":"12345678",
//                "version":"V01.02.20"
        String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
        JsonObject json = new JsonObject();
        json.addProperty("firmwareVersionId", firmwareVersionId);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String json) {

                if (TextUtils.isEmpty(json)) {
                    if (callBack != null) {
                        callBack.onSuccess(new DownloadUrlBean());
                    }
                    return;
                }
                Gson gson = new Gson();
                Type typeOfT = new TypeToken<DownloadUrlBean>() {
                }.getType();
                DownloadUrlBean downloadUrlBean = gson.fromJson(json, typeOfT);
                if (callBack != null) {
                    callBack.onSuccess(downloadUrlBean);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (callBack != null) {
                    callBack.onFailure(e);
                }
            }
        });
    }

    /**
     * 向云端获取【设备固件】下载升级文件
     *
     * @param downloadUrl 云端固件地址
     */
    public void getDeviceFirmwareDownloadFile(String downloadUrl, CloudCallBeak<DownloadUrlBean> callBack) {
        String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
        JsonObject json = new JsonObject();

    }

    //endregion

@@ -394,15 +346,9 @@

    }

    /**
     * 设置终止下载文件指令
     */
    public void setStopDriversDownload() {
        this.stopDownload = true;
    }

    /**
     * 云端发起【设备驱动】升级OTA指令
     * 云端发起【设备驱动升级】OTA指令
     *
     * @param oid             网关设备oid
     * @param driverVersionId 驱动版本id
@@ -431,12 +377,22 @@
        });
    }


    //endregion

    /**
     * 向云端获取【设备驱动】下载升级文件
     * 设置终止下载文件指令
     */
    public void setStopDriversDownload() {
        this.stopDownload = true;
    }

    /**
     * 向云端获取【设备升级文件(驱动,固件)下载】升级文件
     *
     * @param downloadUrl 云端驱动地址
     */
    public void getDeviceDriverDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
    public void getDeviceUpgradeDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
        HttpClient.getInstance().downLoadFile(downloadUrl, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody s) {
@@ -456,9 +412,6 @@


    }


    //endregion

    /**
     * 本地升级包推送(告诉网关下载升级包地址等信息)
@@ -514,6 +467,7 @@
        intentServer = new Intent();
        intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
        this.mServiceConnection = serviceConnection;
        this.mServiceStart = true;
        //启动服务监听
        HDLApp.getInstance().bindService(intentServer, serviceConnection, Context.BIND_AUTO_CREATE);
    }
@@ -524,6 +478,7 @@
    public void unLocalService() {
        if (intentServer != null && this.mServiceConnection != null) {
            HDLApp.getInstance().unbindService(this.mServiceConnection);
            this.mServiceStart = false;
        }
    }

@@ -538,11 +493,11 @@
        String driver = driver_type;
        //-100:没有数据;-101:没有md5秘钥;-102:md5秘钥不对;-103:有异常;
        if (zipData == null) {
            this.eventBusPost(fullPath,driver, -100, "没有数据");
            this.eventBusPost(fullPath, driver, -100, "没有数据");
            return false;
        }
        if (TextUtils.isEmpty(md5)) {
            this.eventBusPost(fullPath,driver, -101, "没有md5秘钥");
            this.eventBusPost(fullPath, driver, -101, "没有md5秘钥");
            return false;
        }
        InputStream is = null;
@@ -555,7 +510,7 @@
            is = zipData.byteStream();
            long total = zipData.contentLength();
            if (total == 0) {
                this.eventBusPost(fullPath,driver, -100, "没有数据");
                this.eventBusPost(fullPath, driver, -100, "没有数据");
                return false;
            }
            fos = new FileOutputStream(file);
@@ -567,7 +522,7 @@
                int progress = (int) (100 * sum * 1.0f / total);
                if (sum != total) {
                    //不等于100都要报,等于100处理整块逻辑完之后再报100;
                    this.eventBusPost(fullPath,driver, progress, "正常上报");
                    this.eventBusPost(fullPath, driver, progress, "正常上报");
                }
            }
            fos.flush();
@@ -576,19 +531,19 @@
            byte[] bytes = FileUtils.readFileToByteArray(file);
            String fileMD5 = Md5Utils.encodeMD5(bytes);
            if (TextUtils.isEmpty(fileMD5)) {
                this.eventBusPost(fullPath,driver, -106, "文件生成md5失败.");
                this.eventBusPost(fullPath, driver, -106, "文件生成md5失败.");
                return false;
            }
            if (!md5.equals(fileMD5)) {
                this.eventBusPost(fullPath,driver, -107, "md5比对失败.");
                this.eventBusPost(fullPath, driver, -107, "md5比对失败.");
                return false;
            }
            this.eventBusPost(fullPath,driver, 100, "下载完成.");
            this.eventBusPost(fullPath, driver, 100, "下载完成.");


            return true;
        } catch (Exception e) {
            this.eventBusPost(fullPath,driver, -103, e.getMessage());
            this.eventBusPost(fullPath, driver, -103, e.getMessage());
            e.printStackTrace();
        }
        return false;
@@ -691,8 +646,8 @@
            BaseEventBus baseEventBus = new BaseEventBus();
            baseEventBus.setTopic(localDownloadProgress);
            Progress progress = new Progress();
            progress.step = progressValue;
            progress.describe = describe;
            progress.step = -108;
            progress.describe = "用户取消下载.";
            baseEventBus.setType(type);
            baseEventBus.setData(progress);
            EventBus.getDefault().post(baseEventBus);