2024年05月15日15:31:27

mac

2024-05-15 9f1321355642cd400b1d1aba94d216bfbea27a66

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

@@ -536,12 +536,10 @@
        //-100:没有数据;-101:没有md5秘钥;-102:md5秘钥不对;-103:有异常;
        if (zipData == null) {
            this.eventBusPost(fileFullPath, driver, -100, HDLApp.getInstance().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
            HdlLogLogic.print("拉不到云端升级文件数据(-100)", true);
            return false;
        }
        if (TextUtils.isEmpty(md5)) {
            this.eventBusPost(fileFullPath, driver, -101, HDLApp.getInstance().getString(R.string.exception_failed_to_obtain_the_md5_key_of_the_upgrade_file_on_the_cloud));
            HdlLogLogic.print("拿不到云端上升级文件md5秘钥(-101)", true);
            return false;
        }
        InputStream is = null;
@@ -555,7 +553,6 @@
            long total = zipData.contentLength();
            if (total == 0) {
                this.eventBusPost(fileFullPath, driver, -102, HDLApp.getInstance().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
                HdlLogLogic.print("拉不到云端升级文件数据(-102)", true);
                return false;
            }
            fos = new FileOutputStream(file);
@@ -563,7 +560,6 @@
            while ((len = is.read(buf)) != -1) {
                if (this.stopDownload) {
                    this.eventBusPost(fileFullPath, driver, -108, HDLApp.getInstance().getString(R.string.exception_the_user_cancels_downloading_the_upgrade_file));
                    HdlLogLogic.print("用户取消下载升级文件(-108)", true);
                    fos.flush();
                    fos.close();
                    is.close();
@@ -576,36 +572,33 @@
                int progress = (int) (100 * sum * 1.0f / total);
                if (sum != total) {
                    //不等于100都要报,等于100处理整块逻辑完之后再报100;
                    this.eventBusPost(fileFullPath, driver, progress, "正常上报进度值->" + progress);
                    HdlLogLogic.print("正常上报进度值->" + progress, true);
                    this.eventBusPost(fileFullPath, driver, progress, "正常上报进度值---" + progress);
                }
            }
            fos.flush();
            fos.close();
            is.close();
            byte[] bytes = FileUtils.readFileToByteArray(file);
            byte[] bytes = HdlFileLogic.getInstance().readFileByte(fileFullPath);
//            byte[] bytes = FileUtils.readFileToByteArray(file);//这个方法不兼用android 6.0
            //todo 下载文件需要解密之后再进行md5去做比对
            byte[] decrypt = AesUtils.decrypt(bytes);
            if (decrypt == null) {
                this.eventBusPost(fileFullPath, driver, -105, HDLApp.getInstance().getString(R.string.exception_failed_to_decrypt_the_upgrade_aes_file));
                HdlLogLogic.print("升级文件aes解密失败(-105)", true);
                return false;
            }
            String fileMD5 = Md5Utils.encodeMD5(decrypt);
            if (TextUtils.isEmpty(fileMD5)) {
                this.eventBusPost(fileFullPath, driver, -106, HDLApp.getInstance().getString(R.string.exception_failed_to_generate_md5_for_the_upgrade_file));
                HdlLogLogic.print("升级文件生成md5失败失败(-106)", true);
                return false;
            }
            if (!md5.equals(fileMD5)) {
                this.eventBusPost(fileFullPath, driver, -107, HDLApp.getInstance().getString(R.string.exception_description_failed_to_compare_the_md5_of_the_upgrade_file));
                HdlLogLogic.print("升级文件md5比对失败(-107)", true);
                return false;
            }
            //todo 注意:解密之后，要重新写数据;
            FileUtils.writeByteArrayToFile(file, decrypt, false);
            HdlFileLogic.getInstance().writeFile(fileFullPath, decrypt);
//            FileUtils.writeByteArrayToFile(file, decrypt, false);//这个方法不兼用android 6.0
            this.eventBusPost(fileFullPath, driver, 100, HDLApp.getInstance().getString(R.string.exception_the_upgrade_file_is_downloaded));
            HdlLogLogic.print("升级文件下载完成.", true);
            return true;
        } catch (Exception e) {
            this.eventBusPost(fileFullPath, driver, -103, e.getMessage());