增加版本通过配置读取

hxb

2024-08-20 0a8fd4aa92555875f58f67144c2c0c0a20a200af

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

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



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



import android.os.Build;

import android.text.TextUtils;

import android.util.Log;

@@ -27,6 +29,7 @@
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.ListSidRequest;

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

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

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

@@ -106,7 +109,7 @@
            public void run() {

                while (true) {

                    try {

                        Thread.sleep(1000);

                        Thread.sleep(5000);

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

                        try {

                            if (!HDLLink.getInstance().checkIfCertified() || (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected)) {

@@ -130,6 +133,10 @@
                                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());



@@ -466,14 +473,15 @@
        }

    }



    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("请搜索网关");

        }

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

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

@@ -655,12 +663,63 @@
            data.setId(IdUtils.getUUId());

            data.setTime_stamp(time);



            //2023.10.18修改，上报oid列表增加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));



@@ -896,14 +955,13 @@
//        String replyTopic = topic + "_reply";



        try {

            sendMsg(message.getSendBytes(), topic, callBack, new SendListener() {

            sendMsg(message.getSendBytes(), topic, null, new SendListener() {

                @Override

                public void onSucceed() {

                    HDLLinkConfig.getInstance().clearConfig();

                    if (callBack == null) return;

                    try {

                        callBack.onSuccess("退网成功");

                        HDLLinkConfig.getInstance().clearConfig();



                    } catch (Exception e) {

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

                    }

@@ -942,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() {

@@ -951,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));

                    }

                }

            });

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

                    @Override

                    public void run() {

                        if (sendCount.get() < 3) {

                        if (sendCount.get() < 0) {

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

                            getTcp().sendMsg(data);

                        } else {

@@ -1061,4 +1123,56 @@


    }



    /**

     * 回复网关配置命令

     *

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

            }

        }

    }



}