上报oid列表新增parentoid

562935844@qq.com

2023-10-18 755e2893c12b79649ee12dec2b7d832d58b9265b

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

@@ -1,16 +1,10 @@
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;



import androidx.annotation.RequiresApi;



import com.google.gson.JsonObject;

import com.google.gson.reflect.TypeToken;

import com.hdl.sdk.common.HDLSdk;

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

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

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

@@ -18,34 +12,29 @@
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.LinkRequest;

import com.hdl.sdk.connect.bean.LinkResponse;

import com.hdl.sdk.connect.bean.LoginRequest;

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

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

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

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

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

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

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.request.PropertyReadRequest;

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;

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;

import com.hdl.sdk.connect.protocol.LinkMessageDecoder;

import com.hdl.sdk.connect.protocol.LinkMessageEncoder;

import com.hdl.sdk.connect.utils.AesUtil;

import com.hdl.sdk.socket.SocketBoot;

import com.hdl.sdk.socket.SocketOptions;

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

@@ -55,7 +44,6 @@
import com.hdl.sdk.socket.listener.SendListener;



import java.util.ArrayList;

import java.util.Base64;

import java.util.List;

import java.util.concurrent.ScheduledExecutorService;

import java.util.concurrent.TimeUnit;

@@ -126,7 +114,7 @@
                        }

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

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

                            @RequiresApi(api = Build.VERSION_CODES.O)

                            //                            @RequiresApi(api = Build.VERSION_CODES.O)

                            @Override

                            public void onSuccess(LinkResponse msg) {

                                String data = msg.getData();

@@ -662,6 +650,10 @@
            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);