修改入网认证流程

562935844@qq.com

2022-12-28 30e96788f05f5ce28b58d991051c79e9c952c824

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

@@ -4,6 +4,7 @@
import android.util.Log;



import com.google.gson.JsonObject;

import com.google.gson.reflect.TypeToken;

import com.hdl.sdk.common.config.TopicConstant;

import com.hdl.sdk.common.event.EventDispatcher;

import com.hdl.sdk.common.event.EventListener;

@@ -11,15 +12,20 @@
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.request.PropertyReadRequest;

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

import com.hdl.sdk.connect.callback.HDLLinkCallBack;

import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;

import com.hdl.sdk.connect.config.HDLLinkConfig;

@@ -59,7 +65,7 @@
        statusListener = new ConnectStatusListener() {

            @Override

            public void onConnecting() {

                broadcastRequest();

                //broadcastRequest();

            }



            @Override

@@ -74,43 +80,67 @@
        };

    }



    public boolean isBroadcast = false;



    /**

     * 广播自身信息给主网关

     */

    private void broadcastRequest() {

    public void broadcastRequest() {



        new Thread(new Runnable() {

            @Override

            public void run() {

                try {

                    LogUtils.i("广播设备本身信息");

                while (true) {

                    try {

                        Thread.sleep(1000);

//                        LogUtils.i("checkIfCertified=" + HDLLink.getInstance().checkIfCertified() + " getTcp().connected=" + getTcp().connected);

                        try {

                            if (!HDLLink.getInstance().checkIfCertified() || getTcp().connected) {

                                continue;

                            }

                        } catch (Exception e) {



                    String time = String.valueOf(System.currentTimeMillis());

                    if (null == HDLLinkConfig.getInstance().getDeviceInfoBean()) {

                        LogUtils.i("DeviceInfoBean为空，请设置当前对象");

                        return;

                        }

                        LogUtils.i("广播设备本身信息");

                        String time = String.valueOf(System.currentTimeMillis());

                        if (null == HDLLinkConfig.getInstance().getDeviceInfoBean()) {

                            LogUtils.i("DeviceInfoBean为空，请设置当前对象");

                            continue;

                        }

                        BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");

                        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {

                            @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());

                                    HDLLinkConfig.getInstance().setIpAddress(response.getObjects().getIPAddress());

                                    HDLLinkConfig.getInstance().reSaveConfig();

                                }

                                isBroadcast = true;

                                LogUtils.i("广播信息给主网关成功！");

                            }



                            @Override

                            public void onError(HDLLinkException e) {

                                isBroadcast = false;

                                LogUtils.i("广播信息给主网关失败！");

                            }

                        });

//                        HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true);

                        //HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true);

                    } catch (Exception e) {

                        LogUtils.e("广播设备本身信息失败，失败信息：" + e.getMessage());

                    }

                    BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");

                    HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {

                        @Override

                        public void onSuccess(LinkResponse msg) {

                            LogUtils.i("广播信息给主网关成功！");

                        }



                        @Override

                        public void onError(HDLLinkException e) {

                            LogUtils.i("广播信息给主网关失败！");

                        }

                    });

                    HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true);

                    HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true);

                } catch (Exception e) {

                    LogUtils.e("广播设备本身信息失败，失败信息：" + e.getMessage());

                }



            }

        }).start();

    }



//    private static class SingletonInstance {

    //    private static class SingletonInstance {

//    }

    private static final HDLSocket instance = new HDLSocket();



@@ -119,8 +149,9 @@
    }



    SocketOptions options;



    private SocketOptions getTcpOptions() {

        if(null!=options){

        if (null != options) {

            return options;

        }

        options = new SocketOptions();

@@ -423,13 +454,13 @@
            throw new RuntimeException("请搜索网关");

        }

        //如果没有初始化，或者网关IP更改了，就重新初始化

        if (tcpBoot == null||!getTcpOptions().getIp().equals(getTcpIp())) {

        if (tcpBoot == null || !getTcpOptions().getIp().equals(getTcpIp())) {

            tcpBoot = TcpClient.init(getTcpIp(), getTcpPort(), getTcpOptions());

            tcpBoot.SetHeartbeat(new IHeartbeat() {

                @Override

                public void heartbeat() {



                    if(HDLLinkConfig.getInstance().getDeviceInfoBean()==null||HDLLinkConfig.getInstance().getDeviceInfoBean().getOID()==null) {

                    if (HDLLinkConfig.getInstance().getDeviceInfoBean() == null || HDLLinkConfig.getInstance().getDeviceInfoBean().getOID() == null) {

                        LogUtils.i("DeviceInfoBean为空，需要设置才能正常心跳");

                        return;

                    }

@@ -493,8 +524,9 @@
    }



    /**

     *  场景控制

     * @param sids 场景sid列表

     * 场景控制

     *

     * @param sids     场景sid列表

     * @param callBack 回调

     */

    public void controlScene(List<String> sids, HDLLinkCallBack callBack) {

@@ -535,6 +567,56 @@
                }

            }

        } else {

            if (callBack != null) {

                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));

            }

        }

    }



    /**

     * tcp登录方便获取状态

     *

     * @param clientType 客户端类型

     *                   应用：app；

     *                   调试软件：program；

     *                   第三方：third_party；

     *                   网关：gateway；

     *                   其它：other

     * @param version    协议版本

     */

    public void tcpLogin(String clientType, String version, HDLLinkCallBack callBack) {

        final String msgId = IdUtils.getUUId();

        String time = String.valueOf(System.currentTimeMillis());

        final BaseLocalResponse<LoginRequest> data = new BaseLocalResponse<>();

        data.setId(msgId);

        data.setTime_stamp(time);



        final LoginRequest request = new LoginRequest();

        request.setVersion(version);

        request.setClientType(clientType);



        data.setObjects(request);



        String topic = String.format(TopicConstant.GATEWAY_LOGIN, HDLLinkConfig.getInstance().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() {

                    LogUtils.i("tcpLogin 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));

            }

@@ -584,8 +666,8 @@
    /**

     * 通用TCP发送指令 只发一次，不监听回复，不重发

     *

     * @param topic    发送数据

     * @param bodyStr  回复的主题

     * @param topic   发送数据

     * @param bodyStr 回复的主题

     */

    public void tcpSendMsg(String topic, String bodyStr) {

        try {

@@ -596,7 +678,7 @@
            LinkRequest message = new LinkRequest(topic, bodyStr);

            getTcp().sendMsg(message.getSendBytes());

        } catch (Exception e) {

            LogUtils.e("tcpSendMsg", "发送失败 :"+e.getMessage());

            LogUtils.e("tcpSendMsg", "发送失败 :" + e.getMessage());

        }

    }



@@ -607,7 +689,7 @@
    public void sendMsg(byte[] data, String eventTag, HDLLinkCallBack callBack, SendListener sendListener) {



        try {

            if(eventTag!=null) {

            if (eventTag != null) {

                final AtomicInteger sendCount = new AtomicInteger(0);



                final ScheduledExecutorService threadPool = ThreadToolUtils.getInstance().newScheduledThreadPool(1);