fix: resolve conflicts

This commit is contained in:
徐聪
2024-07-19 15:11:16 +08:00
36 changed files with 2018 additions and 337 deletions

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 {