From 51c17eda779dd8feece4fc4a1ad63b4d6d66405e Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Sat, 14 Sep 2024 10:26:07 +0800 Subject: [PATCH] change: error logs for getting window size --- hrp/pkg/uixt/android_adb_driver.go | 2 +- hrp/pkg/uixt/android_uia2_driver.go | 4 ++-- hrp/pkg/uixt/ios_driver.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go index add00fea..86593969 100644 --- a/hrp/pkg/uixt/android_adb_driver.go +++ b/hrp/pkg/uixt/android_adb_driver.go @@ -77,7 +77,7 @@ func (ad *adbDriver) getWindowSize() (size Size, err error) { // adb shell wm size output, err := ad.adbClient.RunShellCommand("wm", "size") if err != nil { - return size, errors.Wrap(err, "get window size failed with adb") + return size, errors.Wrap(err, "get window size failed by adb shell") } // output may contain both Physical and Override size, use Override if existed diff --git a/hrp/pkg/uixt/android_uia2_driver.go b/hrp/pkg/uixt/android_uia2_driver.go index db04063c..cee3fd9b 100644 --- a/hrp/pkg/uixt/android_uia2_driver.go +++ b/hrp/pkg/uixt/android_uia2_driver.go @@ -228,11 +228,11 @@ func (ud *uiaDriver) WindowSize() (size Size, err error) { } else { var rawResp rawResponse if rawResp, err = ud.httpGET("/session", ud.session.ID, "window/:windowHandle/size"); err != nil { - return Size{}, errors.Wrap(err, "get window size failed with uiautomator2") + return Size{}, errors.Wrap(err, "get window size failed by UIA2 request") } reply := new(struct{ Value struct{ Size } }) if err = json.Unmarshal(rawResp, reply); err != nil { - return Size{}, err + return Size{}, errors.Wrap(err, "get window size failed by UIA2 response") } size = reply.Value.Size ud.windowSize = &size diff --git a/hrp/pkg/uixt/ios_driver.go b/hrp/pkg/uixt/ios_driver.go index 0c676f0e..df52a9ad 100644 --- a/hrp/pkg/uixt/ios_driver.go +++ b/hrp/pkg/uixt/ios_driver.go @@ -198,11 +198,11 @@ func (wd *wdaDriver) WindowSize() (size Size, err error) { } else { var rawResp rawResponse if rawResp, err = wd.httpGET("/session", wd.session.ID, "/window/size"); err != nil { - return Size{}, errors.Wrap(err, "get window size failed with wda") + return Size{}, errors.Wrap(err, "get window size failed by WDA request") } reply := new(struct{ Value struct{ Size } }) if err = json.Unmarshal(rawResp, reply); err != nil { - return Size{}, err + return Size{}, errors.Wrap(err, "get window size failed by WDA response") } size = reply.Value.Size scale, err := wd.Scale()