From 5ea01dd5ce01524afcc3e7b53a3585fece01f75a Mon Sep 17 00:00:00 2001 From: s00659936 <282229496@qq.com> Date: Thu, 3 Jul 2025 17:52:24 +0800 Subject: [PATCH] arkts1.2 adapt connection and sharing Signed-off-by: s00659936 <282229496@qq.com> Change-Id: I5e2598fe8b86cf072b4ebca67b0b641764d3ab3d --- api/@ohos.net.connection.d.ts | 24 ++++++++++++++++-------- api/@ohos.net.sharing.d.ts | 18 ++++++++++++------ kits/@kit.NetworkKit.d.ts | 16 ++++++++-------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index e9e78d4ceb..b0271a90c6 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -1158,7 +1158,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netAvailable', callback: Callback): void; @@ -1174,7 +1175,8 @@ declare namespace connection { * @param { 'netBlockStatusChange' } type - Indicates Event name. * @param { Callback } callback - the callback used to return the result. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netBlockStatusChange', callback: Callback): void; @@ -1200,7 +1202,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netCapabilitiesChange', callback: Callback): void; @@ -1216,7 +1219,8 @@ declare namespace connection { * @param { 'netConnectionPropertiesChange' } type - Indicates Event name. * @param { Callback } callback - the callback used to return the result. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netConnectionPropertiesChange', callback: Callback): void; @@ -1242,7 +1246,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netLost', callback: Callback): void; @@ -1268,7 +1273,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netUnavailable', callback: Callback): void; @@ -1312,7 +1318,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ register(callback: AsyncCallback): void; @@ -1362,7 +1369,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ unregister(callback: AsyncCallback): void; } diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts index 45267f19ca..52b5ce3e0f 100644 --- a/api/@ohos.net.sharing.d.ts +++ b/api/@ohos.net.sharing.d.ts @@ -410,7 +410,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'sharingStateChange', callback: Callback): void; @@ -424,7 +425,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'sharingStateChange', callback?: Callback): void; @@ -450,7 +452,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'interfaceSharingStateChange', callback: Callback): void; @@ -476,7 +479,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'interfaceSharingStateChange', callback?: Callback): void; @@ -490,7 +494,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'sharingUpstreamChange', callback: Callback): void; @@ -504,7 +509,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'sharingUpstreamChange', callback?: Callback): void; diff --git a/kits/@kit.NetworkKit.d.ts b/kits/@kit.NetworkKit.d.ts index 20fd603619..52c8c01390 100644 --- a/kits/@kit.NetworkKit.d.ts +++ b/kits/@kit.NetworkKit.d.ts @@ -19,29 +19,29 @@ */ /*** if arkts 1.1&1.2 */ import connection from '@ohos.net.connection'; +import http from '@ohos.net.http'; +import sharing from '@ohos.net.sharing'; +import webSocket from '@ohos.net.webSocket'; +import statistics from '@ohos.net.statistics'; +import networkSecurity from '@ohos.net.networkSecurity'; export { - connection + connection, http, sharing, webSocket, statistics, networkSecurity }; /*** endif */ /*** if arkts 1.1*/ import ethernet from '@ohos.net.ethernet'; -import http from '@ohos.net.http'; import mdns from '@ohos.net.mdns'; import policy from '@ohos.net.policy'; -import sharing from '@ohos.net.sharing'; import socket from '@ohos.net.socket'; -import statistics from '@ohos.net.statistics'; import vpn from '@ohos.net.vpn'; -import webSocket from '@ohos.net.webSocket'; import vpnExtension from '@ohos.net.vpnExtension'; -import networkSecurity from '@ohos.net.networkSecurity'; import VpnExtensionAbility, { VpnExtensionContext } from '@ohos.app.ability.VpnExtensionAbility'; import netFirewall from '@ohos.net.netFirewall'; export { - ethernet, http, mdns, policy, sharing, webSocket, - socket, statistics, vpn, vpnExtension, networkSecurity, + ethernet, mdns, policy, + socket, vpn, vpnExtension, VpnExtensionAbility, VpnExtensionContext, netFirewall }; /*** endif */ -- Gitee