kyfx
/
httprunner
mirror of https://github.com/httprunner/httprunner.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: TapByCV WithTapRandomRect

This commit is contained in:
lilong.129 2025-03-17 18:06:32 +08:00
parent 182de16751
commit 5e2f33b362
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/version/VERSION
View File

@ -1 +1 @@
v5.0.0-beta-2503171757
v5.0.0-beta-2503171806

9
uixt/ai/cv.go
View File

@ -249,6 +249,15 @@ func (box Box) Center() PointF {
}
}
func (box Box) RandomPoint() PointF {
width, height := float64(box.Width), float64(box.Height)
point := PointF{
X: box.Point.X + width*rand.Float64(),
Y: box.Point.Y + height*rand.Float64(),
}
return point
}
type UIResults []UIResult
func (u UIResults) FilterScope(scope option.AbsScope) (results UIResults) {

7
uixt/driver_ext_screenshot.go
View File

@ -166,7 +166,7 @@ func (dExt *XTDriver) FindScreenText(text string, opts ...option.ActionOption) (
return textRect, nil
}
func (dExt *XTDriver) FindUIResult(opts ...option.ActionOption) (point ai.PointF, err error) {
func (dExt *XTDriver) FindUIResult(opts ...option.ActionOption) (uiResult ai.UIResult, err error) {
options := option.NewActionOptions(opts...)
if options.ScreenShotFileName == "" {
opts = append(opts, option.WithScreenShotFileName(
@ -182,11 +182,10 @@ func (dExt *XTDriver) FindUIResult(opts ...option.ActionOption) (point ai.PointF
if err != nil {
return
}
uiResult, err := uiResults.GetUIResult(opts...)
point = uiResult.Center()
uiResult, err = uiResults.GetUIResult(opts...)
log.Info().Interface("text", options.ScreenShotWithUITypes).
Interface("point", point).Msg("FindUIResult success")
Interface("uiResult", uiResult).Msg("FindUIResult success")
return
}

13
uixt/driver_ext_tap.go
View File

@ -32,15 +32,22 @@ func (dExt *XTDriver) TapByOCR(text string, opts ...option.ActionOption) error {
}
func (dExt *XTDriver) TapByCV(opts ...option.ActionOption) error {
options := option.NewActionOptions(opts...)
actionOptions := option.NewActionOptions(opts...)
point, err := dExt.FindUIResult(opts...)
uiResult, err := dExt.FindUIResult(opts...)
if err != nil {
if options.IgnoreNotFoundError {
if actionOptions.IgnoreNotFoundError {
return nil
}
return err
}
var point ai.PointF
if actionOptions.TapRandomRect {
point = uiResult.RandomPoint()
} else {
point = uiResult.Center()
}
return dExt.TapAbsXY(point.X, point.Y, opts...)
}

6
uixt/driver_ext_test.go
View File

@ -193,4 +193,10 @@ func TestDriverExt_Action_Risk(t *testing.T) {
// tap random point in ocr text rect
err = driver.TapByOCR("首页", option.WithTapRandomRect(true))
assert.Nil(t, err)
err = driver.TapByCV(
option.WithScreenShotUITypes("deepseek_send"),
option.WithTapRandomRect(true))
assert.Nil(t, err)
}