过滤掉非json数据不传给三方使用

hxb

2022-02-17 af2cbc2a24b3724e7fc3e6b42e134b21a3144c75

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

@@ -27,6 +27,7 @@
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;

import com.hdl.sdk.socket.SocketBoot;

import com.hdl.sdk.socket.SocketOptions;

import com.hdl.sdk.socket.client.IHeartbeat;

import com.hdl.sdk.socket.client.TcpClient;

import com.hdl.sdk.socket.codec.MessagePipeLine;

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

@@ -413,6 +414,27 @@
        //如果没有初始化，或者网关IP更改了，就重新初始化

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

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

                        return;

                    }



                    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.HEARTBEAT, HDLLinkConfig.getInstance().getDeviceInfoBean().getOID());



                    LinkRequest message = new LinkRequest(topic,

                            jsonObject.toString());

                    sendMsg(message.getSendBytes(), null, null, null);

                }

            });

        }



        return tcpBoot;

@@ -574,46 +596,48 @@
    public void sendMsg(byte[] data, String eventTag, HDLLinkCallBack callBack, SendListener sendListener) {



        try {

            final AtomicInteger sendCount = new AtomicInteger(0);

            if(eventTag!=null) {

                final AtomicInteger sendCount = new AtomicInteger(0);



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

            final EventListener eventListener = new EventListener() {

                @Override

                public void onMessage(Object msg) {

                    if (msg instanceof LinkResponse) {

                        LogUtils.i("sendMsg onSuccess");

                        threadPool.shutdownNow();

                        LogUtils.i("sendMsg eventListener remove");

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

                        if (callBack != null) {

                            callBack.onSuccess(msg.toString());

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

                final EventListener eventListener = new EventListener() {

                    @Override

                    public void onMessage(Object msg) {

                        if (msg instanceof LinkResponse) {

                            LogUtils.i("sendMsg onSuccess");

                            threadPool.shutdownNow();

                            LogUtils.i("sendMsg eventListener remove");

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

                            if (callBack != null) {

                                callBack.onSuccess(msg.toString());

                            }

                        }

                    }

                }

            };

                };



            threadPool.scheduleWithFixedDelay(new Runnable() {

                @Override

                public void run() {

                    if (sendCount.get() < 3) {

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

                        getTcp().sendMsg(data);

                    } else {

                        threadPool.shutdownNow();

                        LogUtils.e("sendMsg eventListener remove");

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

                        ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {

                            @Override

                            public void run() {

                                if (callBack != null) {

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

                threadPool.scheduleWithFixedDelay(new Runnable() {

                    @Override

                    public void run() {

                        if (sendCount.get() < 3) {

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

                            getTcp().sendMsg(data);

                        } else {

                            threadPool.shutdownNow();

                            LogUtils.e("sendMsg eventListener remove");

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

                            ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {

                                @Override

                                public void run() {

                                    if (callBack != null) {

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

                                    }

                                }

                            }

                        });

                            });

                        }

                    }

                }

            }, 1000, 500, TimeUnit.MILLISECONDS);

            EventDispatcher.getInstance().register(eventTag, eventListener);

                }, 1000, 500, TimeUnit.MILLISECONDS);

                EventDispatcher.getInstance().register(eventTag, eventListener);

            }

            //先发送一次

            getTcp().sendMsg(data, new SendListener() {

                @Override