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

merge v5

Browse Source
This commit is contained in:
lilong.129
2025-03-25 14:25:37 +08:00
parent 2ad5c4f6db 6d2a4276e8
commit aeee9c7f7b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0-beta-2503231006
v5.0.0-beta-2503251425

19
uixt/driver_ext_screenshot.go
View File

@@ -157,6 +157,25 @@ func (dExt *XTDriver) FindScreenText(text string, opts ...option.ActionOption) (
if options.ScreenShotFileName == "" {
opts = append(opts, option.WithScreenShotFileName(fmt.Sprintf("find_screen_text_%s", text)))
}
// convert relative scope to absolute scope
if options.AbsScope == nil && len(options.Scope) == 4 {
windowSize, err := dExt.WindowSize()
if err != nil {
return ai.OCRText{}, err
}
absScope := option.AbsScope{
int(options.Scope[0] * float64(windowSize.Width)),
int(options.Scope[1] * float64(windowSize.Height)),
int(options.Scope[2] * float64(windowSize.Width)),
int(options.Scope[3] * float64(windowSize.Height)),
}
opts = append(opts, option.WithAbsScope(
absScope[0], absScope[1], absScope[2], absScope[3]))
log.Info().Interface("scope", options.Scope).
Interface("absScope", absScope).Msg("convert to abs scope")
}
ocrTexts, err := dExt.GetScreenTexts(opts...)
if err != nil {
return

2
uixt/driver_ext_test.go
View File

@@ -119,7 +119,7 @@ func TestDriverExt_Seek(t *testing.T) {
func TestDriverExt_TapByOCR(t *testing.T) {
driver := setupDriverExt(t)
err := driver.TapByOCR("天气")
err := driver.TapByOCR("天气", option.WithScope(0, 0.7, 0.3, 1))
assert.Nil(t, err)
}