From d31f2155237aa65cee1cb6ce1d39c48191663226 Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期五, 21 二月 2025 18:02:41 +0800 Subject: [PATCH] 新增source屏接口及房间及绑定关系接口 --- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 106 insertions(+), 9 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..0e30ae9 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,29 +3,28 @@ 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.CheckAppVersionListener; 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; /** @@ -40,6 +39,7 @@ private static final HDLLink instance = new HDLLink(); private String appKey, appSecret; + public DeleteNetworkListener listener; /** * getInstance @@ -92,6 +92,15 @@ EventDispatcher.getInstance().removeAllTopicsListener(listener); } + /** + * 娉ㄥ唽閫�缃戜富棰樼殑鐩戝惉 + * + * @param listener + */ + public synchronized void setDeleteNetworkListener(DeleteNetworkListener listener) { + this.listener = listener; + } + /***********************涓夋柟璁惧鍜岀綉鍏抽�氫俊涔嬪墠鐨勮璇佹祦绋�****************************/ /** * 妫�娴嬫槸鍚﹀凡缁忚璇佽繃 @@ -105,6 +114,10 @@ public void selectNetwork(String networkName) { HDLLinkConfig.getInstance().setNetworkName(networkName); + } + + public String getParentOid() { + return HDLLinkConfig.getInstance().getParentOid(); } /** @@ -140,6 +153,7 @@ */ public void UploadDeviceAuth(String mac, String result, String message, String auth_code, HDLLinkCallBack callBack) { HDLSocket.getInstance().UploadDeviceAuth(mac, result, message, auth_code, callBack); + } /** @@ -167,6 +181,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); } /** @@ -207,14 +249,14 @@ } /** - * 鑾峰彇鍔熻兘鍒楄〃 + * 鑾峰彇璁惧鍒楄〃 */ public void getFunctionList(HDLLinkCallBack callBack) { HDLSocket.getInstance().getFunctionList(callBack); } /** - * 鑾峰彇鍔熻兘灞炴�� + * 鑾峰彇璁惧鍔熻兘灞炴�� * * @param sids * @param callBack @@ -251,6 +293,16 @@ } /** + * 鍦烘櫙璇︽儏 + * + * @param sids 鍦烘櫙sid鍒楄〃 + * @param callBack 鍥炶皟 + */ + public void getScene(List<String> sids, HDLLinkCallBack callBack) { + HDLSocket.getInstance().getScene(sids, callBack); + } + + /** * 鍦烘櫙鎺у埗 * * @param sids 鍦烘櫙sid鍒楄〃 @@ -271,6 +323,51 @@ } /** + * 涓婃姤sid鍒楄〃 + * + * @param requestList sid鍒楄〃 + * @param callBack 鍥炶皟 + */ + public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) { + HDLSocket.getInstance().UploadSidList(requestList, callBack); + } + + /** + * 鑾峰彇鎴块棿鍒楄〃 + */ + public void getRoomList(HDLLinkCallBack callBack) { + HDLSocket.getInstance().getRoomList(callBack); + } + + /** + * 鎴块棿缁戝畾鍏崇郴鍒楄〃鑾峰彇 + * + * @param uid 鎴块棿uid鍒楄〃 + * @param callBack 鍥炶皟 + */ + public void getRoomBindList(List<String> uid, HDLLinkCallBack callBack) { + HDLSocket.getInstance().getRoomBindList(uid, callBack); + } + + /** + * 鑾峰彇鑷姩鍖栧垪琛� + */ + public void getLogicList(HDLLinkCallBack callBack) { + HDLSocket.getInstance().getLogicList(callBack); + } + + /** + * 饩冨姩鍖栧惎饨ょ饨� + * + * @param sid 鑷姩鍖杝id + * @param enable true=鍚饯 false=绂佲饯 + * @param callBack 鍥炶皟 + */ + public void editEnableLogic(String sid, boolean enable, HDLLinkCallBack callBack) { + HDLSocket.getInstance().editEnableLogic(sid, enable, callBack); + } + + /** * 閫氱敤UDP鍙戦�佹寚浠� * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆� * -- Gitblit v1.8.0