From 7c8ce9b9a7d3fc1aaa4a621e86415b25ad10a34f Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期三, 19 三月 2025 09:36:28 +0800
Subject: [PATCH] 添加source屏扫码流程

---
 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java |  650 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 620 insertions(+), 30 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 de555ec..2147f3e 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
@@ -1,7 +1,9 @@
 package com.hdl.sdk.connect.socket;
 
+import android.os.Build;
 import android.text.TextUtils;
-import android.util.Log;
+
+import androidx.annotation.RequiresApi;
 
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
@@ -12,19 +14,24 @@
 import com.hdl.sdk.common.exception.HDLLinkException;
 import com.hdl.sdk.common.utils.IdUtils;
 import com.hdl.sdk.common.utils.LogUtils;
-import com.hdl.sdk.common.utils.SPUtils;
 import com.hdl.sdk.common.utils.ThreadToolUtils;
 import com.hdl.sdk.common.utils.gson.GsonConvert;
 import com.hdl.sdk.connect.HDLLink;
-import com.hdl.sdk.connect.bean.LoginRequest;
-import com.hdl.sdk.connect.bean.request.BroadcastRequest;
-import com.hdl.sdk.connect.bean.response.AuthenticateResponse;
-import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
-import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
 import com.hdl.sdk.connect.bean.LinkRequest;
 import com.hdl.sdk.connect.bean.LinkResponse;
+import com.hdl.sdk.connect.bean.LoginRequest;
+import com.hdl.sdk.connect.bean.request.BroadcastRequest;
+import com.hdl.sdk.connect.bean.request.DeviceAuthRequest;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
+import com.hdl.sdk.connect.bean.request.ListOidRequest;
+import com.hdl.sdk.connect.bean.request.ListOidRequest2;
+import com.hdl.sdk.connect.bean.request.ListSidRequest;
+import com.hdl.sdk.connect.bean.request.ListUploadRequest;
+import com.hdl.sdk.connect.bean.request.LogicEnableRequest;
 import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+import com.hdl.sdk.connect.bean.response.BaseLocalCodeResponse;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
 import com.hdl.sdk.connect.bean.response.DeviceInfoResponse;
 import com.hdl.sdk.connect.callback.HDLLinkCallBack;
 import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
@@ -39,6 +46,7 @@
 import com.hdl.sdk.socket.listener.ConnectStatusListener;
 import com.hdl.sdk.socket.listener.SendListener;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
@@ -82,6 +90,7 @@
 
     public boolean isBroadcast = false;
 
+
     /**
      * 骞挎挱鑷韩淇℃伅缁欎富缃戝叧
      */
