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

arkui-x update master OH to weekly_202411048 and OH fix build bug

Browse Source 
Signed-off-by: zhangqing <zhangqing50@h-partners.com>
Change-Id: Idacd4e37a292d805aa1537dff22df22aa3f08219
This commit is contained in:
zhangqing 2024-11-07 11:10:56 +08:00
parent 6eecb8beb5
commit e57dadb29e
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
adapter/ohos/osal/system_properties.cpp
View File

@ -918,4 +918,9 @@ double SystemProperties::GetSrollableFriction()
auto ret = system::GetParameter("persist.scrollable.friction", "");
return StringUtils::StringToDouble(ret);
}
bool SystemProperties::IsCrossPlatform()
{
return false;
}
} // namespace OHOS::Ace

5
adapter/preview/osal/system_properties.cpp
View File

@ -346,4 +346,9 @@ double SystemProperties::GetSrollableFriction()
{
return 0.0;
}
bool SystemProperties::IsCrossPlatform()
{
return false;
}
} // namespace OHOS::Ace

2
frameworks/base/utils/system_properties.h
View File

@ -604,6 +604,8 @@ public:
static double GetSrollableFriction();
static bool IsCrossPlatform();
private:
static bool opincEnabled_;
static bool developerModeOn_;

7
frameworks/core/components_ng/gestures/recognizers/pan_recognizer.cpp
View File

@ -289,12 +289,15 @@ void PanRecognizer::HandleTouchUpEvent(const TouchEvent& event)
return;
}
if (currentFingers_ == fingers_) {
if (currentFingers_ == fingers_ && !SystemProperties::IsCrossPlatform()) {
UpdateTouchPointInVelocityTracker(event);
} else if (currentFingers_ > fingers_) {
}
if (currentFingers_ > fingers_) {
panVelocity_.Reset(event.id);
UpdateTouchPointInVelocityTracker(event);
}
UpdateTouchEventInfo(event);
if ((currentFingers_ <= fingers_) &&

8
frameworks/core/components_ng/pattern/video/video_pattern.cpp
View File

@ -856,6 +856,14 @@ void VideoPattern::SetSurfaceForMediaPlayer()
return;
}
isSetMediaSurfaceDone_ = true;
#ifdef RENDER_EXTRACT_SUPPORTED
if (!SystemProperties::GetExtSurfaceEnabled()) {
renderSurface_->SetRenderContext(renderContextForMediaPlayer_);
}
renderSurface_->InitSurface();
#endif
mediaPlayer_->SetRenderSurface(renderSurface_);
if (mediaPlayer_->SetSurface() != 0) {
TAG_LOGW(AceLogTag::ACE_VIDEO, "mediaPlayer renderSurface set failed");