From e681046fe9529d26a2d12b27e7ae72e663b38a81 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Mon, 2 Sep 2024 14:48:36 +0800 Subject: [PATCH] fix: init driver session --- hrp/pkg/uixt/android_adb_driver.go | 6 ++++-- hrp/pkg/uixt/android_stub_driver.go | 1 + hrp/pkg/uixt/client.go | 2 +- hrp/pkg/uixt/ios_driver.go | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go index f73e73ea..25babd71 100644 --- a/hrp/pkg/uixt/android_adb_driver.go +++ b/hrp/pkg/uixt/android_adb_driver.go @@ -38,7 +38,9 @@ type adbDriver struct { func NewAdbDriver() *adbDriver { log.Info().Msg("init adb driver") - return &adbDriver{} + driver := &adbDriver{} + driver.NewSession(nil) + return driver } func (ad *adbDriver) NewSession(capabilities Capabilities) (sessionInfo SessionInfo, err error) { @@ -743,7 +745,7 @@ func (ad *adbDriver) StopCaptureLog() (result interface{}, err error) { } func (ad *adbDriver) GetSession() *DriverSession { - return ad.Driver.session + return &ad.Driver.session } func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) { diff --git a/hrp/pkg/uixt/android_stub_driver.go b/hrp/pkg/uixt/android_stub_driver.go index 693337ee..fbfe19d2 100644 --- a/hrp/pkg/uixt/android_stub_driver.go +++ b/hrp/pkg/uixt/android_stub_driver.go @@ -47,6 +47,7 @@ func newStubAndroidDriver(address string, urlPrefix string, readTimeout ...time. return nil, err } + driver.NewSession(nil) return driver, nil } diff --git a/hrp/pkg/uixt/client.go b/hrp/pkg/uixt/client.go index f27c4dd4..e406e8ae 100644 --- a/hrp/pkg/uixt/client.go +++ b/hrp/pkg/uixt/client.go @@ -69,7 +69,7 @@ type Driver struct { windowSize *Size // cache session data - session *DriverSession + session DriverSession } type DriverResult struct { diff --git a/hrp/pkg/uixt/ios_driver.go b/hrp/pkg/uixt/ios_driver.go index d2f56df4..e8e23d0d 100644 --- a/hrp/pkg/uixt/ios_driver.go +++ b/hrp/pkg/uixt/ios_driver.go @@ -906,7 +906,7 @@ func (wd *wdaDriver) StopCaptureLog() (result interface{}, err error) { } func (ud *wdaDriver) GetSession() *DriverSession { - return ud.Driver.session + return &ud.Driver.session } type rawResponse []byte