From c012107847fa181066366fba58da4b3717700488 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Wed, 23 Nov 2022 18:05:35 +0800 Subject: [PATCH] change: filter non-usb ios devices --- hrp/cmd/ios/devices.go | 8 +++++--- hrp/pkg/uixt/ios_device.go | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hrp/cmd/ios/devices.go b/hrp/cmd/ios/devices.go index bc9724a4..c1f230d3 100644 --- a/hrp/cmd/ios/devices.go +++ b/hrp/cmd/ios/devices.go @@ -85,11 +85,13 @@ var listDevicesCmd = &cobra.Command{ } for _, d := range devices { - deviceByte, _ := json.Marshal(d.Properties()) + deviceProperties := d.Properties() device := &Device{ - d: d, + d: d, + UDID: deviceProperties.SerialNumber, + ConnectionType: deviceProperties.ConnectionType, + ConnectionSpeed: deviceProperties.ConnectionSpeed, } - json.Unmarshal(deviceByte, device) device.Status = device.GetStatus() if isDetail { diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index ff318ea2..1cb0c820 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -124,6 +124,10 @@ func IOSDevices(udid ...string) (devices []gidevice.Device, err error) { if u != "" && u != d.Properties().SerialNumber { continue } + // filter non-usb ios devices + if d.Properties().ConnectionType != "USB" { + continue + } deviceList = append(deviceList, d) } }