From 9e875b253959eff8f6af567308ad804fe69d0a62 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 03 十一月 2023 18:04:57 +0800
Subject: [PATCH] 2023年11月03日18:04:44
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 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 49db1bd..fb2635e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -114,8 +115,8 @@
//娣诲姞閫嗗彉鍣ㄥ埌浜戠
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
this.uniAddInverterDeviceToCloud(data, callback);
-
}
+ break;
//鍒犻櫎浜戠閫嗗彉鍣�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
this.uniDelInverterDevice(data, callback);
@@ -133,7 +134,6 @@
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
sendModBus(data, callback);
-
}
break;
//鑾峰彇oid鍒楄〃
@@ -191,9 +191,9 @@
}
}
- HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", event + "\r\n" + data);
+ HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===" + event + "\r\n" + data, false);
} catch (Exception e) {
- HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�", e.getMessage());
+ HdlLogLogic.print("uni===鍘熺敓鎺ユ敹uni鍙戞潵鐨勬暟鎹�===" + e.getMessage(), false);
}
}
@@ -208,7 +208,7 @@
public void openUniMP(String path, JSONObject jsonObject) {
JSONObject json = this.createdJsonDate(jsonObject, true);
- HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", json.toString());
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + json, false);
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
}
@@ -223,7 +223,7 @@
try {
HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
- HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢", e.getMessage());
+ HdlLogLogic.print("uni===鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢===" + e.getMessage(), false);
}
}
@@ -253,13 +253,13 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
/**
- * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠
+ * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
*
* @param data uni鏁版嵁
* @param callback uni鍥炶皟
@@ -277,7 +277,19 @@
*/
private void uniEditInverterTime(Object data, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
+ String date = getKeyValue("date", getKeyValue("data", data));
+ String time = getKeyValue("time", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(true, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ }
+ });
}
/**
@@ -288,15 +300,17 @@
*/
private void uniGetInverterTime(Object data, DCUniMPJSCallback callback) {
String mac = getKeyValue("mac", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
+ HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<DeviceTimeBean>() {
@Override
- public void onSuccess(Boolean obj) {
-
+ public void onSuccess(DeviceTimeBean deviceTimeBean) {
+ if (callback != null) {
+ uniCallbackData(deviceTimeBean, callback);
+ }
}
@Override
public void onError(HDLLinkException e) {
-
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -319,7 +333,7 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -2, e.getMsg(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -356,27 +370,27 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
/**
- * 閫嗗彉鍣ㄦ坊鍔犲埌浜戠涓�
+ * 鍒犻櫎浜戠涓婇�嗗彉鍣�
*
* @param data uni鏁版嵁
* @param callback uni鍥炶皟
@@ -391,7 +405,7 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -412,7 +426,7 @@
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode(), "", callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
@@ -440,7 +454,7 @@
@Override
public void onFailure(HDLException e) {
if (callback != null) {
- uniCallbackData(null, -2, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
}
});
@@ -457,7 +471,7 @@
void sendModBus(Object data, DCUniMPJSCallback callback) {
String tempData = getKeyValue("data", data);
if (TextUtils.isEmpty(tempData)) {
- HdlLogLogic.print("data鍐呭涓虹┖");
+ HdlLogLogic.print("data鍐呭涓虹┖", false);
return;
}
ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -468,7 +482,7 @@
// modBusBean.setOid("0101050217BBC400");
// }
if (modBusBean.getMac() == null || modBusBean.getData() == null) {
- HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + modBusBean.getData());
+ HdlLogLogic.print("鍐呭涓虹┖===oid=" + modBusBean.getMac() + " data=" + Arrays.toString(modBusBean.getData()), false);
return;
}
@@ -512,7 +526,7 @@
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
- HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + e.getMessage(), false);
}
return new JSONObject();
}
@@ -539,7 +553,7 @@
}
} catch (Exception e) {
- HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�", e.getMessage());
+ HdlLogLogic.print("uni===缁勮uni鍙戦�佹暟鎹牸寮�===" + e.getMessage(), false);
}
--
Gitblit v1.8.0