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 | 8 ++++++-- HDLSDK/com.hdl.sdk/build.gradle | 4 ++-- HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 13 +++++++++++++ HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | 3 +++ HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java | 9 +++++++++ HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 5 +++++ HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java | 2 +- 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/HDLSDK/com.hdl.sdk/build.gradle b/HDLSDK/com.hdl.sdk/build.gradle index e21c3e9..46ae1ff 100644 --- a/HDLSDK/com.hdl.sdk/build.gradle +++ b/HDLSDK/com.hdl.sdk/build.gradle @@ -8,8 +8,8 @@ defaultConfig { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion - versionCode 116 - versionName "1.1.6" + versionCode 117 + versionName "1.1.7" } buildTypes { debug { diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java index b0f006f..05fc32a 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java @@ -35,7 +35,7 @@ return version; } - private String version = "1.1.6"; + private String version = "1.1.7"; private HDLSdk() { } 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 83f0ec7..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 @@ -120,6 +120,10 @@ HDLLinkConfig.getInstance().setNetworkName(networkName); } + public String getParentOid() { + return HDLLinkConfig.getInstance().getParentOid(); + } + /** * 寮�濮嬬洃鍚拰鍙戣捣鍏ョ綉鍙婅璇佽姹� * @@ -324,8 +328,8 @@ /** * 涓婃姤sid鍒楄〃 * - * @param requestList sid鍒楄〃 - * @param callBack 鍥炶皟 + * @param requestList sid鍒楄〃 + * @param callBack 鍥炶皟 */ public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) { HDLSocket.getInstance().UploadSidList(requestList, callBack); diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java index 03e78a2..29a3311 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/ListUploadRequest.java @@ -18,6 +18,7 @@ private String src;//鏉ヨ嚜鍝釜椹卞姩锛屽Link璁惧娌℃湁鍒欏~"LINK" private String from;//鏉ヨ嚜鍝釜缃戝叧锛屽鏋滄椂Link缃戠粶璁惧锛屽垯濉嚜韬玱id锛涘鏋滄槸椹卞姩鍒欎笉闇�瑕佹瀛楁 private List<ImageInfo> image_info; + private String parentOid; public String getOid() { return oid; @@ -83,6 +84,14 @@ this.from = from; } + public String getParentOid() { + return parentOid; + } + + public void setParentOid(String parentOid) { + this.parentOid = parentOid; + } + public List<ImageInfo> getImage_info() { return image_info; } diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java index 1b882f7..006fd97 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java @@ -22,6 +22,7 @@ public static final String AUTHENTICATE_IS_DEVICEINFO_KEY = "auth_deviceinfo_key"; public static final String GATEWAY_REMOTEINFO_KEY="gateway_remoteinfo_key"; + private static final String GATEWAY_PARENTOID_KEY = "gateway_parentoiid_key"; private String localSecret;//鏈湴鍔犲瘑瀵嗛挜 private String gatewayId; @@ -29,6 +30,7 @@ private GatewaySearchBean currentGateway;//褰撳墠缃戝叧 private String networkName; private String homeId; + private String parentOid; private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//褰撳墠璁惧鍩烘湰淇℃伅 private AuthenticateRequest.RequestBean requestBean;//褰撳墠璁惧鍩烘湰淇℃伅 @@ -73,6 +75,7 @@ SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY); SPUtils.remove(AUTHENTICATE_IS_LS_KEY); SPUtils.remove(GATEWAY_REMOTEINFO_KEY); + SPUtils.remove(GATEWAY_PARENTOID_KEY); } /** @@ -83,6 +86,7 @@ gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, ""); ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, ""); homeId = SPUtils.getString(GATEWAY_REMOTEINFO_KEY, ""); + parentOid = SPUtils.getString(GATEWAY_PARENTOID_KEY, ""); } /** @@ -145,6 +149,15 @@ this.ipAddress = ipAddress; } + public String getParentOid() { + return parentOid; + } + + public void setParentOid(String parentOid) { + this.parentOid = parentOid; + SPUtils.put(GATEWAY_PARENTOID_KEY, parentOid); + } + public String getNetworkName() { return networkName; } diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java index 3361024..a14bc66 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java @@ -162,6 +162,9 @@ //绉婚櫎鐩戝惉 EventDispatcher.getInstance().remove(TopicConstant.GATEWAY_AUTH_BROADCAST); HDLLinkConfig.getInstance().setIpAddress(bean.getIPAddress()); + if (!TextUtils.isEmpty(bean.getOID())) { + HDLLinkConfig.getInstance().setParentOid(bean.getOID()); + } String ipStr = bean.getIPAddress(); if (!TextUtils.isEmpty(ipStr)) { sendAuthenticateRequest(ipStr, request, callBack); diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java index 7331819..1ea5d10 100644 --- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java +++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java @@ -662,6 +662,11 @@ data.setId(IdUtils.getUUId()); data.setTime_stamp(time); + //2023.10.18淇敼锛屼笂鎶id鍒楄〃澧炲姞parentOid + if (request!=null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) { + request.setParentOid(HDLLinkConfig.getInstance().getParentOid()); + } + List<ListUploadRequest> list = new ArrayList<>(); list.add(request); -- Gitblit v1.8.0