From 0752b8900365704ba8d3e60a5afc66394628e2a4 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 18 十二月 2023 16:20:14 +0800 Subject: [PATCH] 2023年12月18日16:20:08 --- app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 60 +++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java index f9eebd8..d8eb013 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java @@ -85,18 +85,18 @@ * 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹� * * @param appId -uni灏忕▼搴忔寚瀹氱殑appId - * @param event -uni灏忕▼搴忓彂鏉ユ暟鎹� + * @param topic -uni灏忕▼搴忓彂鏉ヤ富棰�(澶х被) * @param data JSONObject com.alibaba.fastjson瑙f瀽澶勭悊 * @param callback callback.invoke(JSONObject) 鐢╟om.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) { //鍚戜簯绔幏鍙杘id鍒楄〃 @@ -268,9 +268,14 @@ this.uniUpgradeGatewayDriver(data, callback); } break; - //璁惧鍙栨秷涓嬭浇鍗囩骇鏂囦欢 + //璁惧鍙栨秷椹卞姩,鍥轰欢涓嬭浇鍗囩骇鏂囦欢 case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: { this.uniCancelDownloadingUpgradeFile(data, callback); + } + break; + //璁惧椹卞姩,鍥轰欢鍙栨秷鍗囩骇 + case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: { + this.uniCancelUpgrade(data, callback); } break; //鎵撳紑鏈嶅姟 @@ -285,7 +290,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 +305,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 +465,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 +512,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 +662,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); } }); @@ -758,10 +763,27 @@ } /** - * 鍙栨秷涓嬭浇鍗囩骇鏂囦欢 + * 鍙栨秷涓嬭浇銆愰┍鍔�,鍥轰欢銆戝崌绾ф枃浠� */ private void uniCancelDownloadingUpgradeFile(Object data, DCUniMPJSCallback callback) { - HdlOtaLogic.getInstance().setStopDriversDownload(); + HdlOtaLogic.getInstance().stopDownloadUpgradeFile(); + } + + /** + * 鍙栨秷銆愰┍鍔�,鍥轰欢銆戝崌绾� + */ + private void uniCancelUpgrade(Object data, DCUniMPJSCallback callback) { + HdlOtaLogic.getInstance().cancelUpgrade("", new LinkCallBack<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + + } + + @Override + public void onError(HDLLinkException e) { + + } + }); } /** @@ -984,7 +1006,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); -- Gitblit v1.8.0