openharmony/communication_wifi
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_wifi.git synced 2024-11-27 17:22:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1615 修改关闭wifi崩溃问题

Browse Source 
Merge pull request !1615 from huxiaominlenho/master
This commit is contained in:
openharmony_ci 2023-12-22 07:40:55 +00:00 committed by Gitee
commit 85a7e866b0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp
View File

@ -115,9 +115,6 @@ StaStateMachine::~StaStateMachine()
}
ParsePointer(pDhcpResultNotify);
ParsePointer(pNetcheck);
#ifndef OHOS_ARCH_LITE
NetStateObserver::GetInstance().StopNetStateObserver();
#endif
}
/* ---------------------------Initialization functions------------------------------ */
@ -136,10 +133,6 @@ ErrCode StaStateMachine::InitStaStateMachine()
SetFirstState(pInitState);
StartStateMachine();
InitStaSMHandleMap();
#ifndef OHOS_ARCH_LITE
NetStateObserver::GetInstance().SetNetStateCallback(
std::bind(&StaStateMachine::NetStateObserverCallback, this, std::placeholders::_1));
#endif
pNetcheck = new (std::nothrow)
StaNetworkCheck(std::bind(&StaStateMachine::NetDetectionProcess, this,
std::placeholders::_1, std::placeholders::_2),
@ -152,7 +145,9 @@ ErrCode StaStateMachine::InitStaStateMachine()
pNetcheck->InitNetCheckThread();
#ifndef OHOS_ARCH_LITE
NetSupplierInfo = std::make_unique<NetManagerStandard::NetSupplierInfo>().release();
NetStateObserver::GetInstance().StartNetStateObserver();
m_NetWorkState = std::make_shared<NetStateObserver>();
m_NetWorkState->SetNetStateCallback(
std::bind(&StaStateMachine::NetStateObserverCallback, this, std::placeholders::_1));
#endif
return WIFI_OPT_SUCCESS;
}
@ -564,6 +559,7 @@ void StaStateMachine::StartWifiProcess()
#ifndef OHOS_ARCH_LITE
WIFI_LOGI("Register netsupplier");
WifiNetAgent::GetInstance().OnStaMachineWifiStart();
m_NetWorkState->StartNetStateObserver();
#endif
/* Initialize Connection Information. */
InitWifiLinkedInfo();
@ -682,6 +678,7 @@ void StaStateMachine::StopWifiProcess()
WIFI_LOGI("Enter StaStateMachine::StopWifiProcess.\n");
#ifndef OHOS_ARCH_LITE
WifiNetAgent::GetInstance().UnregisterNetSupplier();
m_NetWorkState->StopNetStateObserver();
#endif
WIFI_LOGI("Stop wifi is in process...\n");
WifiSettings::GetInstance().SetWifiState(static_cast<int>(WifiState::DISABLING), m_instId);
@ -3001,7 +2998,7 @@ void StaStateMachine::OnNetManagerRestart(void)
if (state != static_cast<int>(WifiState::ENABLED)) {
return;
}
NetStateObserver::GetInstance().StartNetStateObserver();
m_NetWorkState->StartNetStateObserver();
WifiNetAgent::GetInstance().OnStaMachineNetManagerRestart(NetSupplierInfo, m_instId);
}

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h
View File

@ -31,6 +31,7 @@
#include "sta_define.h"
#ifndef OHOS_ARCH_LITE
#include "wifi_net_agent.h"
#include "wifi_net_observer.h"
#endif
namespace OHOS {
@ -857,6 +858,7 @@ private:
std::map<std::string, StaServiceCallback> m_staCallback;
#ifndef OHOS_ARCH_LITE
sptr<NetManagerStandard::NetSupplierInfo> NetSupplierInfo;
std::shared_ptr<NetStateObserver> m_NetWorkState;
#endif
int lastNetworkId;