diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index d87fdf6c..e764e622 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.6.2310081724 \ No newline at end of file +v4.3.6.2310111458 \ No newline at end of file diff --git a/hrp/pkg/uixt/service_vedem.go b/hrp/pkg/uixt/service_vedem.go index 79d137fc..74baef99 100644 --- a/hrp/pkg/uixt/service_vedem.go +++ b/hrp/pkg/uixt/service_vedem.go @@ -409,7 +409,7 @@ func (dExt *DriverExt) GetScreenResult(options ...ActionOption) (screenResult *S screenResult.UploadedURL = imageResult.URL screenResult.Icons = imageResult.UIResult - if actionOptions.ScreenShotWithClosePopups { + if actionOptions.ScreenShotWithClosePopups && imageResult.CPResult != nil { screenResult.Popup = &PopupInfo{ Type: imageResult.CPResult.Type, Text: imageResult.CPResult.Text, diff --git a/hrp/pkg/uixt/swipe.go b/hrp/pkg/uixt/swipe.go index 5ee1c408..4c97d212 100644 --- a/hrp/pkg/uixt/swipe.go +++ b/hrp/pkg/uixt/swipe.go @@ -178,6 +178,11 @@ func (dExt *DriverExt) swipeToTapApp(appName string, options ...ActionOption) er return errors.Wrap(err, "go to home screen failed") } + // automatic handling popups before swipe + if err := dExt.ClosePopups(); err != nil { + log.Error().Err(err).Msg("auto handle popup failed") + } + // swipe to first screen for i := 0; i < 5; i++ { dExt.SwipeRight()