@@ -92,10 +101,13 @@
             public void run() {
                 while (true) {
                     try {
-                        Thread.sleep(1000);
-//                        LogUtils.i("checkIfCertified=" + HDLLink.getInstance().checkIfCertified() + " getTcp().connected=" + getTcp().connected);
+                        Thread.sleep(5000);
                         try {
-                            if (!HDLLink.getInstance().checkIfCertified() || getTcp().connected) {
+                            if (!HDLLink.getInstance().checkIfCertified()) {
+                                continue;
+                            }
+
+                            if (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected) {
                                 continue;
                             }
                         } catch (Exception e) {
@@ -109,24 +121,32 @@
                         }
                         BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");
                         HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {
+                            @RequiresApi(api = Build.VERSION_CODES.O)
                             @Override
                             public void onSuccess(LinkResponse msg) {
-                                getTcp();
                                 String data = msg.getData();
                                 if (!TextUtils.isEmpty(data)) {
                                     DeviceInfoResponse response = GsonConvert.getGson().fromJson(data, new TypeToken<DeviceInfoResponse>() {
                                     }.getType());
+
+                                    if ((response == null) || (response.getObjects() == null) || (response.getObjects().getIPAddress() == null))
+                                        return;
+
                                     HDLLinkConfig.getInstance().setIpAddress(response.getObjects().getIPAddress());
+                                    LogUtils.i("---getIpAddress=" + HDLLinkConfig.getInstance().getIpAddress());
+
                                     HDLLinkConfig.getInstance().reSaveConfig();
                                 }
+
                                 isBroadcast = true;
+                                getTcp();
                                 LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧鎴愬姛锛�");
                             }
 
                             @Override
                             public void onError(HDLLinkException e) {
                                 isBroadcast = false;
-                                LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧澶辫触锛�");
+                                LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧澶辫触锛�---onError=" + e.toString());
                             }
                         });
 //                        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true);
@@ -448,33 +468,43 @@
         }
     }
 
-    public SocketBoot getTcp() throws RuntimeException {
-        if (TextUtils.isEmpty(getTcpIp())) {
+    public synchronized SocketBoot getTcp() throws RuntimeException {
+        String gatewayIpAddress = getTcpIp();
+        if (TextUtils.isEmpty(gatewayIpAddress)) {
             LogUtils.e("璇锋悳绱㈢綉鍏�");
             throw new RuntimeException("璇锋悳绱㈢綉鍏�");
         }
         //濡傛灉娌℃湁鍒濆鍖栵紝鎴栬�呯綉鍏矷P鏇存敼浜嗭紝灏遍噸鏂板垵濮嬪寲
-        if (tcpBoot == null || !getTcpOptions().getIp().equals(getTcpIp())) {
-            tcpBoot = TcpClient.init(getTcpIp(), getTcpPort(), getTcpOptions());
+        if (tcpBoot == null || !getTcpOptions().getIp().equals(gatewayIpAddress)) {
+            tcpBoot = TcpClient.init(gatewayIpAddress, getTcpPort(), getTcpOptions());
             tcpBoot.SetHeartbeat(new IHeartbeat() {
                 @Override
                 public void heartbeat() {
-
-                    if (HDLLinkConfig.getInstance().getDeviceInfoBean() == null || HDLLinkConfig.getInstance().getDeviceInfoBean().getOID() == null) {
-                        LogUtils.i("DeviceInfoBean涓虹┖锛岄渶瑕佽缃墠鑳芥甯稿績璺�");
-                        return;
-                    }
 
                     String time = String.valueOf(System.currentTimeMillis());
                     JsonObject jsonObject = new JsonObject();
                     jsonObject.addProperty("id", IdUtils.getUUId());
                     jsonObject.addProperty("time_stamp", time);
+                    if (HDLLinkConfig.getInstance().getDeviceInfoBean().getOID() == null) {
+                        //涓嶈蛋浠庢満鍏ョ綉锛岄�氳繃gatewayId鍙戦��
+                        if (HDLLinkConfig.getInstance().getGatewayId() == null) {
+                            return;
+                        }
+                        String topic = String.format(TopicConstant.HEARTBEAT, HDLLinkConfig.getInstance().getGatewayId());
+                        LinkRequest message = new LinkRequest(topic,
+                                jsonObject.toString());
+                        sendMsg(message.getSendBytes(), null, null, null);
 
-                    String topic = String.format(TopicConstant.HEARTBEAT, HDLLinkConfig.getInstance().getDeviceInfoBean().getOID());
-
-                    LinkRequest message = new LinkRequest(topic,
-                            jsonObject.toString());
-                    sendMsg(message.getSendBytes(), null, null, null);
+                    } else {
+                        if (HDLLinkConfig.getInstance().getRequestBean() != null) {
+                            jsonObject.addProperty("mac", HDLLinkConfig.getInstance().getRequestBean().getMAC());
+                        }
+                        //璧颁粠鏈哄叆缃戯紝閫氳繃oid鍙戦��
+                        String topic = String.format(TopicConstant.HEARTBEAT, HDLLinkConfig.getInstance().getDeviceInfoBean().getOID());
+                        LinkRequest message = new LinkRequest(topic,
+                                jsonObject.toString());
+                        sendMsg(message.getSendBytes(), null, null, null);
+                    }
                 }
             });
         }
@@ -496,6 +526,53 @@
 
             LinkRequest message = new LinkRequest(topic,
                     jsonObject.toString());
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @Override
+                    public void onError() {
+                        if (callBack != null) {
+                            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                if (callBack != null) {
+                    callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 鑾峰彇鍦烘櫙璇︽儏
+     */
+    public void getScene(List<String> sids, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<PropertyReadRequest>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            List<PropertyReadRequest> list = new ArrayList<>();
+            for (String s : sids) {
+                list.add(new PropertyReadRequest(s));
+            }
+            data.setObjects(list);
+
+            String topic = String.format(TopicConstant.SCENE_GET, getGatewayId());
+            LinkRequest message = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
             String replyTopic = topic + "_reply";
             try {
                 sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@@ -574,6 +651,165 @@
     }
 
     /**
+     * 涓婃姤oid鍒楄〃
+     *
+     * @param request  璁惧淇℃伅
+     * @param callBack 鍥炶皟
+     */
+    public void UploadOidList(ListUploadRequest request, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<ListUploadRequest>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            //2023.10.18淇敼锛屼笂鎶id鍒楄〃澧炲姞parentOid
+            if (request != null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) {
+                request.setParentOid(HDLLinkConfig.getInstance().getParentOid());
+            }
+
+            List<ListUploadRequest> list = new ArrayList<>();
+            list.add(request);
+
+            data.setObjects(list);
+
+            String topic = String.format(TopicConstant.LIST_UPLOAD, getGatewayId());
+            LinkRequest message = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @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));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 涓婃姤Sid鍒楄〃
+     *
+     * @param requestList sid鍒楄〃
+     * @param callBack    鍥炶皟
+     */
+    public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<ListSidRequest>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            data.setObjects(requestList);
+
+            String topic = String.format(TopicConstant.LIST_SID_UPLOAD, getGatewayId());
+            LinkRequest message = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @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));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 涓婃姤鍏ョ綉璁よ瘉缁撴灉
+     *
+     * @param mac       mac
+     * @param result    缁撴灉0/-1
+     * @param message   璁よ瘉淇℃伅
+     * @param auth_code 浜戠璁よ瘉code
+     * @param callBack  缁撴灉鍥炶皟
+     */
+    public void UploadDeviceAuth(String mac, String result, String message, String auth_code, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<DeviceAuthRequest>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            DeviceAuthRequest deviceAuthRequest = new DeviceAuthRequest();
+            deviceAuthRequest.setMac(mac);
+            deviceAuthRequest.setResult(result);
+            deviceAuthRequest.setMessage(message);
+            deviceAuthRequest.setAuth_code(auth_code);
+
+            List<DeviceAuthRequest> list = new ArrayList<>();
+            list.add(deviceAuthRequest);
+
+            data.setObjects(list);
+
+            String topic = String.format(TopicConstant.DEIVCE_AUTH_RESULT_NOTIFY, getGatewayId());
+            LinkRequest linkRequest = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(linkRequest.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @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));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+            }
+        }
+    }
+
+
+    /**
      * tcp鐧诲綍鏂逛究鑾峰彇鐘舵��
      *
      * @param clientType 瀹㈡埛绔被鍨�
@@ -623,6 +859,128 @@
         }
     }
 
+
+    /**
+     * 閫氱煡鍒犻櫎骞堕��缃戝瓙璁惧
+     *
+     * @param oid      浠庣綉鍏筹紙璁惧锛塷id
+     * @param isForce  鏄惁寮哄埗閫�缃�
+     * @param callBack 缁撴灉鍥炶皟
+     */
+    public void deleteNetwork(String oid, boolean isForce, 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<ListOidRequest2>> data = new BaseLocalResponse<>();
+        data.setId(msgId);
+        data.setTime_stamp(time);
+
+        final ListOidRequest2 request = new ListOidRequest2();
+        request.setOid(oid);
+        List<ListOidRequest2> list = new ArrayList<>();
+        list.add(request);
+
+        data.setObjects(list);
+
+        String topic = String.format(TopicConstant.DELETE_REQUEST, HDLLinkConfig.getInstance().getGatewayId());
+        LinkRequest message = new LinkRequest(topic,
+                GsonConvert.getGson().toJson(data));
+
+        String replyTopic = topic + "_reply";
+
+        if (isForce) {//寮哄埗閫�缃戯紝涓嶇瓑缃戝叧鍥炲鐩存帴娓呴櫎鏁版嵁
+            HDLLinkConfig.getInstance().clearConfig();
+        }
+
+        try {
+            sendMsg(message.getSendBytes(), replyTopic, 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));
+            }
+        }
+    }
+
+    /**
+     * 閫氱煡鍒犻櫎骞堕��缃戝瓙璁惧鎷撴墤鍏崇郴
+     *
+     * @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 BaseLocalCodeResponse<List<ListOidRequest>> data = new BaseLocalCodeResponse<>();
+        data.setId(msgId);
+        data.setTime_stamp(time);
+        data.setCode("0");
+
+        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, null, new SendListener() {
+                @Override
+                public void onSucceed() {
+                    HDLLinkConfig.getInstance().clearConfig();
+                    if (callBack == null) return;
+                    try {
+                        callBack.onSuccess("閫�缃戞垚鍔�");
+                    } 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));
+            }
+        }
+    }
+
 //    /**
 //     * 娓呯┖缂撳瓨
 //     */
@@ -642,7 +1000,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() {
@@ -651,8 +1013,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));
                     }
                 }
             });
