From eaae1042aa49082993dfc5af905d8f4960c2c91f Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Thu, 29 May 2025 07:03:41 +0000 Subject: [PATCH 1/2] modify Signed-off-by: chenqiwei --- .../wifi_service_scheduler.cpp | 54 +++++++++++-------- .../wifi_controller/wifi_service_scheduler.h | 1 + 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index 8bc9fea95..dfd6e591e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -541,29 +541,9 @@ ErrCode WifiServiceScheduler::InitStaService(IStaService *pService, int instId) return WIFI_OPT_FAILED; } #ifndef OHOS_ARCH_LITE - errCode = pService->RegisterStaServiceCallback(WifiCountryCodeManager::GetInstance().GetStaCallback()); + errCode = InitStaServiceExtral(pService, instId); if (errCode != WIFI_OPT_SUCCESS) { - WIFI_LOGE("wifiCountryCodeManager register sta service callback failed, ret=%{public}d!", - static_cast(errCode)); - return WIFI_OPT_FAILED; - } - - errCode = pService->RegisterStaServiceCallback(AppNetworkSpeedLimitService::GetInstance().GetStaCallback()); - if (errCode != WIFI_OPT_SUCCESS) { - WIFI_LOGE("AppNetworkSpeedLimitService register sta service callback failed, ret=%{public}d!", - static_cast(errCode)); - return WIFI_OPT_FAILED; - } - errCode = pService->RegisterStaServiceCallback(WifiHistoryRecordManager::GetInstance().GetStaCallback()); - if (errCode != WIFI_OPT_SUCCESS) { - WIFI_LOGE("WifiHistoryRecordManager register callback failed, ret=%{public}d", static_cast(errCode)); - return WIFI_OPT_FAILED; - } - errCode = pService->RegisterStaServiceCallback(WifiSecurityDetect::GetInstance().GetStaCallback()); - WIFI_LOGI("WifiSecurityDetect register"); - if (errCode != WIFI_OPT_SUCCESS) { - WIFI_LOGE("WifiSecurityDetect register sta service callback failed, ret=%{public}d!", - static_cast(errCode)); + WIFI_LOGE("InitStaServiceExtral Register callback failed!"); return WIFI_OPT_FAILED; } #endif @@ -580,6 +560,36 @@ ErrCode WifiServiceScheduler::InitStaService(IStaService *pService, int instId) return WIFI_OPT_SUCCESS; } +ErrCode WifiServiceScheduler::InitStaServiceExtral(IStaService *pService, int instId) +{ + ErrCode errCode = pService->RegisterStaServiceCallback( + WifiManager::GetInstance().GetWifiStaManager()->GetStaCallback()); + errCode = pService->RegisterStaServiceCallback(WifiCountryCodeManager::GetInstance().GetStaCallback()); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("wifiCountryCodeManager register sta service callback failed, ret=%{public}d!", + static_cast(errCode)); + return WIFI_OPT_FAILED; + } + + errCode = pService->RegisterStaServiceCallback(AppNetworkSpeedLimitService::GetInstance().GetStaCallback()); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("AppNetworkSpeedLimitService register sta service callback failed, ret=%{public}d!", + static_cast(errCode)); + return WIFI_OPT_FAILED; + } + errCode = pService->RegisterStaServiceCallback(WifiHistoryRecordManager::GetInstance().GetStaCallback()); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("WifiHistoryRecordManager register callback failed, ret=%{public}d", static_cast(errCode)); + return WIFI_OPT_FAILED; + } + errCode = pService->RegisterStaServiceCallback(WifiSecurityDetect::GetInstance().GetStaCallback()); + if (errCode != WIFI_OPT_SUCCESS) { + WIFI_LOGE("WifiSecurityDetect register callback failed, ret=%{public}d!", static_cast(errCode)); + return WIFI_OPT_FAILED; + } + return WIFI_OPT_SUCCESS; +} + #ifdef FEATURE_WIFI_PRO_SUPPORT ErrCode WifiServiceScheduler::StartWifiProService(int instId) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.h index 7900b4751..0757be0c1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.h @@ -66,6 +66,7 @@ private: ErrCode InitStaService(IStaService *pService, int instId); ErrCode StartWifiStaService(int instId); ErrCode StartDependentService(int instId); + ErrCode InitStaServiceExtral(IStaService *pService, int instId); void HandleGetStaFailed(int instId); #ifdef FEATURE_WIFI_PRO_SUPPORT ErrCode StartWifiProService(int instId); -- Gitee From 3327f0ceabd98dfde3230abdcf9631c23756c288 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Thu, 29 May 2025 07:43:45 +0000 Subject: [PATCH 2/2] modify Signed-off-by: chenqiwei --- .../wifi_manage/wifi_controller/wifi_service_scheduler.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp index dfd6e591e..ddb91ac47 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_service_scheduler.cpp @@ -562,6 +562,7 @@ ErrCode WifiServiceScheduler::InitStaService(IStaService *pService, int instId) ErrCode WifiServiceScheduler::InitStaServiceExtral(IStaService *pService, int instId) { +#ifndef OHOS_ARCH_LITE ErrCode errCode = pService->RegisterStaServiceCallback( WifiManager::GetInstance().GetWifiStaManager()->GetStaCallback()); errCode = pService->RegisterStaServiceCallback(WifiCountryCodeManager::GetInstance().GetStaCallback()); @@ -587,6 +588,7 @@ ErrCode WifiServiceScheduler::InitStaServiceExtral(IStaService *pService, int in WIFI_LOGE("WifiSecurityDetect register callback failed, ret=%{public}d!", static_cast(errCode)); return WIFI_OPT_FAILED; } +#endif return WIFI_OPT_SUCCESS; } -- Gitee