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 |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 98eeaef..f9d9993 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1124,6 +1124,7 @@
                 UserConfigManage.getInstance().Save();
                 //鑾峰彇鐢ㄦ埛澶村儚璺緞
                 if (cUserInfo.getMemberHeadIcon().contains("http")) {
+                    UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                     //鏇存柊鐢ㄦ埛澶村儚
                     uniCallbackData(type, cUserInfo, callback);
                 } else {
@@ -1131,6 +1132,7 @@
                         @Override
                         public void onSuccess(String url) {
                             cUserInfo.setMemberHeadIcon(url);
+                            UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                             uniCallbackData(type, cUserInfo, callback);
                         }
 
@@ -1483,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
@@ -1546,14 +1548,14 @@
             @Override
             public void onSuccess(int[] data) {
                 uniCallbackData(type, data, callback);
-                HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + Arrays.toString(data), true);
+//                HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + Arrays.toString(data), true);
 
             }
 
             @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