diff --git a/examples/uitest/demo_android_douyin_test.go b/examples/uitest/demo_android_douyin_test.go index 9e5f2477..a0d946f2 100644 --- a/examples/uitest/demo_android_douyin_test.go +++ b/examples/uitest/demo_android_douyin_test.go @@ -6,16 +6,16 @@ import ( "github.com/httprunner/httprunner/v4/hrp" ) -func TestIOSDouYinLive(t *testing.T) { +func TestAndroidDouYinLive(t *testing.T) { testCase := &hrp.TestCase{ Config: hrp.NewConfig("通过 feed 头像进入抖音直播间"). - SetAndroid(hrp.WithAdbLogOn(true), hrp.WithMjpegPortA(9100)), + SetAndroid(hrp.WithAdbLogOn(true)), TestSteps: []hrp.IStep{ hrp.NewStep("打开网页"). Android(). Home(). AppTerminate("com.google.android.apps.chrome.Main").Sleep(1). // 关闭已运行的抖音,确保启动抖音后在「抖音」首页 - SwipeToTapApp("Chrome", hrp.WithMaxRetryTimes(5)).TapByOCR("Search").Input("https://gtftask.bytedance.com/local-time").TapByOCR("前往").Sleep(5). + SwipeToTapApp("Chrome", hrp.WithMaxRetryTimes(5)).TapByOCR("搜索").Input("https://gtftask.bytedance.com/local-time").TapByOCR("前往").Sleep(5). Validate(). AssertOCRExists("1664", "网页打开失败"), hrp.NewStep("启动抖音"). diff --git a/hrp/internal/uixt/android_device.go b/hrp/internal/uixt/android_device.go index 275e4cb9..568adcdf 100644 --- a/hrp/internal/uixt/android_device.go +++ b/hrp/internal/uixt/android_device.go @@ -65,12 +65,6 @@ func WithSerialNumber(serial string) AndroidDeviceOption { } } -func WithMjpegPortA(port int) AndroidDeviceOption { - return func(device *AndroidDevice) { - device.MjpegPort = port - } -} - func WithAdbIP(ip string) AndroidDeviceOption { return func(device *AndroidDevice) { device.IP = ip diff --git a/hrp/internal/uixt/opencv_on.go b/hrp/internal/uixt/opencv_on.go index 2153283f..d4acda45 100644 --- a/hrp/internal/uixt/opencv_on.go +++ b/hrp/internal/uixt/opencv_on.go @@ -5,6 +5,7 @@ package uixt import ( "bytes" "image" + "io/ioutil" "os" cvHelper "github.com/electricbubble/opencv-helper" diff --git a/hrp/step_android_ui.go b/hrp/step_android_ui.go index 5397f1b2..53168cf2 100644 --- a/hrp/step_android_ui.go +++ b/hrp/step_android_ui.go @@ -14,7 +14,6 @@ var ( WithAdbIP = uixt.WithAdbIP WithAdbPort = uixt.WithAdbPort WithAdbLogOn = uixt.WithAdbLogOn - WithMjpegPortA = uixt.WithMjpegPortA ) type AndroidStep struct {