From c1e8d3a7709295a52814378e73a68e1e1fd20da6 Mon Sep 17 00:00:00 2001 From: 562935844@qq.com Date: 星期三, 18 十月 2023 16:47:40 +0800 Subject: [PATCH] 上报oid列表新增parentoid --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 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 e84727d..085df44 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 @@ -3,14 +3,17 @@ import android.content.Context; import com.hdl.hdlhttp.HxHttpConfig; +import com.hdl.sdk.common.event.DeleteNetworkListener; 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.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.CheckAppVersionListener; import com.hdl.sdk.connect.cloud.HdlCloudApi; import com.hdl.sdk.connect.cloud.HdlCloudController; import com.hdl.sdk.connect.cloud.interceptor.EncryptInterceptor; @@ -40,6 +43,7 @@ private static final HDLLink instance = new HDLLink(); private String appKey, appSecret; + public DeleteNetworkListener listener; /** * getInstance @@ -92,6 +96,15 @@ EventDispatcher.getInstance().removeAllTopicsListener(listener); } + /** + * 娉ㄥ唽閫�缃戜富棰樼殑鐩戝惉 + * + * @param listener + */ + public synchronized void setDeleteNetworkListener(DeleteNetworkListener listener) { + this.listener = listener; + } + /***********************涓夋柟璁惧鍜岀綉鍏抽�氫俊涔嬪墠鐨勮璇佹祦绋�****************************/ /** * 妫�娴嬫槸鍚﹀凡缁忚璇佽繃 @@ -105,6 +118,10 @@ public void selectNetwork(String networkName) { HDLLinkConfig.getInstance().setNetworkName(networkName); + } + + public String getParentOid() { + return HDLLinkConfig.getInstance().getParentOid(); } /** @@ -167,6 +184,34 @@ .addInterceptor(httpLoggingInterceptor).ignoreSSL(); 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); } /** @@ -251,6 +296,16 @@ } /** + * 鍦烘櫙璇︽儏 + * + * @param sids 鍦烘櫙sid鍒楄〃 + * @param callBack 鍥炶皟 + */ + public void getScene(List<String> sids, HDLLinkCallBack callBack) { + HDLSocket.getInstance().getScene(sids, callBack); + } + + /** * 鍦烘櫙鎺у埗 * * @param sids 鍦烘櫙sid鍒楄〃 @@ -271,6 +326,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