From 6521c8e329665cc97f0714a9a094d2d823e23980 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 19 九月 2023 13:52:41 +0800
Subject: [PATCH] 修复退网清除缓存异常

---
 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
index 14f9b6e..7331819 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -701,8 +701,8 @@
     /**
      * 涓婃姤Sid鍒楄〃
      *
-     * @param requestList  sid鍒楄〃
-     * @param callBack 鍥炶皟
+     * @param requestList sid鍒楄〃
+     * @param callBack    鍥炶皟
      */
     public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {
         if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
@@ -949,14 +949,13 @@
 //        String replyTopic = topic + "_reply";
 
         try {
-            sendMsg(message.getSendBytes(), topic, callBack, new SendListener() {
+            sendMsg(message.getSendBytes(), topic, null, new SendListener() {
                 @Override
                 public void onSucceed() {
+                    HDLLinkConfig.getInstance().clearConfig();
                     if (callBack == null) return;
                     try {
                         callBack.onSuccess("閫�缃戞垚鍔�");
-                        HDLLinkConfig.getInstance().clearConfig();
-
                     } catch (Exception e) {
                         callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_ERROR));
                     }
@@ -995,7 +994,11 @@
     public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {
         try {
             LinkRequest message = new LinkRequest(topic, bodyStr);
+            if (topic != null && topic.endsWith("_reply")) {
+                callBack = null;
+            }
             String replyTopic = topic + "_reply";
+            HDLLinkCallBack finalCallBack = callBack;
             sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
                 @Override
                 public void onSucceed() {
@@ -1004,8 +1007,8 @@
 
                 @Override
                 public void onError() {
-                    if (callBack != null) {
-                        callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+                    if (finalCallBack != null) {
+                        finalCallBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
                     }
                 }
             });
@@ -1116,8 +1119,9 @@
 
     /**
      * 鍥炲缃戝叧閰嶇疆鍛戒护
+     *
      * @param mac_Oid_GatewayId
-     * @param msgId 娑堟伅Id
+     * @param msgId             娑堟伅Id
      * @param callBack
      */
     public void gatewayRemoteEditReply(String mac_Oid_GatewayId, String msgId, HDLLinkCallBack callBack) {
@@ -1135,7 +1139,6 @@
         String topic = String.format(TopicConstant.GATEWAY_EDIT_REMOTE_REPLY, mac_Oid_GatewayId);
         LinkRequest message = new LinkRequest(topic,
                 GsonConvert.getGson().toJson(data));
-
 
 
         try {

--
Gitblit v1.8.0