From ccce4557a6d9600db8f80337c1ca8f94af487a3b Mon Sep 17 00:00:00 2001 From: leo9001 Date: Wed, 9 Jul 2025 10:54:44 +0800 Subject: [PATCH] =?UTF-8?q?overload=E6=95=B4=E6=94=B9=20ets=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitee.com/openharmony/communication_wifi/issues/ICKV5M?from=project-issue Signed-off-by: leo9001 --- .../wifiManager/idl/ohos.wifiManager.taihe | 193 +++++++----------- 1 file changed, 76 insertions(+), 117 deletions(-) diff --git a/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe b/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe index 15959b03b..86450ad63 100644 --- a/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe +++ b/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe @@ -141,8 +141,10 @@ struct WifiP2pDevice { function IsConnected(): bool; function IsWifiActive(): bool; -@gen_async("getLinkedInfo") -@gen_promise("getLinkedInfo") +@static_overload("getLinkedInfo") +@async function GetLinkedInfoWithCallback(): WifiLinkedInfo; +@static_overload("getLinkedInfo") +@promise function GetLinkedInfoReturnsPromise(): WifiLinkedInfo; function GetLinkedInfoSync(): WifiLinkedInfo; function GetSignalLevel(rssi: f64, band: f64): f64; @@ -157,124 +159,81 @@ function EnableWifi(): void; function DisableWifi(): void; function EnableSemiWifi(): void; -@!sts_inject(""" -export function on(type: string, cb: (arg_0: NullishType) => void) { - switch(type) { - case "wifiStateChange": return onWifiStateChange(cb); - case "wifiConnectionChange": return onWifiConnectionChange(cb); - case "wifiScanStateChange": return onWifiScanStateChange(cb); - case "wifiRssiChange": return onWifiRssiChange(cb); - case "streamChange": return onStreamChange(cb); - case "deviceConfigChange": return onDeviceConfigChange(cb); - case "hotspotStateChange": return onHotspotStateChange(cb); - case "hotspotStaJoin": return onHotspotStaJoin(cb); - case "hotspotStaLeave": return onHotspotStaLeave(cb); - case "p2pStateChange": return onP2pStateChange(cb); - case "p2pConnectionChange": return onP2pConnectionChange(cb); - case "p2pDeviceChange": return onP2pDeviceChange(cb); - case "p2pPeerDeviceChange": return onP2pPeerDeviceChange(cb); - case "p2pPersistentGroupChange": return onP2pPersistentGroupChange(cb); - case "p2pDiscoveryChange": return onP2pDiscoveryChange(cb); - default: throw new Error(`Unknown type: ${type}`); - } -} -export function off(type: string, cb?: (arg_0: NullishType) => void) { - switch(type) { - case "wifiStateChange": return offWifiStateChange(cb as (((data: double) => void) | undefined)); - case "wifiConnectionChange": return offWifiConnectionChange(cb as (((data: double) => void) | undefined)); - case "wifiScanStateChange": return offWifiScanStateChange(cb as (((data: double) => void) | undefined)); - case "wifiRssiChange": return offWifiRssiChange((cb as (((data: double) => void)|undefined))); - case "streamChange": return offStreamChange(cb as (((data: double) => void) | undefined)); - case "deviceConfigChange": return offDeviceConfigChange(cb as (((data: double) => void) | undefined)); - case "hotspotStateChange": return offHotspotStateChange(cb as (((data: double) => void) | undefined)); - case "hotspotStaJoin": return offHotspotStaJoin(cb as (((data: StationInfo) => void) | undefined)); - case "hotspotStaLeave": return offHotspotStaLeave(cb as (((data: StationInfo) => void) | undefined)); - case "p2pStateChange": return offP2pStateChange(cb as (((data: double) => void) | undefined)); - case "p2pConnectionChange": return offP2pConnectionChange(cb as (((data: WifiP2pLinkedInfo) => void) | undefined)); - case "p2pDeviceChange": return offP2pDeviceChange(cb as (((data: WifiP2pDevice) => void) | undefined)); - case "p2pPeerDeviceChange": return offP2pPeerDeviceChange(cb as (((data: Array) => void) | undefined)); - case "p2pPersistentGroupChange": return offP2pPersistentGroupChange(cb as ((() => void) | undefined)); - case "p2pDiscoveryChange": return offP2pDiscoveryChange(cb as (((data: double) => void) | undefined)); - default: throw new Error(`Unknown type: ${type}`); - } -} -""") - -// @on_off("wifiStateChange") -function OnWifiStateChange(callback: (data: f64) => void): void; -// @on_off("wifiStateChange") -function OffWifiStateChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("wifiConnectionChange") -function OnWifiConnectionChange(callback: (data: f64) => void): void; -// @on_off("wifiConnectionChange") -function OffWifiConnectionChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("wifiScanStateChange") -function OnWifiScanStateChange(callback: (data: f64) => void): void; -// @on_off("wifiScanStateChange") -function OffWifiScanStateChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("wifiRssiChange") -function OnWifiRssiChange(callback: (data: f64) => void): void; -// @on_off("wifiRssiChange") -function OffWifiRssiChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("streamChange") -function OnStreamChange(callback: (data: f64) => void): void; -// @on_off("streamChange") -function OffStreamChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("deviceConfigChange") -function OnDeviceConfigChange(callback: (data: f64) => void): void; -// @on_off("deviceConfigChange") -function OffDeviceConfigChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("hotspotStateChange") -function OnHotspotStateChange(callback: (data: f64) => void): void; -// @on_off("hotspotStateChange") -function OffHotspotStateChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("hotspotStaJoin") -function OnHotspotStaJoin(callback: (data: StationInfo) => void): void; -// @on_off("hotspotStaJoin") -function OffHotspotStaJoin(callback: Optional<(data: StationInfo) => void>): void; - -// @on_off("hotspotStaLeave") -function OnHotspotStaLeave(callback: (data: StationInfo) => void): void; -// @on_off("hotspotStaLeave") -function OffHotspotStaLeave(callback: Optional<(data: StationInfo) => void>): void; - -// @on_off("p2pStateChange") -function OnP2pStateChange(callback: (data: f64) => void): void; -// @on_off("p2pStateChange") -function OffP2pStateChange(callback: Optional<(data: f64) => void>): void; - -// @on_off("p2pConnectionChange") -function OnP2pConnectionChange(callback: (data: WifiP2pLinkedInfo) => void): void; -// @on_off("p2pConnectionChange") -function OffP2pConnectionChange(callback: Optional<(data: WifiP2pLinkedInfo) => void>): void; - -// @on_off("p2pDeviceChange") -function OnP2pDeviceChange(callback: (data: WifiP2pDevice) => void): void; -// @on_off("p2pDeviceChange") -function OffP2pDeviceChange(callback: Optional<(data: WifiP2pDevice) => void>): void; - -// @on_off("p2pPeerDeviceChange") -function OnP2pPeerDeviceChange(callback: (data: Array) => void): void; -// @on_off("p2pPeerDeviceChange") -function OffP2pPeerDeviceChange(callback:Optional<(data: Array) => void>): void; +@static_overload("on") +function OnWifiStateChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffWifiStateChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnWifiConnectionChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffWifiConnectionChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnWifiScanStateChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffWifiScanStateChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnWifiRssiChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffWifiRssiChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnStreamChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffStreamChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnDeviceConfigChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffDeviceConfigChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnHotspotStateChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffHotspotStateChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnHotspotStaJoin(type: String, callback: (data: StationInfo) => void): void; +@static_overload("off") +function OffHotspotStaJoin(type: String, callback: Optional<(data: StationInfo) => void>): void; + +@static_overload("on") +function OnHotspotStaLeave(type: String, callback: (data: StationInfo) => void): void; +@static_overload("off") +function OffHotspotStaLeave(type: String, callback: Optional<(data: StationInfo) => void>): void; + +@static_overload("on") +function OnP2pStateChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffP2pStateChange(type: String, callback: Optional<(data: f64) => void>): void; + +@static_overload("on") +function OnP2pConnectionChange(type: String, callback: (data: WifiP2pLinkedInfo) => void): void; +@static_overload("off") +function OffP2pConnectionChange(type: String, callback: Optional<(data: WifiP2pLinkedInfo) => void>): void; + +@static_overload("on") +function OnP2pDeviceChange(type: String, callback: (data: WifiP2pDevice) => void): void; +@static_overload("off") +function OffP2pDeviceChange(type: String, callback: Optional<(data: WifiP2pDevice) => void>): void; + +@static_overload("on") +function OnP2pPeerDeviceChange(type: String, callback: (data: Array) => void): void; +@static_overload("off") +function OffP2pPeerDeviceChange(type: String, callback:Optional<(data: Array) => void>): void; union UndefinedType { @undefined undefined; } -// @on_off("p2pPersistentGroupChange") -function OnP2pPersistentGroupChange(callback: (data: UndefinedType) => void): void; -// @on_off("p2pPersistentGroupChange") -function OffP2pPersistentGroupChange(callback: Optional<(data: UndefinedType) => void>): void; +@static_overload("on") +function OnP2pPersistentGroupChange(type: String, callback: (data: UndefinedType) => void): void; +@static_overload("off") +function OffP2pPersistentGroupChange(type: String, callback: Optional<(data: UndefinedType) => void>): void; -// @on_off("p2pDiscoveryChange") -function OnP2pDiscoveryChange(callback: (data: f64) => void): void; -// @on_off("p2pDiscoveryChange") -function OffP2pDiscoveryChange(callback: Optional<(data: f64) => void>): void; \ No newline at end of file +@static_overload("on") +function OnP2pDiscoveryChange(type: String, callback: (data: f64) => void): void; +@static_overload("off") +function OffP2pDiscoveryChange(type: String, callback: Optional<(data: f64) => void>): void; \ No newline at end of file -- Gitee