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

refactor: convertToAbsoluteCoordinates

Browse Source
This commit is contained in:
lilong.129
2025-02-11 13:47:43 +08:00
parent 81d5ea4890
commit 6651b52517
5 changed files with 66 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/uixt/driver_swipe.go
+3 -20
View File
@@ -14,31 +14,14 @@ import (
"github.com/httprunner/httprunner/v5/pkg/uixt/option"
)
func assertRelative(p float64) bool {
return p >= 0 && p <= 1
}
// SwipeRelative swipe from relative position [fromX, fromY] to relative position [toX, toY]
func (dExt *XTDriver) SwipeRelative(fromX, fromY, toX, toY float64, opts ...option.ActionOption) error {
if !assertRelative(fromX) || !assertRelative(fromY) ||
!assertRelative(toX) || !assertRelative(toY) {
return errors.Wrap(code.InvalidCaseError,
fmt.Sprintf("fromX(%f), fromY(%f), toX(%f), toY(%f) must be less than 1",
fromX, fromY, toX, toY))
}
windowSize, err := dExt.Driver.WindowSize()
absFromX, absFromY, absToX, absToY, err := convertToAbsoluteCoordinates(dExt.Driver, fromX, fromY, toX, toY)
if err != nil {
return errors.Wrap(code.DeviceGetInfoError, err.Error())
return err
}
width := windowSize.Width
height := windowSize.Height
fromX = float64(width) * fromX
fromY = float64(height) * fromY
toX = float64(width) * toX
toY = float64(height) * toY
err = dExt.Driver.Swipe(fromX, fromY, toX, toY, opts...)
err = dExt.Driver.Swipe(absFromX, absFromY, absToX, absToY, opts...)
if err != nil {
return errors.Wrap(code.MobileUISwipeError, err.Error())
}