From 5ca2b601848c62607d88fee5afdae6af80f6eea7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 16:12:26 +0800
Subject: [PATCH] 2024年03月20日16:12:17
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 b923df1..f9d9993 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -67,6 +67,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,8 +116,9 @@
return;
}
String type = getKeyValue("type", data);//灏忕被
+ String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
String mode_type = "澶х被->" + topic + "--->" + "灏忕被->" + type;//鐢ㄦ潵鎵撳嵃鐨�
- HdlLogLogic.print("uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
+ HdlLogLogic.print(logTag + ":" + "uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
//鐢ㄦ埛妯″潡
switch (type) {
@@ -124,6 +126,7 @@
case HDLUniMP.UNI_EVENT_REPLY_USER_INFO: {
this.uniGetUserInfo(mode_type, data, callback);
}
+ break;
//鐢ㄦ埛澶村儚锛堟棫骞冲彴閫昏緫鏄ご鍍忓崟鐙幏鍙栦笅杞藉湴鍧�锛�
case HDLUniMP.UNI_EVENT_REPLY_USER_IMAGE: {
uniGetImageKey(mode_type, data, callback);
@@ -1121,6 +1124,7 @@
UserConfigManage.getInstance().Save();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
if (cUserInfo.getMemberHeadIcon().contains("http")) {
+ UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
//鏇存柊鐢ㄦ埛澶村儚
uniCallbackData(type, cUserInfo, callback);
} else {
@@ -1128,12 +1132,13 @@
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
+ UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
uniCallbackData(type, cUserInfo, callback);
}
@Override
public void onFailure(HDLException e) {
- uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ uniCallbackData(type, cUserInfo, callback);
}
});
}
@@ -1379,7 +1384,7 @@
atomicInteger.set(atomicInteger.get() + 1);
//鏈�鍚庝竴鏉℃墠鍋氭坊鍔犻�嗗彉鍣ㄩ�昏緫澶勭悊
if (atomicInteger.get() == list.size()) {
- HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, gatewayBean.getDevice_mac(), list, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
uniCallbackData(type, null, callback);
@@ -1448,7 +1453,7 @@
private void uniSearchGateway(String type, DCUniMPJSCallback callback) {
- HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+ HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
uniCallbackData(type, gatewayBeanList, callback);
@@ -1480,16 +1485,16 @@
}
return;
}
- //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
- HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
+ if (callback != null) {
+ uniCallbackData(type, list, callback);
+ }
//EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
baseEventBus.setData(list);
EventBus.getDefault().post(baseEventBus);
- if (callback != null) {
- uniCallbackData(type, list, callback);
- }
+ //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
+ HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
}
@Override
@@ -1550,7 +1555,7 @@
@Override
public void onError(HDLLinkException e) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
- //HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
+// HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
--
Gitblit v1.8.0