From 2574334327d47d5b0d62e1e9fe442a493bbcf2bd Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 11 四月 2023 15:52:54 +0800
Subject: [PATCH] 新增接收主机退网delete/notify主题处理

---
 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 3 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 47d5f92..82b4652 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
@@ -26,6 +26,7 @@
 import com.hdl.sdk.connect.bean.request.DeviceAuthRequest;
 import com.hdl.sdk.connect.bean.request.GatewayInfoRequest;
 import com.hdl.sdk.connect.bean.request.ListOidRequest;
+import com.hdl.sdk.connect.bean.request.ListOidRequest2;
 import com.hdl.sdk.connect.bean.request.ListUploadRequest;
 import com.hdl.sdk.connect.bean.response.AuthenticateResponse;
 import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
@@ -765,13 +766,13 @@
 
         final String msgId = IdUtils.getUUId();
         String time = String.valueOf(System.currentTimeMillis());
-        final BaseLocalResponse<List<ListOidRequest>> data = new BaseLocalResponse<>();
+        final BaseLocalResponse<List<ListOidRequest2>> data = new BaseLocalResponse<>();
         data.setId(msgId);
         data.setTime_stamp(time);
 
-        final ListOidRequest request = new ListOidRequest();
+        final ListOidRequest2 request = new ListOidRequest2();
         request.setOid(oid);
-        List<ListOidRequest> list = new ArrayList<>();
+        List<ListOidRequest2> list = new ArrayList<>();
         list.add(request);
 
         data.setObjects(list);
@@ -814,6 +815,64 @@
         }
     }
 
+    /**
+     * 閫氱煡鍒犻櫎骞堕��缃戝瓙璁惧鎷撴墤鍏崇郴
+     *
+     * @param oid      浠庣綉鍏筹紙璁惧锛塷id
+     * @param callBack 缁撴灉鍥炶皟
+     */
+    public void deleteNetwork(String oid, HDLLinkCallBack callBack) {
+        if (TextUtils.isEmpty(oid)) {
+            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
+        }
+
+        final String msgId = IdUtils.getUUId();
+        String time = String.valueOf(System.currentTimeMillis());
+        final BaseLocalResponse<List<ListOidRequest>> data = new BaseLocalResponse<>();
+        data.setId(msgId);
+        data.setTime_stamp(time);
+
+        final ListOidRequest request = new ListOidRequest();
+        request.setOid(oid);
+        List<ListOidRequest> list = new ArrayList<>();
+        list.add(request);
+
+        data.setObjects(list);
+
+        String topic = String.format(TopicConstant.DELETE_NOTIFY_REPLY, HDLLinkConfig.getInstance().getGatewayId());
+        LinkRequest message = new LinkRequest(topic,
+                GsonConvert.getGson().toJson(data));
+
+//        String replyTopic = topic + "_reply";
+
+        try {
+            sendMsg(message.getSendBytes(), topic, callBack, new SendListener() {
+                @Override
+                public void onSucceed() {
+                    if (callBack == null) return;
+                    try {
+                        callBack.onSuccess("閫�缃戞垚鍔�");
+                        HDLLinkConfig.getInstance().clearConfig();
+
+                    } catch (Exception e) {
+                        callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_ERROR));
+                    }
+                }
+
+                @Override
+                public void onError() {
+                    if (callBack != null) {
+                        callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+                    }
+                }
+            });
+        } catch (Exception e) {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+            }
+        }
+    }
+
 //    /**
 //     * 娓呯┖缂撳瓨
 //     */

--
Gitblit v1.8.0