GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 22:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add auto popups handler in swipe find

Browse Source
This commit is contained in:
lilong.129
2023-06-22 14:50:45 +08:00
parent 6411e2953c
commit 0d6da534ab
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/pkg/uixt/ocr_vedem.go
View File

@@ -344,7 +344,7 @@ func (dExt *DriverExt) GetScreenResult() (screenResult *ScreenResult, err error)
imageResult, err := dExt.ImageService.GetImage(bufSource) imageResult, err := dExt.ImageService.GetImage(bufSource)
if err != nil { if err != nil {
log.Error().Err(err).Msg("GetScreenResult failed") log.Error().Err(err).Msg("GetImage from ImageService failed")
return return
} }
imageResult.imagePath = imagePath imageResult.imagePath = imagePath

10
hrp/pkg/uixt/swipe.go
View File

@@ -135,14 +135,20 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
var point PointF var point PointF
findTexts := func(d *DriverExt) error { findTexts := func(d *DriverExt) error {
var err error var err error
ocrTexts, err := d.GetScreenTexts() screenTexts, err := d.GetScreenTexts()
if err != nil { if err != nil {
return err return err
} }
points, err := ocrTexts.FindTexts(texts, dExt.ParseActionOptions(options...)...) points, err := screenTexts.FindTexts(texts, dExt.ParseActionOptions(options...)...)
if err != nil { if err != nil {
// target texts not found, try to auto handle popup
if e := dExt.AutoPopupHandler(screenTexts); e != nil {
log.Error().Err(e).Msg("auto handle popup failed")
}
return err return err
} }
// target texts found, pick the first one
point = points[0].Center() // FIXME point = points[0].Center() // FIXME
return nil return nil
} }

8
hrp/step_mobile_ui.go
View File

@@ -598,13 +598,11 @@ func runStepMobileUI(s *SessionRunner, step *TStep) (stepResult *StepResult, err
} }
// take screenshot and get screen texts by OCR // take screenshot and get screen texts by OCR
screenResult, err2 := uiDriver.GetScreenResult() screenTexts, err2 := uiDriver.GetScreenTexts()
if err2 != nil { if err2 != nil {
log.Error().Err(err2).Str("step", step.Name).Msg("take screenshot failed on step finished") log.Error().Err(err2).Str("step", step.Name).Msg("take screenshot failed on step finished")
} } else if err3 := uiDriver.AutoPopupHandler(screenTexts); err3 != nil {
// automatic handling of pop-up windows on each step finished
// automatic handling of pop-up windows on each step finished
if err3 := uiDriver.AutoPopupHandler(screenResult.Texts); err3 != nil {
log.Error().Err(err3).Msg("auto handle popup failed") log.Error().Err(err3).Msg("auto handle popup failed")
} }