openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-27 01:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

处理return，switch改回if

Browse Source 
Signed-off-by: lixiyuan <lixiyuan7@huawei.com>
This commit is contained in:
lixiyuan 2024-07-19 16:57:11 +08:00
parent 529e675b18
commit 8483352a0b
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/storage_manager/account_subscriber/account_subscriber.cpp
View File

@ -100,16 +100,13 @@ void AccountSubscriber::OnReceiveEvent(const EventFwk::CommonEventData &eventDat
/* get user status */
uint32_t status = GetUserStatus(userId);
/* update status */
switch (action) {
case EventFwk::CommonEventSupport::COMMON_EVENT_USER_UNLOCKED:
status = HandleUserSwitchedEvent(status);
break;
case EventFwk::CommonEventSupport::COMMON_EVENT_USER_SWITCHED:
status = HandleUserSwitchedEvent(status);
break;
case EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED:
userId = HandleScreenLockedEvent();
return;
if (action == EventFwk::CommonEventSupport::COMMON_EVENT_USER_UNLOCKED) {
status = HandleUserSwitchedEvent(status);
} else if (action == EventFwk::CommonEventSupport::COMMON_EVENT_USER_SWITCHED) {
status = HandleUserSwitchedEvent(status);
} else if (action == EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED) {
HandleScreenLockedEvent(userId);
return;
}
userId_ = userId;
userRecord_[userId] = status;
@ -157,7 +154,7 @@ uint32_t AccountSubscriber::HandleUserSwitchedEvent(uint32_t userStatus)
return userStatus;
}
int32_t AccountSubscriber::HandleScreenLockedEvent()
void AccountSubscriber::HandleScreenLockedEvent(int32_t &userId)
{
std::vector<int32_t> ids;
int ret = AccountSA::OsAccountManager::QueryActiveOsAccountIds(ids);
@ -165,13 +162,12 @@ int32_t AccountSubscriber::HandleScreenLockedEvent()
LOGE("Query active userid failed, ret = %{public}u", ret);
return;
}
int32_t userId = ids[0];
userId = ids[0];
if (!OnReceiveEventLockUserScreen(userId)) {
LOGE("user %{public}u LockUserScreen fail", userId);
}
LOGI("Handle EventFwk::CommonEventSupport::Common_EVENT_SCREEN_LOCKED finished, userId is %{public}u",
userId);
return userId;
}
void AccountSubscriber::GetSystemAbility()

2
services/storage_manager/include/account_subscriber/account_subscriber.h
View File

@ -55,7 +55,7 @@ private:
uint32_t GetUserStatus(int32_t userId);
uint32_t HandleUserUnlockEvent(uint32_t userStatus);
uint32_t HandleUserSwitchedEvent(uint32_t userStatus);
int32_t HandleScreenLockedEvent();
void HandleScreenLockedEvent(int32_t &userId);
bool OnReceiveEventLockUserScreen(int32_t userId);
void GetSystemAbility();
};