From dbb72cd80134b70fb6f2165e38884128d80d4869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Mon, 30 Jun 2025 19:22:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8Ewda=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uixt/ios_device.go | 1 + uixt/ios_driver_wda.go | 17 +++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/uixt/ios_device.go b/uixt/ios_device.go index 9bde7fde..e8db9317 100644 --- a/uixt/ios_device.go +++ b/uixt/ios_device.go @@ -217,6 +217,7 @@ func (dev *IOSDevice) getAppInfo(packageName string) (appInfo types.AppInfo, err func (dev *IOSDevice) NewDriver() (driver IDriver, err error) { wdaDriver, err := NewWDADriver(dev) + _, _ = wdaDriver.Status() if err != nil { return nil, errors.Wrap(err, "failed to init WDA driver") } diff --git a/uixt/ios_driver_wda.go b/uixt/ios_driver_wda.go index 3e881324..44293515 100644 --- a/uixt/ios_driver_wda.go +++ b/uixt/ios_driver_wda.go @@ -41,14 +41,6 @@ func NewWDADriver(device *IOSDevice) (*WDADriver, error) { return nil, err } - // check WDA status - wdaStatus, err := driver.Status() - if err != nil { - return nil, err - } - log.Info().Interface("status", wdaStatus). - Msg("check WDA status") - // register driver session reset handler driver.Session.RegisterResetHandler(driver.Setup) @@ -157,10 +149,6 @@ func (wd *WDADriver) Setup() error { return errors.Wrap(code.DeviceHTTPDriverError, err.Error()) } - // init WDA scale - if wd.scale, err = wd.Scale(); err != nil { - return err - } return nil } @@ -329,9 +317,10 @@ func (wd *WDADriver) ScreenShot(opts ...option.ActionOption) (raw *bytes.Buffer, func (wd *WDADriver) toScale(x float64) float64 { if wd.scale == 0 { // not setup yet - if err := wd.Setup(); err != nil { + var err error + if wd.scale, err = wd.Scale(); err != nil { log.Error().Err(err).Msg("init scale failed") - os.Exit(code.GetErrorCode(err)) + // Todo: os.Exit(code.GetErrorCode(err)) 添加error处理。 } } return x / wd.scale