From 07671116767c77058b3ce584be161b4b194ec9bd Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 15:57:59 +0800
Subject: [PATCH] Merge branch 'hxb' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into hxb
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 c0bca81..18cc579 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -91,13 +91,14 @@
}
if (callback != null) {
- uniCallbackData(null, "0", "", callback);
+ uniCallbackData(null, callback);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
//璁惧妯″潡
switch (type) {
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
//娣诲姞
+
}
break;
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
@@ -111,7 +112,7 @@
@Override
public void onError(HDLLinkException e) {
//鍙戦�佸け璐�
- uniCallbackData(null, e.getCode() + "", "", callback);
+ uniCallbackData(null, e.getCode(), "", callback);
}
});
}
@@ -183,7 +184,7 @@
@Override
public void onError(HDLLinkException e) {
- uniCallbackData(null, e.getCode() + "", "澶辫触", callback);
+ uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
}
@@ -262,7 +263,7 @@
* @param msg 缁撴灉鎻忚堪鐨勪俊鎭�
* @param callback 鍥炶皟
*/
- private void uniCallbackData(Object obj, String code, String msg, DCUniMPJSCallback callback) {
+ private void uniCallbackData(Object obj, int code, String msg, DCUniMPJSCallback callback) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
try {
uniCallBackBaseBean.setCode(code);
@@ -279,7 +280,7 @@
}
private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
- uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode() + "", HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
+ uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
}
/**
--
Gitblit v1.8.0