GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into video-crawler

Browse Source
This commit is contained in:
lilong.129
2023-09-07 15:45:05 +08:00
parent 2148789eb8 97e637b298
commit 1a952a3fd2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,9 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
}
options = append(options, WithMatchOne(true), WithRegex(true))
actionOptions := NewActionOptions(options...)
actionOptions.Identifier = ""
optionsWithoutIdentifier := actionOptions.Options()
var point PointF
findTexts := func(d *DriverExt) error {
var err error
@@ -145,7 +148,7 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
if err != nil {
return err
}
points, err := screenResult.Texts.FindTexts(texts, dExt.ParseActionOptions(options...)...)
points, err := screenResult.Texts.FindTexts(texts, dExt.ParseActionOptions(optionsWithoutIdentifier...)...)
if err != nil {
log.Error().Err(err).Msg("swipeToTapTexts failed")
// target texts not found, try to auto handle popup
@@ -165,8 +168,8 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
return d.TapAbsXY(point.X, point.Y, options...)
}
findAction := dExt.prepareSwipeAction(options...)
return dExt.LoopUntil(findAction, findTexts, foundTextAction, options...)
findAction := dExt.prepareSwipeAction(optionsWithoutIdentifier...)
return dExt.LoopUntil(findAction, findTexts, foundTextAction, optionsWithoutIdentifier...)
}
func (dExt *DriverExt) swipeToTapApp(appName string, options ...ActionOption) error {