From ddd686a24cf45ca91aebcaf07c5b2b347b0cd455 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 16:37:44 +0800
Subject: [PATCH] 2023年11月06日16:37:26

---
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/eventbus/BaseEventBus.java |    6 +-----
 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java  |   11 ++++++++---
 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java                    |    2 +-
 app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java                       |    2 +-
 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java               |   18 ++++++++++++++----
 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java                   |    6 ++----
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java                       |    5 +----
 app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java                       |    2 +-
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java       |    2 +-
 9 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/bean/BaseEventBus.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/eventbus/BaseEventBus.java
similarity index 87%
rename from app/src/main/java/com/hdl/photovoltaic/bean/BaseEventBus.java
rename to HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/eventbus/BaseEventBus.java
index aadaaee..894e208 100644
--- a/app/src/main/java/com/hdl/photovoltaic/bean/BaseEventBus.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/eventbus/BaseEventBus.java
@@ -1,10 +1,6 @@
-package com.hdl.photovoltaic.bean;
+package com.hdl.sdk.link.core.bean.eventbus;
 
-/**
- * 浜嬩欢鍒嗗彂涓撶敤瀵硅薄
- */
 public class BaseEventBus {
-
     private String topic;
     private String type;
     private Object data;
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
index 6c5a295..d6a0d1a 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
@@ -7,6 +7,7 @@
 
 import com.hdl.sdk.link.common.utils.LogUtils;
 import com.hdl.sdk.link.core.bean.LinkPacket;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.eventbus.EventBindMiniRemoteSuccessInfo;
 import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -208,9 +209,13 @@
                 return;
             }
             LogUtils.d(TAG, "缃戝叧閲嶈繛mqtt绉橀挜鏇存柊閫氱煡->" + topic);
-            EventNotifyRefreshGatewayAesKeyInfo eventNotifyRefreshGatewayAesKeyInfo = new EventNotifyRefreshGatewayAesKeyInfo();
-            eventNotifyRefreshGatewayAesKeyInfo.setGatewayId(topics[2]);
-            EventBus.getDefault().post(eventNotifyRefreshGatewayAesKeyInfo);
+            BaseEventBus baseEventBus=new BaseEventBus();
+            baseEventBus.setTopic(topic);
+            EventBus.getDefault().post(baseEventBus);
+
+//            EventNotifyRefreshGatewayAesKeyInfo eventNotifyRefreshGatewayAesKeyInfo = new EventNotifyRefreshGatewayAesKeyInfo();
+//            eventNotifyRefreshGatewayAesKeyInfo.setGatewayId(topics[2]);
+//            EventBus.getDefault().post(eventNotifyRefreshGatewayAesKeyInfo);
             return;
         }
 
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
index 7326c6b..7824776 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseActivity.java
@@ -9,11 +9,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.bean.BaseEventBus;
 import com.hdl.photovoltaic.listener.BaseView;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.utils.AppManagerUtils;
 import com.hdl.photovoltaic.widget.LoadingDialog;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
index c584a14..8aa49e0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -15,10 +15,10 @@
 import androidx.lifecycle.Lifecycle;
 
 import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.bean.BaseEventBus;
 import com.hdl.photovoltaic.listener.BaseView;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.widget.LoadingDialog;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 
 
 import org.greenrobot.eventbus.EventBus;
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index a0da250..843c02d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -66,7 +66,7 @@
     //region -----鐢ㄦ埛绠$悊---------
     //鐧诲綍
     public static final String C_POST_Login = "/smart-footstone/member/oauth/login";
-    //閫�鍑虹櫥褰�
+    //娉ㄥ唽璐﹀彿
     public static final String C_POST_GET_OAUTH_REGISTER = "/smart-footstone/member/oauth/register";
     //鐢ㄦ埛鎵惧洖瀵嗙爜 蹇樿瀵嗙爜,閫氳繃閭鍜屾墜鏈哄彿鎵惧洖
     public static final String C_POST_FORGET_PROGRAM_PWD = "/smart-footstone/member/oauth/forgetPwd";
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 7717a37..44fe12e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -5,15 +5,12 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
 import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
 import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
-import com.hdl.linkpm.sdk.user.bean.ImageSubmitInfo;
 import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
 import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
-import com.hdl.linkpm.sdk.user.controller.HDLPMUserController;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -554,9 +551,10 @@
     /**
      * 閫�鍑虹櫥褰曟椂璋冪敤锛屾竻闄ゆ帹閫佹暟鎹�
      */
-    public void SignOutClearData() {
+    public void signOutClearData() {
         String requestUrl = HttpApi.POST_GET_IMAGE_LOGOUT;
         //閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
+        HttpClient.getInstance().requestHttp(requestUrl, new JsonObject().toString(), null);
     }
 
     public boolean isPhone(String phone) {
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 fb2635e..9cf071e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -5,12 +5,9 @@
 import android.util.Log;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.HDLApp;
-import com.hdl.photovoltaic.bean.BaseEventBus;
 import com.hdl.photovoltaic.bean.ModBusBean;
-import com.hdl.photovoltaic.config.ConstantManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
@@ -21,11 +18,11 @@
 import com.hdl.photovoltaic.utils.WifiUtils;
 import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
 import com.hdl.sdk.link.core.callback.ModbusCallBack;
 import com.hdl.sdk.link.core.connect.HDLModBusConnect;
-import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 
 import org.greenrobot.eventbus.EventBus;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index d80232f..4885c41 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -7,6 +7,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Process;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.google.gson.Gson;
@@ -30,6 +31,7 @@
 import com.hdl.sdk.link.HDLLinkLocalSdk;
 import com.hdl.sdk.link.common.event.EventListener;
 import com.hdl.sdk.link.core.bean.ModbusResponse;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.config.HDLLinkConfig;
@@ -209,7 +211,7 @@
                     if (response.getTopic() == null) {
                         return;
                     }
-                    HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁==="+new Gson().toJson(response),false);
+                    HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===" + new Gson().toJson(response), false);
 //                    if (response.getTopic().endsWith("custom/native/inverter/up")) {
                     HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                     uniCallBackBaseBean.setType(response.getTopic());
@@ -237,22 +239,30 @@
 
             @Override
             public void onFailure(HDLException e) {
-                HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触==="+e.getMessage(), e.getCode(),true);
+                HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触===" + e.getMessage(), e.getCode(), true);
             }
         });
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
+    public void onEventMessage(BaseEventBus event) {
         //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
         if (event == null) {
+            return;
+        }
+        if (TextUtils.isEmpty(event.getTopic())) {
+            return;
+        }
+        String[] topics = event.getTopic().split("/");
+        //涓婚涓嶇鍚堣鍒欎笉澶勭悊
+        if (topics.length < 3) {
             return;
         }
         int index = -1;
         List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
         for (int i = 0; i < list.size(); i++) {
             GatewayBean gatewayBean = list.get(i);
-            if (gatewayBean.getGatewayId().equals(event.getGatewayId())) {
+            if (gatewayBean.getGatewayId().equals(topics[2])) {
                 index = i;
                 break;
             }
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 1e2a415..5f7071b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -14,7 +14,6 @@
 import com.google.gson.Gson;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.bean.BaseEventBus;
 import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
 import com.hdl.photovoltaic.base.CustomBaseFragment;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
@@ -28,6 +27,7 @@
 import com.hdl.photovoltaic.ui.bean.HouseIdBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
 
 import java.util.ArrayList;

--
Gitblit v1.8.0