refactor: move android options to pkg/uixt/options

This commit is contained in:
lilong.129
2025-02-06 15:34:36 +08:00
parent 14c81ea142
commit 8a78ba6477
14 changed files with 124 additions and 98 deletions

View File

@@ -160,23 +160,23 @@ func (c *TConfig) SetHarmony(options ...uixt.HarmonyDeviceOption) *TConfig {
return c
}
func (c *TConfig) SetAndroid(options ...uixt.AndroidDeviceOption) *TConfig {
uiaOptions := &uixt.AndroidDevice{}
for _, option := range options {
option(uiaOptions)
func (c *TConfig) SetAndroid(opts ...options.AndroidDeviceOption) *TConfig {
uiaOptions := options.NewAndroidDeviceConfig(opts...)
device := &uixt.AndroidDevice{
AndroidDeviceConfig: uiaOptions,
}
// each device can have its own settings
if uiaOptions.SerialNumber != "" {
c.Android = append(c.Android, uiaOptions)
c.Android = append(c.Android, device)
return c
}
// device UDID is not specified, settings will be shared
if len(c.Android) == 0 {
c.Android = append(c.Android, uiaOptions)
c.Android = append(c.Android, device)
} else {
c.Android[0] = uiaOptions
c.Android[0] = device
}
return c
}