diff --git a/frameworks/core/common/event_dump.cpp b/frameworks/core/common/event_dump.cpp index 606bb7b47a12284c155a8dc1c8e78140f1f1848a..54a10e69ee856eb9d1a04b9021b2e2736f264bbb 100644 --- a/frameworks/core/common/event_dump.cpp +++ b/frameworks/core/common/event_dump.cpp @@ -332,33 +332,6 @@ void EventTreeRecord::Dump(std::list>& dumpList, } } -void EventTreeRecord::DumpBriefInfo(std::list>& dumpList, - int32_t depth, int32_t startNumber) const -{ - int32_t index = 0; - int32_t listDepth = depth + 1; - int32_t detailDepth = listDepth + 1; - for (auto& tree : eventTreeList) { - if (index < startNumber) { - index++; - continue; - } - std::string header = std::to_string(index - startNumber).append(": event tree =>"); - - // dump needful touch points: - dumpList.emplace_back(std::make_pair(depth, header)); - dumpList.emplace_back(std::make_pair(listDepth, "touch points:")); - auto count = 0; - for (auto& item : tree.touchPoints) { - item.Dump(dumpList, detailDepth); - if (++count >= 10) { - break; - } - } - ++index; - } -} - void AxisSnapshot::Dump(std::unique_ptr& json) const { json->Put("point", point.ToString().c_str()); diff --git a/frameworks/core/common/event_dump.h b/frameworks/core/common/event_dump.h index 840a328e050eaf7e1a30869218df41381de8eef5..a851d3c34461e24814b1fd5e467b13da7d48c044 100644 --- a/frameworks/core/common/event_dump.h +++ b/frameworks/core/common/event_dump.h @@ -100,8 +100,6 @@ struct EventTreeRecord { const std::string& state, const std::string& disposal, int64_t timestamp = 0); void Dump(std::list>& dumpList, int32_t depth, int32_t startNumber = 0) const; - void DumpBriefInfo( - std::list>& dumpList, int32_t depth, int32_t startNumber = 0) const; void BuildAxis(std::list axis, std::unique_ptr& json) const; diff --git a/frameworks/core/common/event_manager.cpp b/frameworks/core/common/event_manager.cpp index b673e9160bf4e97c034062eb494a5a3ae311b556..c7e4b2763646d61b25c9457231f9d7c0c0304f0c 100644 --- a/frameworks/core/common/event_manager.cpp +++ b/frameworks/core/common/event_manager.cpp @@ -125,18 +125,15 @@ void EventManager::TouchTest(const TouchEvent& touchPoint, const RefPtr(lastEventTime_.time_since_epoch().count()); int64_t duration = static_cast((currentEventTime - lastEventTime) / TRANSLATE_NS_TO_MS); if (duration >= EVENT_CLEAR_DURATION && !refereeNG_->IsReady()) { - LogTouchTestResultInfo(touchPoint, frameNode, touchRestrict, offset, viewScale, needAppend); - LogTouchTestResultRecognizers(touchTestResults_[touchPoint.id], touchPoint.touchEventId); TAG_LOGW(AceLogTag::ACE_INPUTTRACKING, "GestureReferee is not ready, force clean gestureReferee."); - std::list> dumpList; #ifndef IS_RELEASE_VERSION + std::list> dumpList; eventTree_.Dump(dumpList, 0); -#else - eventTree_.DumpBriefInfo(dumpList, 0); -#endif for (auto& item : dumpList) { - TAG_LOGI(AceLogTag::ACE_INPUTTRACKING, "EventTreeDumpInfo: %{public}s.", item.second.c_str()); + TAG_LOGI(AceLogTag::ACE_INPUTTRACKING, "EventTreeDumpInfo: " SEC_PLD(%{public}s) ".", + SEC_PARAM(item.second.c_str())); } +#endif eventTree_.eventTreeList.clear(); FalsifyCancelEventAndDispatch(touchPoint); refereeNG_->ForceCleanGestureReferee(); @@ -170,13 +167,6 @@ void EventManager::TouchTest(const TouchEvent& touchPoint, const RefPtr& frameNode, - TouchRestrict& touchRestrict, const Offset& offset, float viewScale, bool needAppend) -{ auto container = Container::Current(); CHECK_NULL_VOID(container); std::map touchTestResultInfo; @@ -223,6 +213,7 @@ void EventManager::LogTouchTestResultInfo(const TouchEvent& touchPoint, const Re } RecordHitEmptyMessage(touchPoint, resultInfo, frameNode); } + LogTouchTestResultRecognizers(touchTestResults_[touchPoint.id], touchPoint.touchEventId); } void EventManager::RecordHitEmptyMessage( diff --git a/frameworks/core/common/event_manager.h b/frameworks/core/common/event_manager.h index 29eca4c63f83ae2ba40da5400c24a2595ef7b370..3a0192970c1e0f99f52e61d5d4651e96eec67c0d 100644 --- a/frameworks/core/common/event_manager.h +++ b/frameworks/core/common/event_manager.h @@ -313,9 +313,6 @@ private: void GetTouchTestIds(const TouchEvent& touchPoint, std::vector& touchTestIds, bool& isMousePressAtSelectedNode, int32_t selectedNodeId); void CheckMouseTestResults(bool& isMousePressAtSelectedNode, int32_t selectedNodeId); - void LogTouchTestResultInfo(const TouchEvent& touchPoint, const RefPtr& frameNode, - TouchRestrict& touchRestrict, const Offset& offset = Offset(), - float viewScale = 1.0f, bool needAppend = false); void LogTouchTestResultRecognizers(const TouchTestResult& result, int32_t touchEventId); void LogTouchTestRecognizerStates(int32_t touchEventId); void DispatchTouchEventToTouchTestResult(TouchEvent touchEvent, TouchTestResult touchTestResult, diff --git a/test/unittest/core/event/event_dump_test_ng.cpp b/test/unittest/core/event/event_dump_test_ng.cpp index 078604767b246c2b433924a9064305640dbdec37..2fa554faa34df042c0bc15c735a573d71b9ad4c1 100644 --- a/test/unittest/core/event/event_dump_test_ng.cpp +++ b/test/unittest/core/event/event_dump_test_ng.cpp @@ -405,32 +405,4 @@ HWTEST_F(EventDumpTestNg, EventDumpTestNg010, TestSize.Level1) eventTreeRecord->Dump(dumpList, DEFAULT_DEPTH); EXPECT_FALSE(dumpList.empty()); } - -/** - * @tc.name: EventDumpTestNg017 - * @tc.desc: EventTreeRecord DumpBriefInfo function test. - * @tc.type: FUNC - */ -HWTEST_F(EventDumpTestNg, EventDumpTestNg017, TestSize.Level1) -{ - /** - * @tc.steps: step1. create EventTreeRecord instance and fill touch event vale to eventTree. - */ - auto eventTreeRecord = CreateEventTreeRecord(); - ASSERT_NE(eventTreeRecord, nullptr); - TouchEvent event; - event.type = Ace::TouchType::DOWN; - event.id = 1; - FillTouchDownEventToEventTree(eventTreeRecord, event, MAX_EVENT_TREE_RECORD_CNT + 1, 0, 0); - - /** - * @tc.steps: step2. call DumpBriefInfo function. - * @tc.expected: dump list exist data, size is not empty. - */ - std::list> dumpList; - EXPECT_TRUE(dumpList.empty()); - int32_t startNumber = 1; - eventTreeRecord->Dump(dumpList, DEFAULT_DEPTH, startNumber); - EXPECT_FALSE(dumpList.empty()); -} } // namespace OHOS::Ace::NG