merge branch merge-from-video

This commit is contained in:
lilong.129
2024-08-21 14:57:53 +08:00
45 changed files with 2280 additions and 365 deletions

View File

@@ -41,7 +41,11 @@ var listAndroidDevicesCmd = &cobra.Command{
if isDetail {
fmt.Println(format(d.DeviceInfo()))
} else {
fmt.Println(d.Serial(), d.Usb())
if usb, err := d.Usb(); err != nil {
fmt.Println(d.Serial())
} else {
fmt.Println(d.Serial(), usb)
}
}
}
return nil

View File

@@ -49,11 +49,11 @@ var listAppsCmd = &cobra.Command{
applicationType = gidevice.ApplicationTypeAny
}
result, errList := device.InstallationProxyBrowse(
result, err := device.InstallationProxyBrowse(
gidevice.WithApplicationType(applicationType),
gidevice.WithReturnAttributes("CFBundleVersion", "CFBundleDisplayName", "CFBundleIdentifier"))
if errList != nil {
return fmt.Errorf("get app list failed")
if err != nil {
return fmt.Errorf("get app list failed %v", err)
}
for _, app := range result {