openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 09:12:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!46002 #IAXK4L[Bug]:优化EventController中曝光配置应用逻辑

Browse Source 
Merge pull request !46002 from wudi/addy_master
This commit is contained in:
openharmony_ci 2024-10-18 10:26:01 +00:00 committed by Gitee
commit 48f2cb5624
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
frameworks/core/common/recorder/event_controller.cpp
View File

@ -144,19 +144,30 @@ void GetMatchedNodes(const std::string& pageUrl, const RefPtr<NG::UINode>& root,
}
}
void EventController::ApplyNewestConfig()
void EventController::ApplyNewestConfig() const
{
std::shared_lock<std::shared_mutex> lock(cacheLock_);
if (clientList_.empty()) {
return;
}
auto containerId = EventRecorder::Get().GetContainerId();
auto config = clientList_.back().config.GetConfig();
auto context = NG::PipelineContext::GetContextByContainerId(containerId);
CHECK_NULL_VOID(context);
auto taskExecutor = context->GetTaskExecutor();
CHECK_NULL_VOID(taskExecutor);
taskExecutor->PostDelayedTask([config]() { EventController::Get().ApplyExposureCfgInner(config); },
TaskExecutor::TaskType::UI, EXPOSURE_REGISTER_DELAY, "EventController");
}
void EventController::ApplyExposureCfgInner(const std::shared_ptr<Config>& config) const
{
auto containerId = EventRecorder::Get().GetContainerId();
auto pageUrl = GetPageUrlByContainerId(containerId);
if (pageUrl.empty()) {
return;
}
auto config = clientList_.back().config.GetConfig();
lock.unlock();
auto pageIter = config->find(pageUrl);
if (pageIter == config->end()) {
return;
@ -173,18 +184,12 @@ void EventController::ApplyNewestConfig()
[&exposureSet](const std::list<ExposureCfg>::value_type& cfg) { exposureSet.emplace(cfg); });
std::list<ExposureWrapper> targets;
GetMatchedNodes(pageUrl, rootNode, exposureSet, targets);
auto taskExecutor = context->GetTaskExecutor();
CHECK_NULL_VOID(taskExecutor);
taskExecutor->PostDelayedTask(
[containerId, wrapperList = std::move(targets)]() {
for (auto& item : wrapperList) {
item.processor->SetContainerId(containerId);
auto node = item.node.Upgrade();
CHECK_NULL_VOID(node);
node->SetExposureProcessor(item.processor);
}
},
TaskExecutor::TaskType::UI, EXPOSURE_REGISTER_DELAY, "EventController");
for (auto& item : targets) {
item.processor->SetContainerId(containerId);
auto node = item.node.Upgrade();
CHECK_NULL_VOID(node);
node->SetExposureProcessor(item.processor);
}
}
void EventController::Unregister(const std::shared_ptr<UIEventObserver>& observer)

5
frameworks/core/common/recorder/event_controller.h
View File

@ -48,9 +48,10 @@ private:
EventController() = default;
~EventController() = default;
void NotifyConfigChange();
void ApplyNewestConfig();
void ApplyNewestConfig() const;
void ApplyExposureCfgInner(const std::shared_ptr<Config>& config) const;
std::shared_mutex cacheLock_;
std::shared_mutex mutable cacheLock_;
std::vector<UIEventClient> clientList_;
ACE_DISALLOW_COPY_AND_MOVE(EventController);