2023年11月23日21:28:21

mac

2023-11-23 3d9a11739a3972deea2aa45f2b4dd219740ffa70

2023年11月23日21:28:21

1，升级已经全部做好(在线，离线)
离线等待网关实现在联调；

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

@@ -119,8 +119,20 @@
     * @return 全路径
     */
    public String getDrivePathFileName(String driverCode, String version) {
        String driverFileName = driverCode + "_" + version + ".zip";
        return HdlFileLogic.getInstance().getDriveRootPath() + "/" + driverFileName;
        String fileName = driverCode + "_" + version + ".zip";
        return HdlFileLogic.getInstance().getDriveRootPath() + "/" + fileName;
    }

    /**
     * 获取固件升级文件全路径
     *
     * @param oid     -
     * @param version 驱动版本
     * @return 全路径
     */
    public String getFirmwarePathFileName(String oid, String version) {
        String fileName = oid + "_" + version + ".zip";
        return HdlFileLogic.getInstance().getFirmwareRootPath() + "/" + fileName;
    }

    //endregion

 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);

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

@@ -272,6 +272,16 @@
                        this.uniCancelDownloadingUpgradeFile(data, callback);
                    }
                    break;
                    //打开服务
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_OPEN_SERVICE: {
                        this.uniOpenService(data, callback);
                    }
                    break;
                    //关闭服务
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_CLOSE_SERVICE: {
                        this.uniCloseService(data, callback);
                    }
                    break;

                }
            }
@@ -345,7 +355,7 @@
     * 前提条件:设备自动上报oid信息给云端
     */
    private void uniGetCurrentDeviceFirmwares(Object data, DCUniMPJSCallback callback) {
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
            @Override
            public void onSuccess(List<DeviceFirmwareBean> obj) {
@@ -409,19 +419,32 @@
    }

    /**
     * 向云端发起【设备固件】下载指令
     * 向云端发起【设备固件下载】指令
     */
    private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//设备id
        String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//固件版本id
        HdlOtaLogic.getInstance().getDeviceFirmwareDownloadUrl(firmwareVersionId, new CloudCallBeak<DownloadUrlBean>() {
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//设备oid
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//驱动镜像id
        String version = getKeyValue("version", getKeyValue("data", data));//驱动版本
        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//储存在本地驱动文件路径
        String url = getKeyValue("url", getKeyValue("data", data));//云端上文件地址
        String md5 = getKeyValue("md5", getKeyValue("data", data));//云端上文件MD5
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(DownloadUrlBean obj) {
                uniCallbackData(obj, callback);
            public void onSuccess(ResponseBody responseBody) {
                String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, version);
                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                if (isBoolean) {
                    HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧文件;
                } else {
                    HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//下载失败删除不完成数据;
                }
                HdlLogLogic.print("写入新固件文件到内存成功.", false);
            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("下载固件文件到内存失败.", false);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
@@ -431,30 +454,61 @@
     * 向云端发起【设备固件】升级OTA指令
     */
    private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {

        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//网关设备mac（查找socket）
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//设备id
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//设备id
        String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//固件版本id

        String version = getKeyValue("version", getKeyValue("data", data));//驱动版本
        String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//云端上文件MD5

        //升级本地优先->云端升级
        boolean isLocalConnect = HdlDeviceLogic.getInstance().isLocalConnect(deviceMac);
        if (isLocalConnect) {
            //本地
            //1,建立本地服务；
            // 2，告诉网关手机ip和端口；
            //2,告诉网关手机ip和端口；
            //实例化 获取ip 地址
            HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                @Override
                public void onServiceConnected(ComponentName name, IBinder service) {
                    //本地升级固件文件路径
                    String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, version);
                    String data = HdlFileLogic.getInstance().readFile(firmwarePathFileName);
                    String md5 = HDLMD5Utils.encodeMD5(data);//网关固件需要
                    //升级固件文件地址
                    String upgradeFileLocalPathUrl = AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;
                    //通知给网关升级固件文件地址等信息
                    HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, hardwareModel, version, data.length() + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                        @Override
                        public void onSuccess(String obj) {
                            HdlLogLogic.print("通知给网关升级固件文件地址成功.", false);
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("通知给网关升级固件文件地址失败,无法升级.", false);
                            uniCallbackData(null, -2, "通知给网关升级固件文件地址失败,无法升级,", callback);
                        }
                    });
                }

                @Override
                public void onServiceDisconnected(ComponentName name) {
                    uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                }
            });

        } else {
            //远程升级需要检测在逆变器有没有连接上云
            HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                @Override
                public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                    //1:待机,2:连接中,3:故障,4:运行,5:离线,6:逆变器连不上云(自定义)
                    //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                    if (cloudInverterDeviceBean == null) {
                        uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                        return;
                    }
                    if (cloudInverterDeviceBean.getDeviceStatus() != 4) {
                    if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                        uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), getDeviceStatusString(cloudInverterDeviceBean.getDeviceStatus()), callback);
                        return;
                    }
@@ -480,8 +534,6 @@
            });

        }


    }

    /**
@@ -569,7 +621,7 @@
        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//储存在本地驱动文件路径
        String url = getKeyValue("url", getKeyValue("data", data));//云端上文件地址
        String md5 = getKeyValue("md5", getKeyValue("data", data));//云端上文件MD5
        HdlOtaLogic.getInstance().getDeviceDriverDownloadFile(url, new CloudCallBeak<ResponseBody>() {
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
@@ -682,6 +734,29 @@
        HdlOtaLogic.getInstance().setStopDriversDownload();
    }

    /**
     * 开启服务
     */
    private void uniOpenService(Object data, DCUniMPJSCallback callback) {
        HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
            @Override
            public void onServiceConnected(ComponentName name, IBinder service) {
            }

            @Override
            public void onServiceDisconnected(ComponentName name) {
                HdlOtaLogic.getInstance().mServiceStart = false;
            }
        });
    }

    /**
     * 关闭服务
     */
    private void uniCloseService(Object data, DCUniMPJSCallback callback) {
        HdlOtaLogic.getInstance().unLocalService();
    }


    /**
     * @param deviceStatus 逆变器连接云端状态值（ 1:待机,2:连接中,3:故障,4:运行,5:离线）

 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java

@@ -408,7 +408,7 @@

    void dowlao() {

        HdlOtaLogic.getInstance().getDeviceDriverDownloadFile("http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2023/11/1834a1d0-d2a7-4b6f-9877-6f2722e9b7bc.hdlipk_sec", new CloudCallBeak<ResponseBody>() {
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile("http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2023/11/1834a1d0-d2a7-4b6f-9877-6f2722e9b7bc.hdlipk_sec", new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName("036F6C1B", "V01.01.02");

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java

@@ -54,6 +54,8 @@
    public final static String UNI_EVENT_REPLY_OTA_DRIVER_UPGRADE = "driver_upgrade";//设备驱动升级
    public final static String UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_UPGRADE = "driver_cancel_upgrade";//设备驱动取消升级
    public final static String UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD = "cancel_download";//设备取消下载升级文件
    public final static String UNI_EVENT_REPLY_OTA_OPEN_SERVICE = "open_service";//打开服务
    public final static String UNI_EVENT_REPLY_OTA_CLOSE_SERVICE = "close_service";//关闭服务


    /*********Wifi模块*********/ //卫锦定义