From 54a8c79222bba0644b02fe1dbc5d75e26ea50b5d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 14 十一月 2023 18:17:58 +0800
Subject: [PATCH] 2023年11月14日18:17:48
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 207 insertions(+), 23 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 9cf071e..ff4307a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -6,6 +6,11 @@
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
+import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
+import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
+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.bean.ModBusBean;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -187,6 +192,46 @@
break;
}
+ } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(event)) {
+ //OTA鍗囩骇妯″潡
+ switch (type) {
+ //鍚戜簯绔幏鍙杘id鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_CLOUD_OID_LIST: {
+ this.uniGetCloudOidList(data, callback);
+ }
+ break;
+ //褰撳墠璁惧鍥轰欢鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_LIST: {
+ this.uniGetCurrentDeviceFirmwares(data, callback);
+ }
+ break;
+ //璁惧鏂板浐浠跺垪琛�
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_NEW_LIST: {
+ this.uniGetNewDeviceFirmwares(data, callback);
+ }
+ break;
+ //璁惧鍥轰欢鍗囩骇
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_FIRMWARES_UPGRADE: {
+ this.uniUpgradeDeviceFirmware(data, callback);
+ }
+ break;
+ //褰撳墠璁惧椹卞姩鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_LIST: {
+ this.uniGetCurrentGatewayDrivers(data, callback);
+ }
+ break;
+ //璁惧鏂伴┍鍔ㄥ垪琛�
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_NEW: {
+ this.uniGetNewGatewayDrivers(data, callback);
+ }
+ break;
+ //璁惧椹卞姩鍗囩骇
+ case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_UPGRADE: {
+ this.uniUpgradeGatewayDriver(data, callback);
+ }
+ break;
+
+ }
}
HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===" + event + "\r\n" + data, false);
} catch (Exception e) {
@@ -203,10 +248,9 @@
* @param jsonObject 闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
*/
public void openUniMP(String path, JSONObject jsonObject) {
-
- JSONObject json = this.createdJsonDate(jsonObject, true);
- HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + json, false);
+ JSONObject json = this.createdJSONObject(jsonObject, true);
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + json, false);
}
/**
@@ -232,7 +276,143 @@
}
//endregion
- //region ******uni閫昏緫鏂规硶******
+ //region ******uni鎺ュ彛鏂规硶******
+
+ /**
+ * 鍚戜簯绔幏鍙栭�嗗彉鍣╫id鍒楄〃
+ * 鍓嶆彁鏉′欢:瑕佷笂浼犻�嗗彉鍣╫id鍒楄〃缁欎簯绔�
+ *
+ * @param callback -
+ */
+ private void uniGetCloudOidList(Object data, DCUniMPJSCallback callback) {
+ HdlOtaLogic.getInstance().getCloudOidList(new CloudCallBeak<List<DeviceOidInfoBean>>() {
+ @Override
+ public void onSuccess(List<DeviceOidInfoBean> obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愬綋鍓嶈澶囧浐浠躲�戝垪琛�
+ * 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
+ */
+ private void uniGetCurrentDeviceFirmwares(Object data, DCUniMPJSCallback callback) {
+ String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));
+ HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
+ @Override
+ public void onSuccess(List<DeviceFirmwareBean> obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愯澶囨柊鍥轰欢銆戝垪琛�
+ * 鍓嶆彁鏉′欢:瑕侀�氳繃骞冲彴杞欢涓婁紶鏂板浐浠�
+ */
+ private void uniGetNewDeviceFirmwares(Object data, DCUniMPJSCallback callback) {
+ String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
+ String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//绯荤粺闀滃儚id
+ HdlOtaLogic.getInstance().getNewDeviceFirmwares(hardwareModel, osImageId, new CloudCallBeak<List<CloudDeviceFirmwaresBean>>() {
+ @Override
+ public void onSuccess(List<CloudDeviceFirmwaresBean> obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔彂璧枫�愯澶囧浐浠躲�戝崌绾TA鎸囦护
+ */
+ private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {
+ String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//璁惧id
+ String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
+ HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愬綋鍓嶈澶囬┍鍔ㄣ�戝垪琛�
+ * 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
+ */
+ private void uniGetCurrentGatewayDrivers(Object data, DCUniMPJSCallback callback) {
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));
+ HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
+ @Override
+ public void onSuccess(List<GatewayDriverBean> obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愯澶囨柊椹卞姩銆戝垪琛�
+ * 鍓嶆彁鏉′欢:瑕侀�氳繃骞冲彴杞欢涓婁紶鏂伴┍鍔�
+ */
+ private void uniGetNewGatewayDrivers(Object data, DCUniMPJSCallback callback) {
+ String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//椹卞姩缂栧彿鎴栭┍鍔ㄥ悕绉�
+ String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+ HdlOtaLogic.getInstance().getNewGatewayDrivers(driveCode, osImageId, new CloudCallBeak<CloudGatewayDriversBean>() {
+ @Override
+ public void onSuccess(CloudGatewayDriversBean obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍚戜簯绔彂璧枫�愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+ */
+ private void uniUpgradeGatewayDriver(Object data, DCUniMPJSCallback callback) {
+ String deviceOid = getKeyValue("oid", getKeyValue("data", data));//缃戝叧璁惧oid
+ String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
+ HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
/**
* 閫嗗彉鍣ㄦ竻绌轰綇瀹卛d
@@ -354,22 +534,17 @@
uniCallbackData(null, -100, "鏈湴鎵句笉鍒扮綉鍏�", callback);
return;
}
- HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac,
- gatewayBean.getGatewayType(),
- gatewayBean.getSid(),
- gatewayBean.getOid(),
- gatewayBean.getDevice_name(),
- new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- uniCallbackData(null, callback);
- }
+ HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(null, callback);
+ }
- @Override
- public void onFailure(HDLException e) {
- uniCallbackData(null, e.getCode(), e.getMsg(), callback);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
}
@Override
@@ -461,11 +636,19 @@
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
+ * 閫忎紶鍗忚
+ * 涓嬪彂涓婚锛�/user/${gw_id}/custom/native/${driver}/down;
+ * 閫嗗彉鍣ㄥ洖澶嶄富棰橈細/user/${gw_id}/custom/native/${driver}/down_reply;
+ * Modbus ECU鍗忚锛氫簨浠禝D(2涓猙yte)->鍗忚[鍥哄畾:0,0](2涓猙yte)->闀垮害(2byte)->鏍囪瘑绗oid鐨刟ddresses鍊糫(4涓猙yte)->鍔熻兘鐮�(1涓猙yte)->璐熻浇鏁版嵁(N涓猙yte);
+ * 闀垮害(2涓猙yte)=鏍囪瘑绗�(4涓猙yte)+鍔熻兘鐮�(1涓猙yte)+璐熻浇鏁版嵁(N涓猙yte);
+ * 璐熻浇鏁版嵁=瀵勫瓨鍣ㄥ湴鍧�(2涓猙yte)+瀵勫瓨鍣ㄩ暱搴�(2涓猙yte)+鍐呭闀垮害(1涓猙yte)+鍐呭鏁版嵁(N涓猙yte)銆愭敞鎰�:鍗曚釜鍐欏叆瀵勫瓨鍣�-->鍘绘帀<瀵勫瓨鍣ㄩ暱搴�>鍜�<鍐呭闀垮害>銆�;
+ * 瀵勫瓨鍣ㄩ暱搴�=(鍐呭鏁版嵁/2);
+ * 渚嬪瓙:new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01};
*
* @param data modbus鏁版嵁
* @param callback 鍥炶皟
*/
- void sendModBus(Object data, DCUniMPJSCallback callback) {
+ private void sendModBus(Object data, DCUniMPJSCallback callback) {
String tempData = getKeyValue("data", data);
if (TextUtils.isEmpty(tempData)) {
HdlLogLogic.print("data鍐呭涓虹┖", false);
@@ -506,11 +689,11 @@
/**
* 缁勮uni鍙戦�佹暟鎹牸寮�
*
- * @param data -闄勪欢鏁版嵁(娌℃湁鏁版嵁濉玭ull)
+ * @param data 闄勫姞鏁版嵁(娌℃湁鏁版嵁濉玭ull)
* @param isTokenAndRefreshToken (true=搴曞眰榛樿娣诲姞token鍜宺efreshToken;false=涓嶅姞)
- * @return JSONObject
+ * @return JSONObject uni鏂规硶鍚嶉噷闈㈠弬鏁伴渶瑕佺殑JSONObject瀵硅薄
*/
- private JSONObject createdJsonDate(JSONObject data, boolean isTokenAndRefreshToken) {
+ private JSONObject createdJSONObject(JSONObject data, boolean isTokenAndRefreshToken) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
try {
if (data == null) {
@@ -604,6 +787,7 @@
} catch (Exception e) {
return "";
}
+
}
//endregion
--
Gitblit v1.8.0