!36332 fix full screen problem

Merge pull request !36332 from lukewang1/fs
This commit is contained in:
openharmony_ci 2024-06-25 06:47:56 +00:00 committed by Gitee
commit 725232e25c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 8 deletions

View File

@ -581,6 +581,12 @@ void ImagePattern::CreateObscuredImage()
void ImagePattern::LoadImage(const ImageSourceInfo& src, const PropertyChangeFlag& propertyChangeFlag)
{
if (loadingCtx_) {
auto srcPixelMap = src.GetPixmap();
auto loadPixelMap = loadingCtx_->GetSourceInfo().GetPixmap();
isPixelMapChanged_ = !srcPixelMap || !loadPixelMap || srcPixelMap->GetRawPixelMapPtr() !=
loadPixelMap->GetRawPixelMapPtr();
}
LoadNotifier loadNotifier(CreateDataReadyCallback(), CreateLoadSuccessCallback(), CreateLoadFailCallback());
loadNotifier.onDataReadyComplete_ = CreateCompleteCallBackInDataReady();
@ -615,12 +621,6 @@ void ImagePattern::LoadImageDataIfNeed()
auto src = imageLayoutProperty->GetImageSourceInfo().value_or(ImageSourceInfo(""));
UpdateInternalResource(src);
if (loadingCtx_) {
auto srcPixelMap = src.GetPixmap();
auto loadPixelMap = loadingCtx_->GetSourceInfo().GetPixmap();
isPixelMapChanged_ = !srcPixelMap || !loadPixelMap || srcPixelMap->GetRawPixelMapPtr() !=
loadPixelMap->GetRawPixelMapPtr();
}
if (!loadingCtx_ || loadingCtx_->GetSourceInfo() != src || isImageQualityChange_) {
LoadImage(src, imageLayoutProperty->GetPropertyChangeFlag());
} else if (IsSupportImageAnalyzerFeature()) {

View File

@ -1566,11 +1566,11 @@ void VideoPattern::OnFullScreenChange(bool isFullScreen)
break;
}
}
if (isFullScreen && isEnableAnalyzer_ && isAnalyzerCreated_) {
if (isEnableAnalyzer_) {
if (!imageAnalyzerManager_) {
EnableAnalyzer(isEnableAnalyzer_);
}
if (imageAnalyzerManager_) {
if (imageAnalyzerManager_ && isAnalyzerCreated_) {
StartImageAnalyzer();
}
}