refactor ios: replace gidevice with go-ios

hrp/cmd/ios/devices.go

@@ -7,52 +7,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
+	"github.com/danielpaulus/go-ios/ios"
 	"github.com/spf13/cobra"
 
 	"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
-	"github.com/httprunner/httprunner/v4/hrp/pkg/gidevice"
 	"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
 )
 
 type Device struct {
-	d               gidevice.Device
-	UDID            string        `json:"UDID"`
-	Status          string        `json:"status"`
-	ConnectionType  string        `json:"connectionType"`
-	ConnectionSpeed int           `json:"connectionSpeed"`
-	DeviceDetail    *DeviceDetail `json:"deviceDetail,omitempty"`
-}
-
-type DeviceDetail struct {
-	DeviceName        string `json:"deviceName,omitempty"`
-	DeviceClass       string `json:"deviceClass,omitempty"`
-	ProductVersion    string `json:"productVersion,omitempty"`
-	ProductType       string `json:"productType,omitempty"`
-	ProductName       string `json:"productName,omitempty"`
-	PasswordProtected bool   `json:"passwordProtected,omitempty"`
-	ModelNumber       string `json:"modelNumber,omitempty"`
-	SerialNumber      string `json:"serialNumber,omitempty"`
-	SIMStatus         string `json:"simStatus,omitempty"`
-	PhoneNumber       string `json:"phoneNumber,omitempty"`
-	CPUArchitecture   string `json:"cpuArchitecture,omitempty"`
-	ProtocolVersion   string `json:"protocolVersion,omitempty"`
-	RegionInfo        string `json:"regionInfo,omitempty"`
-	TimeZone          string `json:"timeZone,omitempty"`
-	UniqueDeviceID    string `json:"uniqueDeviceID,omitempty"`
-	WiFiAddress       string `json:"wifiAddress,omitempty"`
-	BuildVersion      string `json:"buildVersion,omitempty"`
-}
-
-func (device *Device) GetDetail() (*DeviceDetail, error) {
-	value, err := device.d.GetValue("", "")
-	if err != nil {
-		return nil, errors.Wrap(err, "get device detail failed")
-	}
-	detailByte, _ := json.Marshal(value)
-	detail := &DeviceDetail{}
-	json.Unmarshal(detailByte, detail)
-	return detail, nil
+	d               ios.DeviceEntry
+	UDID            string             `json:"UDID"`
+	Status          string             `json:"status"`
+	ConnectionType  string             `json:"connectionType"`
+	ConnectionSpeed int                `json:"connectionSpeed"`
+	DeviceDetail    *uixt.DeviceDetail `json:"deviceDetail,omitempty"`
 }
 
 func (device *Device) GetStatus() string {
@@ -89,7 +57,7 @@ var listDevicesCmd = &cobra.Command{
 		}
 
 		for _, d := range devices {
-			deviceProperties := d.Properties()
+			deviceProperties := d.Properties
 			device := &Device{
 				d:               d,
 				UDID:            deviceProperties.SerialNumber,
@@ -98,27 +66,16 @@ var listDevicesCmd = &cobra.Command{
 			}
 			device.Status = device.GetStatus()
 
-			if isDetail {
-				device.DeviceDetail, err = device.GetDetail()
-				if err != nil {
-					return err
-				}
-				fmt.Println(device.ToFormat())
-			} else {
-				fmt.Println(device.UDID, device.ConnectionType, device.Status)
-			}
+			fmt.Println(device.UDID, device.ConnectionType, device.Status)
+
 		}
 		return nil
 	},
 }
 
-var (
-	udid     string
-	isDetail bool
-)
+var udid string
 
 func init() {
 	listDevicesCmd.Flags().StringVarP(&udid, "udid", "u", "", "filter by device's udid")
-	listDevicesCmd.Flags().BoolVarP(&isDetail, "detail", "d", false, "print device's detail")
 	iosRootCmd.AddCommand(listDevicesCmd)
 }