提交jar版本

562935844@qq.com

2022-05-13 a3f9e5ce8dce3d86a60a79b85ce44424a612c6fa

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

@@ -1,8 +1,5 @@
package com.hdl.sdk.connect.socket;



import android.text.TextUtils;

import android.util.Log;



import com.google.gson.JsonObject;

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

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

@@ -11,6 +8,7 @@
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.TextUtils;

import com.hdl.sdk.common.utils.ThreadToolUtils;

import com.hdl.sdk.common.utils.gson.GsonConvert;

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

@@ -32,6 +30,8 @@
import com.hdl.sdk.socket.codec.MessagePipeLine;

import com.hdl.sdk.socket.listener.ConnectStatusListener;

import com.hdl.sdk.socket.listener.SendListener;



import org.apache.commons.lang3.StringEscapeUtils;



import java.util.ArrayList;

import java.util.List;

@@ -119,6 +119,7 @@
    }



    SocketOptions options;



    private SocketOptions getTcpOptions() {

        if(null!=options){

            return options;

@@ -243,6 +244,7 @@


            final BaseLocalResponse<List<FunctionAttributeRequest>> data = new BaseLocalResponse<>();

            data.setId(IdUtils.getUUId());



            data.setTime_stamp(time);

            List<FunctionAttributeRequest> list = new ArrayList<>();

            for (String s : sids) {

@@ -494,6 +496,7 @@


    /**

     *  场景控制

     *

     * @param sids 场景sid列表

     * @param callBack 回调

     */

@@ -615,12 +618,14 @@
                    @Override

                    public void onMessage(Object msg) {

                        if (msg instanceof LinkResponse) {

                            LogUtils.i("sendMsg onSuccess");

                            LogUtils.i("sendMsg onSuccess" + StringEscapeUtils.unescapeJava(msg.toString()));

//                            LogUtils.i("sendMsg onSuccess" + msg);

                            threadPool.shutdownNow();

                            LogUtils.i("sendMsg eventListener remove");

                            EventDispatcher.getInstance().remove(eventTag, this);

                            if (callBack != null) {

                                callBack.onSuccess(msg.toString());

                                callBack.onSuccess(StringEscapeUtils.unescapeJava(msg.toString()));

//                                callBack.onSuccess(msg.toString());

                            }

                        }

                    }

@@ -644,6 +649,8 @@
                                    }

                                }

                            });

                            LogUtils.i("HDLSocket sendMsg onError 发送失败");



                        }

                    }

                }, 1000, 500, TimeUnit.MILLISECONDS);

@@ -675,6 +682,8 @@
                    }

                }

            });

            LogUtils.i("HDLSocket sendMsg onError 发送失败");



        }



    }