From 44180904ae4711ba68412b21953f66f32ef8d266 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 15:35:06 +0800
Subject: [PATCH] 2023年10月12日15:35:01
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 def2843..9be1182 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;
@@ -253,13 +254,13 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
/**
- * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠
+ * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
*
* @param data uni鏁版嵁
* @param callback uni鍥炶皟
@@ -277,7 +278,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 +301,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 +334,7 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -2, e.getMsg(), callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -356,21 +371,21 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@@ -391,7 +406,7 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(null, -100, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
}
@@ -412,7 +427,7 @@
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode(), "", callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
});
@@ -440,7 +455,7 @@
@Override
public void onFailure(HDLException e) {
if (callback != null) {
- uniCallbackData(null, -2, e.getMessage(), callback);
+ uniCallbackData(null, e.getCode(), e.getMessage(), callback);
}
}
});
--
Gitblit v1.8.0