openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 23:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!38292 新增swiper/tabs的页面切换商用泳道

Browse Source 
Merge pull request !38292 from yangcan/master
This commit is contained in:
openharmony_ci 2024-07-20 07:29:41 +00:00 committed by Gitee
commit fa66cb11ad
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
adapter/ohos/osal/ace_trace.cpp
View File

@ -25,6 +25,7 @@
namespace OHOS::Ace {
namespace {
static constexpr uint64_t ACE_TRACE_COMMERCIAL = HITRACE_TAG_ACE | HITRACE_TAG_COMMERCIAL;
static constexpr uint64_t ANIMATION_TRACE_COMMERCIAL = HITRACE_TAG_ANIMATION | HITRACE_TAG_COMMERCIAL;
}
void AceTraceBegin(const char* name)
@ -71,6 +72,28 @@ void AceAsyncTraceEnd(int32_t taskId, const char* name, bool isAnimationTrace)
}
}
void AceAsyncTraceBeginCommercial(int32_t taskId, const char* name, bool isAnimationTrace)
{
CHECK_NULL_VOID(name);
std::string nameStr(name);
if (isAnimationTrace) {
StartAsyncTrace(ANIMATION_TRACE_COMMERCIAL, nameStr, taskId);
} else {
StartAsyncTrace(ACE_TRACE_COMMERCIAL, nameStr, taskId);
}
}
void AceAsyncTraceEndCommercial(int32_t taskId, const char* name, bool isAnimationTrace)
{
CHECK_NULL_VOID(name);
std::string nameStr(name);
if (isAnimationTrace) {
FinishAsyncTrace(ANIMATION_TRACE_COMMERCIAL, nameStr, taskId);
} else {
FinishAsyncTrace(ACE_TRACE_COMMERCIAL, nameStr, taskId);
}
}
void AceCountTrace(const char *key, int32_t count)
{
CHECK_NULL_VOID(key);

2
adapter/preview/osal/ace_trace.cpp
View File

@ -22,5 +22,7 @@ void AceTraceBeginCommercial(const char* name) {}
void AceTraceEndCommercial() {}
void AceAsyncTraceBegin(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceAsyncTraceEnd(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceAsyncTraceBeginCommercial(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceAsyncTraceEndCommercial(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceCountTrace(const char *key, int32_t count) {}
} // namespace OHOS::Ace

2
frameworks/base/log/ace_trace.h
View File

@ -94,6 +94,8 @@ void ACE_EXPORT AceCountTraceWidthArgs(int32_t count, const char* format, ...);
// for commercial trace
void ACE_EXPORT AceTraceBeginCommercial(const char* name);
void ACE_EXPORT AceTraceEndCommercial();
void ACE_EXPORT AceAsyncTraceBeginCommercial(int32_t taskId, const char* name, bool isAnimationTrace = false);
void ACE_EXPORT AceAsyncTraceEndCommercial(int32_t taskId, const char* name, bool isAnimationTrace = false);
class ACE_FORCE_EXPORT AceScopedTrace final {
public:

25
frameworks/core/components_ng/pattern/swiper/swiper_pattern.cpp
View File

@ -353,7 +353,8 @@ void SwiperPattern::OnModifyDone()
auto index = CurrentIndex();
if (currentIndex_ != index && index >= 0) {
AceAsyncTraceBegin(0, hasTabsAncestor_ ? APP_TABS_NO_ANIMATION_SWITCH : APP_SWIPER_NO_ANIMATION_SWITCH);
AceAsyncTraceBeginCommercial(
0, hasTabsAncestor_ ? APP_TABS_NO_ANIMATION_SWITCH : APP_SWIPER_NO_ANIMATION_SWITCH);
}
InitIndicator();
@ -945,7 +946,7 @@ bool SwiperPattern::OnDirtyLayoutWrapperSwap(const RefPtr<LayoutWrapper>& dirty,
pipeline->AddAfterRenderTask([weak = WeakClaim(this)]() {
auto swiper = weak.Upgrade();
CHECK_NULL_VOID(swiper);
AceAsyncTraceEnd(
AceAsyncTraceEndCommercial(
0, swiper->hasTabsAncestor_ ? APP_TABS_NO_ANIMATION_SWITCH : APP_SWIPER_NO_ANIMATION_SWITCH);
});
}
@ -1389,7 +1390,7 @@ void SwiperPattern::SwipeToWithoutAnimation(int32_t index)
StopSpringAnimationImmediately();
StopIndicatorAnimation(true);
jumpIndex_ = index;
AceAsyncTraceBegin(0, hasTabsAncestor_ ? APP_TABS_NO_ANIMATION_SWITCH : APP_SWIPER_NO_ANIMATION_SWITCH);
AceAsyncTraceBeginCommercial(0, hasTabsAncestor_ ? APP_TABS_NO_ANIMATION_SWITCH : APP_SWIPER_NO_ANIMATION_SWITCH);
uiCastJumpIndex_ = index;
MarkDirtyNodeSelf();
FireAndCleanScrollingListener();
@ -2685,7 +2686,7 @@ void SwiperPattern::HandleDragStart(const GestureEvent& info)
if (!hasTabsAncestor_) {
PerfMonitor::GetPerfMonitor()->Start(PerfConstants::APP_SWIPER_SCROLL, PerfActionType::FIRST_MOVE, "");
} else {
AceAsyncTraceBegin(0, APP_TABS_SCROLL);
AceAsyncTraceBeginCommercial(0, APP_TABS_SCROLL);
}
UpdateDragFRCSceneInfo(info.GetMainVelocity(), SceneStatus::START);
@ -2763,7 +2764,7 @@ void SwiperPattern::HandleDragEnd(double dragVelocity)
if (!hasTabsAncestor_) {
PerfMonitor::GetPerfMonitor()->End(PerfConstants::APP_SWIPER_SCROLL, false);
} else {
AceAsyncTraceEnd(0, APP_TABS_SCROLL);
AceAsyncTraceEndCommercial(0, APP_TABS_SCROLL);
}
isTouchDown_ = false;
isTouchDownOnOverlong_ = false;
@ -3085,7 +3086,7 @@ void SwiperPattern::PlayPropertyTranslateAnimation(
if (!swiper->hasTabsAncestor_) {
PerfMonitor::GetPerfMonitor()->End(PerfConstants::APP_SWIPER_FLING, true);
} else {
AceAsyncTraceEnd(0, APP_TABS_FLING);
AceAsyncTraceEndCommercial(0, APP_TABS_FLING);
}
OffsetF finalOffset =
swiper->itemPosition_.empty() ? OffsetF()
@ -3122,7 +3123,7 @@ void SwiperPattern::PlayPropertyTranslateAnimation(
if (!swiperPattern->hasTabsAncestor_) {
PerfMonitor::GetPerfMonitor()->Start(PerfConstants::APP_SWIPER_FLING, PerfActionType::LAST_UP, "");
} else {
AceAsyncTraceBegin(0, APP_TABS_FLING);
AceAsyncTraceBeginCommercial(0, APP_TABS_FLING);
}
TAG_LOGI(AceLogTag::ACE_SWIPER,
"Swiper start property translate animation with offsetX: %{public}f, offsetY: %{public}f", offset.GetX(),
@ -3393,7 +3394,8 @@ void SwiperPattern::PlayTranslateAnimation(
host->UpdateAnimatablePropertyFloat(TRANSLATE_PROPERTY_NAME, endPos);
auto swiper = weak.Upgrade();
CHECK_NULL_VOID(swiper);
AceAsyncTraceBegin(0, swiper->hasTabsAncestor_ ? APP_TABS_FRAME_ANIMATION : APP_SWIPER_FRAME_ANIMATION);
AceAsyncTraceBeginCommercial(
0, swiper->hasTabsAncestor_ ? APP_TABS_FRAME_ANIMATION : APP_SWIPER_FRAME_ANIMATION);
AnimationCallbackInfo info;
info.velocity = Dimension(velocity, DimensionUnit::PX).ConvertToVp();
info.currentOffset = swiper->GetCustomPropertyOffset() +
@ -3411,7 +3413,8 @@ void SwiperPattern::PlayTranslateAnimation(
[weak, nextIndex, restartAutoPlay, finishAnimation]() {
auto swiper = weak.Upgrade();
CHECK_NULL_VOID(swiper);
AceAsyncTraceEnd(0, swiper->hasTabsAncestor_ ? APP_TABS_FRAME_ANIMATION : APP_SWIPER_FRAME_ANIMATION);
AceAsyncTraceEndCommercial(
0, swiper->hasTabsAncestor_ ? APP_TABS_FRAME_ANIMATION : APP_SWIPER_FRAME_ANIMATION);
if (finishAnimation && swiper->translateAnimationIsRunning_) {
swiper->isFinishAnimation_ = true;
}
@ -3451,7 +3454,7 @@ void SwiperPattern::OnSpringAnimationFinish()
return;
}
PerfMonitor::GetPerfMonitor()->End(PerfConstants::APP_LIST_FLING, false);
AceAsyncTraceEnd(0, TRAILING_ANIMATION);
AceAsyncTraceEndCommercial(0, TRAILING_ANIMATION);
TAG_LOGI(AceLogTag::ACE_SWIPER, "Swiper finish spring animation offset %{public}f",
currentIndexOffset_);
ACE_SCOPED_TRACE_COMMERCIAL("%s finish spring animation, offset: %f",
@ -3575,7 +3578,7 @@ void SwiperPattern::CreateSpringProperty()
}
swiper->UpdateCurrentOffset(positionDelta);
if (LessNotEqual(std::abs(positionDelta), 1) && !NearZero(positionDelta)) {
AceAsyncTraceBegin(0, TRAILING_ANIMATION);
AceAsyncTraceBeginCommercial(0, TRAILING_ANIMATION);
}
}
},

2
frameworks/core/components_ng/pattern/tabs/tabs_model_ng.cpp
View File

@ -85,7 +85,7 @@ void TabsModelNG::Create(BarPosition barPosition, int32_t index, const RefPtr<Ta
}
}
if ((index != preIndex) && (index >= 0)) {
AceAsyncTraceBegin(0, APP_TABS_NO_ANIMATION_SWITCH);
AceAsyncTraceBeginCommercial(0, APP_TABS_NO_ANIMATION_SWITCH);
SetIndex(index);
auto tabBarNode = AceType::DynamicCast<FrameNode>(tabsNode->GetTabBar());
auto tabBarPattern = tabBarNode->GetPattern<TabBarPattern>();

4
test/mock/base/mock_ace_trace.cpp
View File

@ -28,6 +28,10 @@ void AceAsyncTraceBegin(int32_t taskId, const char* name, bool isAnimationTrace)
void AceAsyncTraceEnd(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceAsyncTraceBeginCommercial(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceAsyncTraceEndCommercial(int32_t taskId, const char* name, bool isAnimationTrace) {}
void AceCountTrace(const char* key, int32_t count) {}
bool AceTraceBeginWithArgv(const char* /* format */, va_list /* args */)