From 0b598fa590b068c2965fab4fe84413a922e95af3 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Sat, 23 Nov 2024 22:06:34 +0800 Subject: [PATCH] change: remove windowSize from DriverExt --- hrp/internal/version/VERSION | 2 +- hrp/pkg/uixt/drag.go | 13 ++++++++----- hrp/pkg/uixt/ext.go | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index fdbd252f..ceda170e 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0+2411232149 +v5.0.0+2411232206 diff --git a/hrp/pkg/uixt/drag.go b/hrp/pkg/uixt/drag.go index 41120f88..48243450 100644 --- a/hrp/pkg/uixt/drag.go +++ b/hrp/pkg/uixt/drag.go @@ -3,16 +3,19 @@ package uixt import ( "fmt" + "github.com/httprunner/httprunner/v4/hrp/code" + "github.com/pkg/errors" "github.com/rs/zerolog/log" ) func (dExt *DriverExt) Drag(fromX, fromY, toX, toY float64, options ...ActionOption) (err error) { - return dExt.Driver.Drag(fromX, fromY, toX, toY, options...) -} + windowSize, err := dExt.Driver.WindowSize() + if err != nil { + return errors.Wrap(code.DeviceGetInfoError, err.Error()) + } + width := windowSize.Width + height := windowSize.Height -func (dExt *DriverExt) DragRelative(fromX, fromY, toX, toY float64, options ...ActionOption) (err error) { - width := dExt.windowSize.Width - height := dExt.windowSize.Height orientation, err := dExt.Driver.Orientation() if err != nil { log.Warn().Err(err).Msgf("drag from (%v, %v) to (%v, %v) get orientation failed, use default orientation", diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go index f82263fa..ba3ce12b 100644 --- a/hrp/pkg/uixt/ext.go +++ b/hrp/pkg/uixt/ext.go @@ -20,7 +20,6 @@ type DriverExt struct { Driver IWebDriver ImageService IImageService // used to extract image data - windowSize Size // funplugin plugin funplugin.IPlugin }