From ead8475f2fba9e03060ebbca4c2d88a9bd3ebff7 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Thu, 19 Sep 2024 10:47:33 +0800 Subject: [PATCH] fix: SwipeRelative error code --- hrp/code/code.go | 6 ++++-- hrp/pkg/uixt/swipe.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hrp/code/code.go b/hrp/code/code.go index 9fb22da5..bb1cb366 100644 --- a/hrp/code/code.go +++ b/hrp/code/code.go @@ -24,7 +24,7 @@ var ( LoadYAMLError = errors.New("load yaml error") // 12 LoadEnvError = errors.New("load .env error") // 13 LoadCSVError = errors.New("load csv error") // 14 - InvalidCaseFormat = errors.New("invalid case format") // 15 + InvalidCaseError = errors.New("invalid case error") // 15 UnsupportedFileExtension = errors.New("unsupported file extension") // 16 ReferencedFileNotFound = errors.New("referenced file not found") // 17 InvalidPluginFile = errors.New("invalid plugin file") // 18 @@ -64,6 +64,7 @@ var ( DeviceConnectionError = errors.New("device general connection error") // 50 DeviceHTTPDriverError = errors.New("device HTTP driver error") // 51 DeviceUSBDriverError = errors.New("device USB driver error") // 52 + DeviceGetInfoError = errors.New("device get info error") // 60 DeviceShellExecError = errors.New("device shell exec error") // 62 DeviceOfflineError = errors.New("device offline") // 63 DeviceScreenShotError = errors.New("device screenshot error") // 65 @@ -121,7 +122,7 @@ var errorsMap = map[error]int{ LoadYAMLError: 12, LoadEnvError: 13, LoadCSVError: 14, - InvalidCaseFormat: 15, + InvalidCaseError: 15, UnsupportedFileExtension: 16, ReferencedFileNotFound: 17, InvalidPluginFile: 18, @@ -153,6 +154,7 @@ var errorsMap = map[error]int{ DeviceConnectionError: 50, DeviceHTTPDriverError: 51, DeviceUSBDriverError: 52, + DeviceGetInfoError: 60, DeviceShellExecError: 62, DeviceOfflineError: 63, DeviceScreenShotError: 65, diff --git a/hrp/pkg/uixt/swipe.go b/hrp/pkg/uixt/swipe.go index 94b625c9..184b6c6a 100644 --- a/hrp/pkg/uixt/swipe.go +++ b/hrp/pkg/uixt/swipe.go @@ -19,14 +19,14 @@ func assertRelative(p float64) bool { func (dExt *DriverExt) SwipeRelative(fromX, fromY, toX, toY float64, options ...ActionOption) error { if !assertRelative(fromX) || !assertRelative(fromY) || !assertRelative(toX) || !assertRelative(toY) { - return errors.Wrap(code.MobileUISwipeError, + 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() if err != nil { - return errors.Wrap(code.MobileUISwipeError, err.Error()) + return errors.Wrap(code.DeviceGetInfoError, err.Error()) } width := windowSize.Width height := windowSize.Height