openharmony/communication_wifi
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_wifi.git synced 2024-12-18 20:40:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

双升单-飞行模式下，wifi状态继承

Browse Source 
Signed-off-by: yanghui <yanghui152@huawei.com>
This commit is contained in:
yanghui 2023-11-30 12:09:28 +00:00 committed by Gitee
parent dc22917da9
commit 2248ca8b99
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp
View File

@ -2390,12 +2390,12 @@ bool WifiManager::GetLocationModeByDatashare()
return (locationMode.compare("1") == 0);
}
bool WifiManager::GetLastStaStateByDatashare()
int WifiManager::GetLastStaStateByDatashare()
{
auto datashareHelper = DelayedSingleton<WifiDataShareHelperUtils>::GetInstance();
if (datashareHelper == nullptr) {
WIFI_LOGE("GetLastStaStateByDatashare, datashareHelper is nullptr!");
return false;
return 0;
}
std::string lastStaState;
@ -2403,11 +2403,12 @@ bool WifiManager::GetLastStaStateByDatashare()
int ret = datashareHelper->Query(uri, SETTINGS_DATASHARE_KEY_WIFI_ON, lastStaState);
if (ret != WIFI_OPT_SUCCESS) {
WIFI_LOGE("GetLastStaStateByDatashare, Query lastStaState fail!");
return false;
return 0;
}
WIFI_LOGI("GetLastStaStateByDatashare, lastStaState:%{public}s", lastStaState.c_str());
return (lastStaState.compare("1") == 0);
int lastStaStateType = ConvertStringToInt(lastStaState);
return lastStaStateType;
}
void WifiManager::RegisterSettingsMigrateEvent()
@ -2616,14 +2617,22 @@ void WifiManager::DealLocationModeChangeEvent()
void WifiManager::CheckAndStartStaByDatashare()
{
if (WifiManager::GetInstance().GetLastStaStateByDatashare()) {
WIFI_LOGI("Datashare key: wifi_on is true, start wifi!");
#ifdef OHOS_ARCH_LITE
WifiManager::GetInstance().AutoStartStaService(AutoStartOrStopServiceReason::AUTO_START_UPON_STARTUP);
#else
constexpr int OPEN_WIFI_NOT_INT_AIRPLANEMODE = 1;
constexpr int OPEN_WIFI_INT_AIRPLANEMODE = 2;
constexpr int CLOSE_WIFI_BY_OPEN_AIRPLANEMODE = 3;
int lastStaState = WifiManager::GetInstance().GetLastStaStateByDatashare();
if (lastStaState == OPEN_WIFI_NOT_INT_AIRPLANEMODE) {
WifiSettings::GetInstance().SetWifiToggledState(true);
WifiManager::GetInstance().WifiToggled(1, 0);
#endif
} else if (lastStaState == OPEN_WIFI_INT_AIRPLANEMODE) {
WifiConfigCenter::GetInstance().SetOpenWifiWhenAirplaneMode(true);
WifiSettings::GetInstance().SetWifiToggledState(true);
WifiManager::GetInstance().WifiToggled(1, 0);
} else if (lastStaState == CLOSE_WIFI_BY_OPEN_AIRPLANEMODE) {
WifiSettings::GetInstance().SetWifiToggledState(true);
}
UnRegisterSettingsMigrateEvent();
std::unique_lock<std::mutex> lock(settingsMigrateMutex);
WifiTimer::GetInstance()->UnRegister(migrateTimerId);

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h
View File

@ -238,7 +238,7 @@ public:
void ForceStopWifi(int instId = 0);
#ifndef OHOS_ARCH_LITE
bool IsMdmForbidden(void);
bool GetLastStaStateByDatashare();
int GetLastStaStateByDatashare();
void CheckAndStartStaByDatashare();
ErrCode WifiToggled(int isOpen, int id);
ErrCode SoftapToggled(int isOpen, int id);