From 41f705c0d94f10545e37d3cb6f6a1ee8f00417aa Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Sat, 7 Oct 2023 19:45:41 +0800
Subject: [PATCH] fix: device serial/udid should be specified

---
 hrp/internal/version/VERSION   | 2 +-
 hrp/pkg/uixt/android_device.go | 7 +++++--
 hrp/pkg/uixt/ios_device.go     | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION
index 9c6a0187..d87fdf6c 100644
--- a/hrp/internal/version/VERSION
+++ b/hrp/internal/version/VERSION
@@ -1 +1 @@
-v4.3.6.20230926
\ No newline at end of file
+v4.3.6.2310081724
\ No newline at end of file
diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go
index 42b4757e..84edf057 100644
--- a/hrp/pkg/uixt/android_device.go
+++ b/hrp/pkg/uixt/android_device.go
@@ -88,10 +88,13 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
 	for _, option := range options {
 		option(device)
 	}
-
 	deviceList, err := GetAndroidDevices(device.SerialNumber)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(code.AndroidDeviceConnectionError, err.Error())
+	}
+
+	if device.SerialNumber == "" && len(deviceList) > 1 {
+		return nil, errors.Wrap(code.AndroidDeviceConnectionError, "more than one device connected, please specify the serial")
 	}
 
 	dev := deviceList[0]
diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go
index 843a34b3..b5283667 100644
--- a/hrp/pkg/uixt/ios_device.go
+++ b/hrp/pkg/uixt/ios_device.go
@@ -237,6 +237,10 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) {
 		return nil, errors.Wrap(code.IOSDeviceConnectionError, err.Error())
 	}
 
+	if device.UDID == "" && len(deviceList) > 1 {
+		return nil, errors.Wrap(code.IOSDeviceConnectionError, "more than one device connected, please specify the udid")
+	}
+
 	dev := deviceList[0]
 	udid := dev.Properties().SerialNumber