mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-11 18:11:21 +08:00
refactor: XTDriver
This commit is contained in:
@@ -98,7 +98,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
if err != nil {
|
||||
// 未找到横屏图标,该页面可能不是横版视频(直播|广告|Feed)
|
||||
// 退出回到推荐页
|
||||
driver.GetDriver().PressBack()
|
||||
driver.PressBack()
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
time.Sleep(10 * time.Second)
|
||||
|
||||
// 返回视频页面
|
||||
err = driver.GetDriver().PressBack()
|
||||
err = driver.PressBack()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -114,7 +114,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
// 返回推荐页
|
||||
err = driver.GetDriver().PressBack()
|
||||
err = driver.PressBack()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -36,17 +36,17 @@ func launchAppDriver(pkgName string) (driverExt *uixt.XTDriver, err error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//_, err = driver.Driver.AppTerminate(pkgName)
|
||||
//_, err = driver.AppTerminate(pkgName)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//
|
||||
//err = driver.Driver.Homescreen()
|
||||
//err = driver.Homescreen()
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//
|
||||
//err = driver.Driver.AppLaunch(pkgName)
|
||||
//err = driver.AppLaunch(pkgName)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
@@ -100,7 +100,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
if err != nil {
|
||||
// 未找到横屏图标,该页面可能不是横版视频(直播|广告|Feed)
|
||||
// 退出回到推荐页
|
||||
driver.GetDriver().PressBack()
|
||||
driver.PressBack()
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
time.Sleep(10 * time.Second)
|
||||
|
||||
// 返回视频页面
|
||||
err = driver.GetDriver().PressBack()
|
||||
err = driver.PressBack()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -116,7 +116,7 @@ func watchVideo(driver *uixt.XTDriver) (err error) {
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
// 返回推荐页
|
||||
err = driver.GetDriver().PressBack()
|
||||
err = driver.PressBack()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ func NewWorldCupLive(driver *uixt.XTDriver, 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, driver.GetDriver().GetDevice().UUID(), bundleID))
|
||||
f.WriteString(fmt.Sprintf("%s\t%s\t%s\n", matchName, driver.GetDevice().UUID(), bundleID))
|
||||
f.WriteString("utc_time\tutc_timestamp\tlive_time\tlive_seconds\n")
|
||||
|
||||
if interval == 0 {
|
||||
@@ -174,13 +174,13 @@ func (wc *WorldCupLive) EnterLive(bundleID string) error {
|
||||
log.Info().Msg("enter world cup live")
|
||||
|
||||
// kill app
|
||||
_, err := wc.driver.GetDriver().AppTerminate(bundleID)
|
||||
_, err := wc.driver.AppTerminate(bundleID)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("terminate app failed")
|
||||
}
|
||||
|
||||
// launch app
|
||||
err = wc.driver.GetDriver().AppLaunch(bundleID)
|
||||
err = wc.driver.AppLaunch(bundleID)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("launch app failed")
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user