2025年01月13日17:34:58

wjc

2025-01-13 3c18f8e5f2d54c6cb2e4d2e0e5fc538a6a2ea188

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

@@ -17,6 +17,7 @@
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -142,13 +143,19 @@
     * 前提条件:设备自动上报oid信息给云端
     *
     * @param deviceOidId oid云端id
     * @param oid         设备oid
     * @param homeId      电站id
     * @param callBack    -
     */
    public void getCurrentDeviceFirmwares(String deviceOidId, CloudCallBeak<List<DeviceFirmwareBean>> callBack) {
    public void getCurrentDeviceFirmwares(String deviceOidId, String oid, String homeId, CloudCallBeak<List<DeviceFirmwareBean>> callBack) {
        String requestUrl = HttpApi.POST_OTA_GET_DeviceFirmwares;
        JsonObject json = new JsonObject();
        json.addProperty("deviceOidId", deviceOidId);
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        if (!TextUtils.isEmpty(deviceOidId)) {
            json.addProperty("deviceOidId", deviceOidId);
        } else {
            json.addProperty("oid", oid);
        }
        json.addProperty("homeId", homeId);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String json) {
@@ -262,12 +269,13 @@
     * 前提条件:设备自动上报oid信息给云端
     *
     * @param oid      网关设备oid
     * @param homeId   电站id
     * @param callBack -
     */
    public void getCurrentGatewayDrivers(String oid, CloudCallBeak<List<GatewayDriverBean>> callBack) {
    public void getCurrentGatewayDrivers(String oid, String homeId, CloudCallBeak<List<GatewayDriverBean>> callBack) {
        String requestUrl = HttpApi.POST_OTA_GET_GatewayDrivers;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
        json.addProperty("homeId", homeId);
        json.addProperty("oid", oid);

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -534,13 +542,11 @@
        this.stopDownload = false;
        //-100:没有数据;-101:没有md5秘钥;-102:md5秘钥不对;-103:有异常;
        if (zipData == null) {
            this.eventBusPost(fileFullPath, driver, -100, "拉不到云端升级文件数据");
            HdlLogLogic.print("拉不到云端升级文件数据(-100)", true);
            this.eventBusPost(fileFullPath, driver, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
            return false;
        }
        if (TextUtils.isEmpty(md5)) {
            this.eventBusPost(fileFullPath, driver, -101, "拿不到云端上升级文件md5秘钥");
            HdlLogLogic.print("拿不到云端上升级文件md5秘钥(-101)", true);
            this.eventBusPost(fileFullPath, driver, -101, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_obtain_the_md5_key_of_the_upgrade_file_on_the_cloud));
            return false;
        }
        InputStream is = null;
@@ -553,16 +559,14 @@
            is = zipData.byteStream();
            long total = zipData.contentLength();
            if (total == 0) {
                this.eventBusPost(fileFullPath, driver, -102, "拉不到云端升级文件数据");
                HdlLogLogic.print("拉不到云端升级文件数据(-102)", true);
                this.eventBusPost(fileFullPath, driver, -102, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
                return false;
            }
            fos = new FileOutputStream(file);
            long sum = 0;
            while ((len = is.read(buf)) != -1) {
                if (this.stopDownload) {
                    this.eventBusPost(fileFullPath, driver, -108, "用户取消下载升级文件.");
                    HdlLogLogic.print("用户取消下载升级文件(-108)", true);
                    this.eventBusPost(fileFullPath, driver, -108, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_the_user_cancels_downloading_the_upgrade_file));
                    fos.flush();
                    fos.close();
                    is.close();
@@ -575,36 +579,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);
            //下载文件需要解密之后再进行md5去做比对
            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, "升级文件aes解密失败.");
                HdlLogLogic.print("升级文件aes解密失败(-105)", true);
                this.eventBusPost(fileFullPath, driver, -105, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_decrypt_the_upgrade_aes_file));
                return false;
            }
            String fileMD5 = Md5Utils.encodeMD5(decrypt);
            if (TextUtils.isEmpty(fileMD5)) {
                this.eventBusPost(fileFullPath, driver, -106, "升级文件生成md5失败失败.");
                HdlLogLogic.print("升级文件生成md5失败失败(-106)", true);
                this.eventBusPost(fileFullPath, driver, -106, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_generate_md5_for_the_upgrade_file));
                return false;
            }
            if (!md5.equals(fileMD5)) {
                this.eventBusPost(fileFullPath, driver, -107, "升级文件md5比对失败.");
                HdlLogLogic.print("升级文件md5比对失败(-107)", true);
                this.eventBusPost(fileFullPath, driver, -107, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_description_failed_to_compare_the_md5_of_the_upgrade_file));
                return false;
            }
            //todo 注意:解密之后，要重新写数据;
            FileUtils.writeByteArrayToFile(file, decrypt, false);
            this.eventBusPost(fileFullPath, driver, 100, "升级文件下载完成.");
            HdlLogLogic.print("升级文件下载完成.", true);
            HdlFileLogic.getInstance().writeFile(fileFullPath, decrypt);
//            FileUtils.writeByteArrayToFile(file, decrypt, false);//这个方法不兼用android 6.0
            this.eventBusPost(fileFullPath, driver, 100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_the_upgrade_file_is_downloaded));
            return true;
        } catch (Exception e) {
            this.eventBusPost(fileFullPath, driver, -103, e.getMessage());
@@ -658,7 +659,6 @@

    //自定义上报下载驱动或固件进度主题
    public static final String localDownloadProgress = "cloud/download/progress/up";



    public static final String driver_type = "driver";