2023年12月15日14:14:24

mac

2023-12-15 f4024a6113dc076ed13319e75840f4907f594f8f

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

@@ -85,18 +85,18 @@
     * 原生接收到uni发来的数据
     *
     * @param appId    -uni小程序指定的appId
     * @param event    -uni小程序发来数据
     * @param topic    -uni小程序发来主题(大类)
     * @param data     JSONObject com.alibaba.fastjson解析处理
     * @param callback callback.invoke(JSONObject) 用com.alibaba.fastjson
     */
    @Override
    public void onOtherUniMPEventReceive(String appId, String event, Object data, DCUniMPJSCallback callback) {
    public void onOtherUniMPEventReceive(String appId, String topic, Object data, DCUniMPJSCallback callback) {
        try {
            if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                return;
            }
            String type = getKeyValue("type", data);
            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
            String type = getKeyValue("type", data);//小类
            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(topic)) {
                //住宅模块
                switch (type) {
                    //创建电站
@@ -128,7 +128,7 @@
                if (callback != null) {
                    uniCallbackData(null, callback);
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                //设备模块
                switch (type) {
                    //添加逆变器到云端
@@ -185,7 +185,7 @@

                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
                WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
                //wifi模块
                switch (type) {
@@ -210,7 +210,7 @@
                    break;

                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
                //OTA升级模块
                switch (type) {
                    //向云端获取oid列表
@@ -285,7 +285,7 @@
                    break;

                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
                //其它模块
                switch (type) {
                    //获取温度单位
@@ -300,7 +300,7 @@
                    break;
                }
            }
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + event + "\r\n" + data, false);
            HdlLogLogic.print("uni===原生接收uni发来的数据===大类->" + topic + "\r\n" + data, false);
        } catch (Exception e) {
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + e.getMessage(), false);
        }
@@ -460,12 +460,12 @@
                } else {
                    HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//下载失败，删除不完整固件文件;
                }
                HdlLogLogic.print("写入新固件文件到内存成功.", false);
                HdlLogLogic.print("写入新固件文件到内存成功.", true);
            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("下载固件文件到内存失败.", false);
                HdlLogLogic.print("下载固件文件到内存失败.", true);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
@@ -507,12 +507,12 @@
                    HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, hardwareModel, version, data.length() + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                        @Override
                        public void onSuccess(String obj) {
                            HdlLogLogic.print("通知给网关升级固件文件地址成功.", false);
                            HdlLogLogic.print("通知给网关升级固件文件地址成功.", true);
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("通知给网关升级固件文件地址失败,无法升级.", false);
                            HdlLogLogic.print("通知给网关升级固件文件地址失败,无法升级.", true);
                            uniCallbackData(null, -2, "通知给网关升级固件文件地址失败,无法升级,", callback);
                        }
                    });
@@ -657,12 +657,12 @@
                } else {
                    HdlFileLogic.getInstance().deleteFile(drivePathFileName);//下载失败，删除不完整驱动文件;
                }
                HdlLogLogic.print("写入新驱动文件到内存成功.", false);
                HdlLogLogic.print("写入新驱动文件到内存成功.", true);
            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("下载驱动文件到内存失败.", false);
                HdlLogLogic.print("下载驱动文件到内存失败.", true);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
@@ -984,7 +984,7 @@
     * @param callback uni回调
     */
    private void uniSearchGateway(DCUniMPJSCallback callback) {
        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                uniCallbackData(gatewayBeanList, callback);