diff --git a/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe b/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe index 15959b03b5a42584d5dad6d7e51535721093d1a4..d19ce3914c865e307a7969f3e0fc2421a013ffd2 100644 --- a/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe +++ b/wifi/frameworks/ets/taihe/wifiManager/idl/ohos.wifiManager.taihe @@ -141,9 +141,11 @@ struct WifiP2pDevice { function IsConnected(): bool; function IsWifiActive(): bool; -@gen_async("getLinkedInfo") -@gen_promise("getLinkedInfo") function GetLinkedInfoSync(): WifiLinkedInfo; +@static_overload("getLinkedInfo") +@promise function GetLinkedInfoReturnsPromise(): WifiLinkedInfo; +@static_overload("getLinkedInfo") +@async function GetLinkedInfoWithCallback(): WifiLinkedInfo; function GetSignalLevel(rssi: f64, band: f64): f64; function GetIpInfo(): IpInfo; @@ -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; diff --git a/wifi/frameworks/ets/taihe/wifiManager/src/ohos.wifiManager.impl.cpp b/wifi/frameworks/ets/taihe/wifiManager/src/ohos.wifiManager.impl.cpp index 081570dafb7ebc7574c3d9a7001486866762da11..739a2ed1b7da93aab041fe97ce4392d65671b892 100644 --- a/wifi/frameworks/ets/taihe/wifiManager/src/ohos.wifiManager.impl.cpp +++ b/wifi/frameworks/ets/taihe/wifiManager/src/ohos.wifiManager.impl.cpp @@ -278,7 +278,7 @@ void EnableSemiWifi() } } OHOS::sptr wifiDeviceCallback = - OHOS::sptr(new (std::nothrow) WifiIdlDeviceEventCallback()); + OHOS::sptr(new (std::nothrow) WifiIdlDeviceEventCallback()); OHOS::sptr wifiScanCallback = OHOS::sptr(new (std::nothrow) WifiIdlScanEventCallback()); @@ -289,7 +289,8 @@ OHOS::sptr wifiHotspotCallback = OHOS::sptr wifiP2pCallback = OHOS::sptr(new (std::nothrow) WifiIdlP2pEventCallback()); -void OnWifiStateChange(::taihe::callback_view callback) +void OnWifiStateChange(taihe::string_view, + ::taihe::callback_view callback) { wifiDeviceCallback->wifiStateChangedCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -304,11 +305,13 @@ void OnWifiStateChange(::taihe::callback_view callback) } } -void OffWifiStateChange(::taihe::optional_view<::taihe::callback> callback) +void OffWifiStateChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnWifiConnectionChange(::taihe::callback_view callback) +void OnWifiConnectionChange(taihe::string_view, + ::taihe::callback_view callback) { wifiDeviceCallback->wifiConnectionChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -323,11 +326,13 @@ void OnWifiConnectionChange(::taihe::callback_view callback) } } -void OffWifiConnectionChange(::taihe::optional_view<::taihe::callback> callback) +void OffWifiConnectionChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnWifiScanStateChange(::taihe::callback_view callback) +void OnWifiScanStateChange(taihe::string_view, + ::taihe::callback_view callback) { wifiScanCallback->wifiScanStateChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -342,11 +347,13 @@ void OnWifiScanStateChange(::taihe::callback_view callback) } } -void OffWifiScanStateChange(::taihe::optional_view<::taihe::callback> callback) +void OffWifiScanStateChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnWifiRssiChange(::taihe::callback_view callback) +void OnWifiRssiChange(taihe::string_view, + ::taihe::callback_view callback) { wifiDeviceCallback->wifiRssiChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -361,11 +368,13 @@ void OnWifiRssiChange(::taihe::callback_view callback) } } -void OffWifiRssiChange(::taihe::optional_view<::taihe::callback> callback) +void OffWifiRssiChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnStreamChange(::taihe::callback_view callback) +void OnStreamChange(taihe::string_view, + ::taihe::callback_view callback) { wifiDeviceCallback->wifiStreamChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -380,11 +389,13 @@ void OnStreamChange(::taihe::callback_view callback) } } -void OffStreamChange(::taihe::optional_view<::taihe::callback> callback) +void OffStreamChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnDeviceConfigChange(::taihe::callback_view callback) +void OnDeviceConfigChange(taihe::string_view, + ::taihe::callback_view callback) { wifiDeviceCallback->wifiDeviceConfigChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -399,11 +410,13 @@ void OnDeviceConfigChange(::taihe::callback_view callback) } } -void OffDeviceConfigChange(::taihe::optional_view<::taihe::callback> callback) +void OffDeviceConfigChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnHotspotStateChange(::taihe::callback_view callback) +void OnHotspotStateChange(taihe::string_view, + ::taihe::callback_view callback) { wifiHotspotCallback->wifiHotspotStateChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -418,11 +431,13 @@ void OnHotspotStateChange(::taihe::callback_view callback) } } -void OffHotspotStateChange(::taihe::optional_view<::taihe::callback> callback) +void OffHotspotStateChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnHotspotStaJoin(::taihe::callback_view callback) +void OnHotspotStaJoin(taihe::string_view, + ::taihe::callback_view callback) { wifiHotspotCallback->wifiHotspotStaJoinCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -437,12 +452,13 @@ void OnHotspotStaJoin(::taihe::callback_view> callback) { } -void OnHotspotStaLeave(::taihe::callback_view callback) +void OnHotspotStaLeave(taihe::string_view, + ::taihe::callback_view callback) { wifiHotspotCallback->wifiHotspotStaLeaveCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -457,12 +473,13 @@ void OnHotspotStaLeave(::taihe::callback_view> callback) { } -void OnP2pStateChange(::taihe::callback_view callback) +void OnP2pStateChange(taihe::string_view, + ::taihe::callback_view callback) { wifiP2pCallback->wifiP2pStateChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -477,11 +494,13 @@ void OnP2pStateChange(::taihe::callback_view callback) } } -void OffP2pStateChange(::taihe::optional_view<::taihe::callback> callback) +void OffP2pStateChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnP2pConnectionChange(::taihe::callback_view callback) +void OnP2pConnectionChange(taihe::string_view, + ::taihe::callback_view callback) { wifiP2pCallback->wifiP2pConnectionChangeCallback_ = ::taihe::optional<::taihe::callback> callback) { } -void OnP2pDeviceChange(::taihe::callback_view callback) +void OnP2pDeviceChange(taihe::string_view, + ::taihe::callback_view callback) { wifiP2pCallback->wifiP2pDeviceChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -517,13 +537,14 @@ void OnP2pDeviceChange(::taihe::callback_view> callback) { } -void OnP2pPeerDeviceChange(::taihe::callback_view)> callback) +void OnP2pPeerDeviceChange(taihe::string_view, + ::taihe::callback_view)> callback) { wifiP2pCallback->wifiP2pPeerDeviceChangeCallback_ = ::taihe::optional<::taihe::callback)>> callback) +void OffP2pPeerDeviceChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback)>> callback) { } -void OnP2pPersistentGroupChange(::taihe::callback_view callback) +void OnP2pPersistentGroupChange(taihe::string_view, + ::taihe::callback_view callback) { wifiP2pCallback->wifiP2pPersistentGroupChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -559,12 +581,13 @@ void OnP2pPersistentGroupChange(::taihe::callback_view> callback) +void OffP2pPersistentGroupChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } -void OnP2pDiscoveryChange(::taihe::callback_view callback) +void OnP2pDiscoveryChange(taihe::string_view, + ::taihe::callback_view callback) { wifiP2pCallback->wifiP2pDiscoveryChangeCallback_ = ::taihe::optional<::taihe::callback>{std::in_place_t{}, callback}; @@ -579,7 +602,8 @@ void OnP2pDiscoveryChange(::taihe::callback_view callback) } } -void OffP2pDiscoveryChange(::taihe::optional_view<::taihe::callback> callback) +void OffP2pDiscoveryChange(taihe::string_view, + ::taihe::optional_view<::taihe::callback> callback) { } } @@ -587,6 +611,8 @@ void OffP2pDiscoveryChange(::taihe::optional_view<::taihe::callback