From 755e2893c12b79649ee12dec2b7d832d58b9265b Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期三, 18 十月 2023 16:19:26 +0800
Subject: [PATCH] 上报oid列表新增parentoid
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
index d1aa555..e7a0790 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,33 +1,20 @@
package com.hdl.sdk.connect;
-import android.content.Context;
-
-import com.hdl.hdlhttp.HxHttpConfig;
import com.hdl.sdk.common.event.DeleteNetworkListener;
+import com.hdl.sdk.common.event.EventDispatcher;
+import com.hdl.sdk.common.event.EventListener;
import com.hdl.sdk.common.utils.LogUtils;
-import com.hdl.sdk.common.utils.ThreadToolUtils;
-import com.hdl.sdk.connect.bean.request.DeviceAuthRequest;
+import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.ListSidRequest;
import com.hdl.sdk.connect.bean.request.ListUploadRequest;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
-import com.hdl.sdk.connect.cloud.CallBackListener;
-import com.hdl.sdk.connect.cloud.HdlCloudApi;
-import com.hdl.sdk.connect.cloud.HdlCloudController;
-import com.hdl.sdk.connect.cloud.interceptor.EncryptInterceptor;
-import com.hdl.sdk.connect.cloud.interceptor.SmartHeaderInterceptor;
import com.hdl.sdk.connect.config.HDLLinkConfig;
-import com.hdl.sdk.common.event.EventDispatcher;
-import com.hdl.sdk.common.event.EventListener;
-import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.socket.HDLAuthSocket;
import com.hdl.sdk.connect.socket.HDLSocket;
import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.rxjava3.disposables.Disposable;
-import okhttp3.logging.HttpLoggingInterceptor;
/**
* Created by jlchen on 11/15/21.
@@ -118,6 +105,10 @@
HDLLinkConfig.getInstance().setNetworkName(networkName);
}
+ public void setParentOid(String parentOid) {
+ HDLLinkConfig.getInstance().setParentOid(parentOid);
+ }
+
/**
* 寮�濮嬬洃鍚拰鍙戣捣鍏ョ綉鍙婅璇佽姹�
*
@@ -161,7 +152,7 @@
* @param spk 璁惧spk
* @param callBack 缁撴灉鍥炶皟
*/
- public void applyDeviceSecret(Context context, String appKey, String appSecret, String supplier, String mac, String spk, CallBackListener callBack) {
+ /*public void applyDeviceSecret(Context context, String appKey, String appSecret, String supplier, String mac, String spk, CallBackListener callBack) {
LogUtils.i("鐢宠璁惧瀵嗛挜");
HxHttpConfig.getInstance().init(context, HdlCloudApi.BASE_CHINA_URL)
.addInterceptor(
@@ -179,6 +170,34 @@
HdlCloudController.applyDeviceSecret(supplier, mac, spk, callBack);
}
+*/
+ /**
+ * 妫�娴嬫洿鏂�
+ *
+ * @param appKey appKey
+ * @param appSecret appSecret
+ * @param versionCode 褰撳墠鐗堟湰
+ * @param appCode appCode
+ * @param listener 缁撴灉鍥炶皟
+ */
+ /*public void checkAppVersion(Context context, String appKey, String appSecret, String versionCode, String appCode, CheckAppVersionListener listener) {
+ LogUtils.i("妫�娴嬫洿鏂�");
+ HxHttpConfig.getInstance().init(context, HdlCloudApi.BASE_CHINA_URL)
+ .addInterceptor(
+ new EncryptInterceptor(),
+ new SmartHeaderInterceptor());
+ this.appKey = appKey;
+ this.appSecret = appSecret;
+
+ HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
+ httpLoggingInterceptor.level(HttpLoggingInterceptor.Level.BODY);
+
+ HxHttpConfig.getInstance()
+ //.addInterceptor(new HttpCacheInterceptor())
+ .addInterceptor(httpLoggingInterceptor).ignoreSSL();
+
+ HdlCloudController.checkAppVersion(versionCode, appCode, listener);
+ }*/
/**
* 閫氱煡鍒犻櫎骞堕��缃戝瓙璁惧
@@ -292,6 +311,16 @@
}
/**
+ * 涓婃姤sid鍒楄〃
+ *
+ * @param requestList sid鍒楄〃
+ * @param callBack 鍥炶皟
+ */
+ public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {
+ HDLSocket.getInstance().UploadSidList(requestList, callBack);
+ }
+
+ /**
* 閫氱敤UDP鍙戦�佹寚浠�
* 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
*
--
Gitblit v1.8.0