From 5cacd17a6a46de6b1b2146ae1f96fadb3e2a04e9 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Wed, 6 Sep 2023 14:40:09 +0800 Subject: [PATCH] change: update logs for init andoird/ios devices --- hrp/pkg/uixt/android_device.go | 12 ++++++++++-- hrp/pkg/uixt/ios_device.go | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index c1793880..42b4757e 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -95,11 +95,19 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er } dev := deviceList[0] - device.SerialNumber = dev.Serial() + + if device.SerialNumber == "" { + selectSerial := dev.Serial() + device.SerialNumber = selectSerial + log.Warn(). + Str("serial", device.SerialNumber). + Msg("android SerialNumber is not specified, select the first one") + } + device.d = dev device.logcat = NewAdbLogcat(device.SerialNumber) - log.Info().Str("serial", device.SerialNumber).Msg("select android device") + log.Info().Str("serial", device.SerialNumber).Msg("init android device") return device, nil } diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index bc0842d9..843a34b3 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -239,7 +239,14 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) { dev := deviceList[0] udid := dev.Properties().SerialNumber - device.UDID = udid + + if device.UDID == "" { + device.UDID = udid + log.Warn(). + Str("udid", udid). + Msg("ios UDID is not specified, select the first one") + } + device.d = dev // run xctest if XCTestBundleID is set @@ -251,7 +258,7 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) { } } - log.Info().Str("udid", device.UDID).Msg("select ios device") + log.Info().Str("udid", device.UDID).Msg("init ios device") return device, nil }