fix: errors

examples/uitest/bili/android/cli.go

@@ -28,24 +28,24 @@ func init() {
 	fmt.Printf("=== start running cases, serial=%s, runTimes=%d ===\n", serial, runTimes)
 }
 
-func launchAppDriver(pkgName string) (driver *uixt.DriverExt, err error) {
+func launchAppDriver(pkgName string) (driver uixt.IDriverExt, err error) {
 	device, _ := uixt.NewAndroidDevice(option.WithSerialNumber(serial))
 	driver, err = device.NewDriver()
 	if err != nil {
 		return nil, err
 	}
 
-	_, err = driver.Driver.AppTerminate(pkgName)
+	_, err = driver.GetDriver().AppTerminate(pkgName)
 	if err != nil {
 		return nil, err
 	}
 
-	err = driver.Driver.Homescreen()
+	err = driver.GetDriver().Homescreen()
 	if err != nil {
 		return nil, err
 	}
 
-	err = driver.Driver.AppLaunch(pkgName)
+	err = driver.GetDriver().AppLaunch(pkgName)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +67,7 @@ func launchAppDriver(pkgName string) (driver *uixt.DriverExt, err error) {
 	return driver, nil
 }
 
-func watchVideo(driver *uixt.DriverExt) (err error) {
+func watchVideo(driver uixt.IDriverExt) (err error) {
 	time.Sleep(3 * time.Second)
 	err = driver.SwipeRelative(0.7, 0.7, 0.7, 0.2)
 	if err != nil {
@@ -96,7 +96,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	if err != nil {
 		// 未找到横屏图标，该页面可能不是横版视频（直播|广告|Feed）
 		// 退出回到推荐页
-		driver.Driver.PressBack()
+		driver.GetDriver().PressBack()
 		return nil
 	}
 
@@ -104,7 +104,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	time.Sleep(10 * time.Second)
 
 	// 返回视频页面
-	err = driver.Driver.PressBack()
+	err = driver.GetDriver().PressBack()
 	if err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	time.Sleep(1 * time.Second)
 
 	// 返回推荐页
-	err = driver.Driver.PressBack()
+	err = driver.GetDriver().PressBack()
 	if err != nil {
 		return err
 	}

examples/uitest/bili/ios/cli.go

@@ -28,7 +28,7 @@ func init() {
 	fmt.Printf("=== start running cases, serial=%s, runTimes=%d ===\n", serial, runTimes)
 }
 
-func launchAppDriver(pkgName string) (driver *uixt.DriverExt, err error) {
+func launchAppDriver(pkgName string) (driver uixt.IDriverExt, err error) {
 	device, _ := uixt.NewIOSDevice(option.WithUDID(serial))
 	driver, err = device.NewDriver()
 	if err != nil {
@@ -67,7 +67,7 @@ func launchAppDriver(pkgName string) (driver *uixt.DriverExt, err error) {
 	return driver, nil
 }
 
-func watchVideo(driver *uixt.DriverExt) (err error) {
+func watchVideo(driver uixt.IDriverExt) (err error) {
 	time.Sleep(3 * time.Second)
 	err = driver.SwipeRelative(0.7, 0.7, 0.7, 0.2)
 	if err != nil {
@@ -96,7 +96,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	if err != nil {
 		// 未找到横屏图标，该页面可能不是横版视频（直播|广告|Feed）
 		// 退出回到推荐页
-		driver.Driver.PressBack()
+		driver.GetDriver().PressBack()
 		return nil
 	}
 
@@ -104,7 +104,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	time.Sleep(10 * time.Second)
 
 	// 返回视频页面
-	err = driver.Driver.PressBack()
+	err = driver.GetDriver().PressBack()
 	if err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ func watchVideo(driver *uixt.DriverExt) (err error) {
 	time.Sleep(1 * time.Second)
 
 	// 返回推荐页
-	err = driver.Driver.PressBack()
+	err = driver.GetDriver().PressBack()
 	if err != nil {
 		return err
 	}

examples/worldcup/cli.go

@@ -8,6 +8,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/httprunner/httprunner/v5/pkg/uixt"
+	"github.com/httprunner/httprunner/v5/pkg/uixt/ai"
+	"github.com/httprunner/httprunner/v5/pkg/uixt/option"
 )
 
 var rootCmd = &cobra.Command{
@@ -15,21 +17,36 @@ var rootCmd = &cobra.Command{
 	Short:   "Monitor FIFA World Cup Live",
 	Version: "2022.12.03.0018",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		var device uixt.IDevice
+		var driver uixt.IDriver
 		var bundleID string
 		if iosApp != "" {
 			log.Info().Str("bundleID", iosApp).Msg("init ios device")
-			device = initIOSDevice(uuid)
+			device, err := uixt.NewIOSDevice(option.WithUDID(uuid))
+			if err != nil {
+				log.Fatal().Err(err).Msg("failed to init ios device")
+			}
+			driver, _ = uixt.NewWDADriver(device)
 			bundleID = iosApp
 		} else if androidApp != "" {
 			log.Info().Str("bundleID", androidApp).Msg("init android device")
-			device = initAndroidDevice(uuid)
+			device, err := uixt.NewAndroidDevice(option.WithSerialNumber(uuid))
+			if err != nil {
+				log.Fatal().Err(err).Msg("failed to init android device")
+			}
+			driver, _ = uixt.NewADBDriver(device)
 			bundleID = androidApp
 		} else {
 			return errors.New("android or ios app bundldID is required")
 		}
 
-		wc := NewWorldCupLive(device, matchName, bundleID, duration, interval)
+		driverExt, err := uixt.NewDriverExt(driver,
+			ai.WithCVService(ai.CVServiceTypeVEDEM),
+		)
+		if err != nil {
+			return err
+		}
+
+		wc := NewWorldCupLive(driverExt, matchName, bundleID, duration, interval)
 
 		if auto {
 			wc.EnterLive(bundleID)

examples/worldcup/main.go

@@ -37,7 +37,7 @@ func convertTimeToSeconds(timeStr string) (int, error) {
 	return seconds, nil
 }
 
-func initIOSDevice(uuid string) uixt.IDevice {
+func initIOSDriver(uuid string) uixt.IDriverExt {
 	device, err := uixt.NewIOSDevice(
 		option.WithUDID(uuid),
 		option.WithWDAPort(8700), option.WithWDAMjpegPort(8800),
@@ -47,15 +47,17 @@ func initIOSDevice(uuid string) uixt.IDevice {
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to init ios device")
 	}
-	return device
+	driver, _ := device.NewDriver()
+	return driver
 }
 
-func initAndroidDevice(uuid string) uixt.IDevice {
+func initAndroidDriver(uuid string) uixt.IDriverExt {
 	device, err := uixt.NewAndroidDevice(option.WithSerialNumber(uuid))
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to init android device")
 	}
-	return device
+	driver, _ := device.NewDriver()
+	return driver
 }
 
 type timeLog struct {
@@ -66,10 +68,9 @@ type timeLog struct {
 }
 
 type WorldCupLive struct {
-	driver    *uixt.DriverExt
+	driver    uixt.IDriverExt
 	file      *os.File
 	resultDir string
-	UUID      string    `json:"uuid"`
 	MatchName string    `json:"matchName"`
 	BundleID  string    `json:"bundleID"`
 	StartTime string    `json:"startTime"`
@@ -80,12 +81,7 @@ type WorldCupLive struct {
 	PerfFile  string    `json:"perf"`
 }
 
-func NewWorldCupLive(device uixt.IDevice, matchName, bundleID string, duration, interval int) *WorldCupLive {
-	driverExt, err := device.NewDriver()
-	if err != nil {
-		log.Fatal().Err(err).Msg("failed to init driver")
-	}
-
+func NewWorldCupLive(driver uixt.IDriverExt, matchName, bundleID string, duration, interval int) *WorldCupLive {
 	if matchName == "" {
 		matchName = "unknown-match"
 	}
@@ -94,7 +90,7 @@ func NewWorldCupLive(device uixt.IDevice, matchName, bundleID string, duration,
 	matchName = fmt.Sprintf("%s-%s", startTime.Format("2006-01-02"), matchName)
 	resultDir := filepath.Join("worldcuplive", matchName, startTime.Format("15:04:05"))
 
-	if err = os.MkdirAll(filepath.Join(resultDir, "screenshot"), 0o755); err != nil {
+	if err := os.MkdirAll(filepath.Join(resultDir, "screenshot"), 0o755); err != nil {
 		log.Fatal().Err(err).Msg("failed to create result dir")
 	}
 
@@ -104,7 +100,7 @@ func NewWorldCupLive(device uixt.IDevice, matchName, bundleID string, duration,
 		log.Fatal().Err(err).Msg("failed to open file")
 	}
 	// write title
-	f.WriteString(fmt.Sprintf("%s\t%s\t%s\n", matchName, device.UUID(), bundleID))
+	f.WriteString(fmt.Sprintf("%s\t%s\t%s\n", matchName, driver.GetDriver().GetDevice().UUID(), bundleID))
 	f.WriteString("utc_time\tutc_timestamp\tlive_time\tlive_seconds\n")
 
 	if interval == 0 {
@@ -115,10 +111,9 @@ func NewWorldCupLive(device uixt.IDevice, matchName, bundleID string, duration,
 	}
 
 	return &WorldCupLive{
-		driver:    driverExt,
+		driver:    driver,
 		file:      f,
 		resultDir: resultDir,
-		UUID:      device.UUID(),
 		BundleID:  bundleID,
 		Duration:  duration,
 		Interval:  interval,
@@ -177,13 +172,13 @@ func (wc *WorldCupLive) EnterLive(bundleID string) error {
 	log.Info().Msg("enter world cup live")
 
 	// kill app
-	_, err := wc.driver.Driver.AppTerminate(bundleID)
+	_, err := wc.driver.GetDriver().AppTerminate(bundleID)
 	if err != nil {
 		log.Error().Err(err).Msg("terminate app failed")
 	}
 
 	// launch app
-	err = wc.driver.Driver.AppLaunch(bundleID)
+	err = wc.driver.GetDriver().AppLaunch(bundleID)
 	if err != nil {
 		log.Error().Err(err).Msg("launch app failed")
 		return err

examples/worldcup/main_test.go

@@ -33,17 +33,17 @@ func TestConvertTimeToSeconds(t *testing.T) {
 
 func TestMainIOS(t *testing.T) {
 	uuid := "00008030-00194DA421C1802E"
-	device := initIOSDevice(uuid)
+	driver := initIOSDriver(uuid)
 	bundleID := "com.ss.iphone.ugc.Aweme"
-	wc := NewWorldCupLive(device, "", bundleID, 30, 10)
+	wc := NewWorldCupLive(driver, "", bundleID, 30, 10)
 	wc.EnterLive(bundleID)
 	wc.Start()
 }
 
 func TestMainAndroid(t *testing.T) {
-	device := initAndroidDevice(uuid)
+	driver := initAndroidDriver(uuid)
 	bundleID := "com.ss.android.ugc.aweme"
-	wc := NewWorldCupLive(device, "", bundleID, 30, 10)
+	wc := NewWorldCupLive(driver, "", bundleID, 30, 10)
 	wc.EnterLive(bundleID)
 	wc.Start()
 }