更新sdk

562935844@qq.com

2023-08-31 b77dc026ffd21dba8652d28409c51e27d3e5a76c

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java

@@ -26,8 +26,10 @@
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.BaseLocalCodeResponse;

import com.hdl.sdk.connect.bean.response.BaseLocalResponse;

import com.hdl.sdk.connect.bean.request.DeviceControlRequest;

import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;

@@ -92,6 +94,7 @@
    }



    public boolean isBroadcast = false;





    /**

     * 广播自身信息给主网关

@@ -543,6 +546,53 @@
    }



    /**

     * 获取场景列表

     */

    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() {

                    @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 sids     场景sid列表

@@ -765,13 +815,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);

@@ -788,6 +838,65 @@


        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      从网关（设备）oid

     * @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, callBack, new SendListener() {

                @Override

                public void onSucceed() {

                    if (callBack == null) return;

@@ -902,7 +1011,7 @@
                threadPool.scheduleWithFixedDelay(new Runnable() {

                    @Override

                    public void run() {

                        if (sendCount.get() < 0) {

                        if (sendCount.get() < 3) {

                            sendCount.set(sendCount.get() + 1);

                            getTcp().sendMsg(data);

                        } else {