From e1577f14dc7ac4fe8b8df851e63ae7e3aebf72a7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 16:02:14 +0800
Subject: [PATCH] 2024年10月31日16:02:10

---
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java   |    8 ++++----
 app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java |   10 +++++-----
 app/src/main/java/com/hdl/photovoltaic/HDLApp.java                   |    3 ++-
 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java |   14 ++++++++------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 45aeb0a..9539e49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -12,6 +12,7 @@
 
 import androidx.multidex.MultiDex;
 
+import com.google.gson.Gson;
 import com.hdl.hdlhttp.HxHttpConfig;
 import com.hdl.linkpm.sdk.HDLLinkPMSdk;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -185,7 +186,7 @@
         HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
             @Override
             public void onReLogin(int type) {
-                Log.d("====閫�鍒扮櫥褰曠晫闈�====", "====閫�鍒扮櫥褰曠晫闈�====" + type);
+                HdlLogLogic.print("閫�鍒扮櫥褰曠晫闈�---" + type, true);
                 //type:  0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
                 //鏀跺埌鐧诲綍澶勭悊閫氱煡锛屽叧闂墍鏈夐〉闈㈠苟鎵撳紑鐧诲綍椤甸潰
                 AppManagerUtils.getAppManager().finishAllActivity();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 12871b6..dcb6b3e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -250,14 +250,14 @@
                                 UserConfigManage.getInstance().Save();
                             }
                             HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
-                            HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+                            HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
 
                         }
 
                         @Override
                         public void onFailure(HDLException e) {
                             HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
-                            HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+                            HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
                         }
                     });
 
@@ -363,6 +363,8 @@
         HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
         //绉婚櫎鐩戝惉
         HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
+
+
     }
 
     private void initView() {
@@ -471,7 +473,7 @@
                     if (response.getTopic() == null) {
                         return;
                     }
-                    HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false);
+                    HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁---" + new Gson().toJson(response), false);
 //                    if (response.getTopic().endsWith("custom/native/inverter/up")) {
                     HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                     uniCallBackBaseBean.setType(response.getTopic());
@@ -501,7 +503,7 @@
                     } else if (linkResponse.getTopic().endsWith("/custom/device/list/upload")) {
                         //閫嗗彉鍣ㄦ湁鏂皁id閫氱煡涓婚
                         if (linkResponse.getData() == null) {
-                            HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡--->鏁版嵁涓虹┖", false);
+                            HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡---鏁版嵁涓虹┖", false);
                             return;
                         }
                         try {
@@ -569,13 +571,13 @@
                     if (info != null) {
                         MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
                         MqttRecvClient.getInstance().connect();
-                        HdlLogLogic.print("mqtt閾炬帴鎴愬姛--->ClientId--->" + info.getClientId(), true);
+                        HdlLogLogic.print("mqtt閾炬帴鎴愬姛---ClientId---" + info.getClientId(), true);
                     }
                 }
 
                 @Override
                 public void onFailure(HDLException e) {
-                    HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+                    HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触---" + e.getMessage(), e.getCode(), true);
                 }
             });
         }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index aa781d9..4b4d273 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -347,14 +347,14 @@
                                 UserConfigManage.getInstance().Save();
                             }
                             HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
-                            HdlLogLogic.print("C绔�--->娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+                            HdlLogLogic.print("C绔�---娣诲姞鏋佸厜ID鍒颁簯绔�---registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
 
                         }
 
                         @Override
                         public void onFailure(HDLException e) {
                             HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
-                            HdlLogLogic.print("C绔�--->娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+                            HdlLogLogic.print("C绔�---娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
                         }
                     });
 
@@ -380,13 +380,13 @@
                     if (info != null) {
                         MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
                         MqttRecvClient.getInstance().connect();
-                        HdlLogLogic.print("mqtt閾炬帴鎴愬姛--->ClientId--->" + info.getClientId(), true);
+                        HdlLogLogic.print("mqtt閾炬帴鎴愬姛---ClientId---" + info.getClientId(), true);
                     }
                 }
 
                 @Override
                 public void onFailure(HDLException e) {
-                    HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+                    HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触---" + e.getMessage(), e.getCode(), true);
                 }
             });
         }
@@ -408,7 +408,7 @@
                     if (response.getTopic() == null) {
                         return;
                     }
-                    HdlLogLogic.print("C绔�--->鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false);
+                    HdlLogLogic.print("C绔�---鐩戝惉鍒癕odbus鏁版嵁---" + new Gson().toJson(response), false);
 //                    if (response.getTopic().endsWith("custom/native/inverter/up")) {
                     HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                     uniCallBackBaseBean.setType(response.getTopic());
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index 8190f74..a467e5f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -364,12 +364,12 @@
         if (mUniMPCaches.containsKey(uniAppId)) {
             if (mUniMPCaches.get(uniAppId) != null) {
                 mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
-                HdlLogLogic.print("Android--->閫氱煡---uni--->涓婚:" + topic + "--->鍙戦�佹暟鎹�:" + new Gson().toJson(data));
+                HdlLogLogic.print("Android---閫氱煡---uni---涓婚:" + topic + "---鍙戦�佹暟鎹�:" + new Gson().toJson(data));
             } else {
-                HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId);
+                HdlLogLogic.print("Android---閫氱煡---uni---澶辫触---灏忕▼搴忓璞′负绌�:" + uniAppId);
             }
         } else {
-            HdlLogLogic.print("Android--->閫氱煡---uni--->澶辫触--->灏忕▼搴忓璞′负绌�:" + uniAppId);
+            HdlLogLogic.print("Android---閫氱煡---uni--->澶辫触---卢灏忕▼搴忓璞′负绌�:" + uniAppId);
         }
 
     }
@@ -422,7 +422,7 @@
     public void checkRemoveOtherUniMPEventCallBack(IOnOtherUniMPEventCallBack onOtherUniMPEventCallBack) {
         if (this.onOtherUniMPEventCallBack == onOtherUniMPEventCallBack) {
             this.onOtherUniMPEventCallBack = null;
-            HdlLogLogic.print("onOtherUniMPEventCallBack remove callback");
+            HdlLogLogic.print("onOtherUniMPEventCallBack remove callback", true);
         }
     }
 

--
Gitblit v1.8.0