@@ -672,7 +1034,7 @@
     public void tcpSendMsg(String topic, String bodyStr) {
         try {
             if (TextUtils.isEmpty(topic) || TextUtils.isEmpty(bodyStr)) {
-                LogUtils.e("udpSendMsg", "鍙傛暟涓嶈兘涓虹┖");
+                LogUtils.e("tcpSendMsg", "鍙傛暟涓嶈兘涓虹┖");
                 return;
             }
             LinkRequest message = new LinkRequest(topic, bodyStr);
@@ -761,4 +1123,232 @@
 
     }
 
+    /**
+     * 鍥炲缃戝叧閰嶇疆鍛戒护
+     *
+     * @param mac_Oid_GatewayId
+     * @param msgId             娑堟伅Id
+     * @param callBack
+     */
+    public void gatewayRemoteEditReply(String mac_Oid_GatewayId, String msgId, HDLLinkCallBack callBack) {
+        if (TextUtils.isEmpty(mac_Oid_GatewayId)) {
+            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
+        }
+
+        String time = String.valueOf(System.currentTimeMillis());
+        final BaseLocalCodeResponse<List<String>> data = new BaseLocalCodeResponse<>();
+        data.setId(msgId);
+        data.setTime_stamp(time);
+        data.setCode("0");
+
+
+        String topic = String.format(TopicConstant.GATEWAY_EDIT_REMOTE_REPLY, mac_Oid_GatewayId);
+        LinkRequest message = new LinkRequest(topic,
+                GsonConvert.getGson().toJson(data));
+
+
+        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));
+            }
+        }
+    }
+
+    /**
+     * 鑾峰彇鎴块棿鍒楄〃
+     */
+    public void getRoomList(HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty("id", IdUtils.getUUId());
+            jsonObject.addProperty("time_stamp", time);
+
+            String topic = String.format(TopicConstant.ROOM_LIST_GET, getGatewayId());
+
+            LinkRequest message = new LinkRequest(topic,
+                    jsonObject.toString());
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @Override
+                    public void onError() {
+                        if (callBack != null) {
+                            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                if (callBack != null) {
+                    callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 鎴块棿缁戝畾鍏崇郴鍒楄〃鑾峰彇
+     */
+    public void getRoomBindList(List<String> uid, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<String>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            data.setObjects(uid);
+
+            String topic = String.format(TopicConstant.ROOM_BIND_LIST_GET, getGatewayId());
+            LinkRequest message = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @Override
+                    public void onError() {
+                        if (callBack != null) {
+                            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                if (callBack != null) {
+                    callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 鑾峰彇鑷姩鍖栧垪琛�
+     */
+    public void getLogicList(HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.addProperty("id", IdUtils.getUUId());
+            jsonObject.addProperty("time_stamp", time);
+
+            String topic = String.format(TopicConstant.LOGIC_LIST_GET, getGatewayId());
+
+            LinkRequest message = new LinkRequest(topic,
+                    jsonObject.toString());
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @Override
+                    public void onError() {
+                        if (callBack != null) {
+                            callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                if (callBack != null) {
+                    callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+            }
+        }
+    }
+
+    /**
+     * 饩冨姩鍖栧惎饨ょ饨�
+     *
+     * @param sid      鑷姩鍖杝id
+     * @param enable   true=鍚饯 false=绂佲饯
+     * @param callBack 鍥炶皟
+     */
+    public void editEnableLogic(String sid, boolean enable, HDLLinkCallBack callBack) {
+        if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+            String time = String.valueOf(System.currentTimeMillis());
+            final BaseLocalResponse<List<LogicEnableRequest>> data = new BaseLocalResponse<>();
+            data.setId(IdUtils.getUUId());
+            data.setTime_stamp(time);
+
+            List<LogicEnableRequest> list = new ArrayList<>();
+            LogicEnableRequest request = new LogicEnableRequest(sid, enable);
+            list.add(request);
+
+            data.setObjects(list);
+
+            String topic = String.format(TopicConstant.EDIT_LOGIC_ENABLE, getGatewayId());
+            LinkRequest message = new LinkRequest(topic,
+                    GsonConvert.getGson().toJson(data));
+
+            String replyTopic = topic + "_reply";
+            try {
+                sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+                    @Override
+                    public void onSucceed() {
+
+                    }
+
+                    @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));
+                }
+            }
+        } else {
+            if (callBack != null) {
+                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+            }
+        }
+    }
+
 }

--
Gitblit v1.8.0