GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-23 09:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: exit live room

Browse Source
This commit is contained in:
lilong.129
2023-04-30 00:40:44 +08:00
parent a69db8500c
commit 6bc5e11e2d
6 changed files with 133 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hrp/pkg/uixt/android_adb_driver.go
View File

@@ -371,7 +371,7 @@ func (ad *adbDriver) AssertAppForeground(packageName string) error {
if err != nil {
return err
}
if app.BundleId != packageName {
if app.PackageName != packageName {
return errors.New("app is not in foreground")
}
return nil
@@ -397,8 +397,8 @@ func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) {
s := strings.Split(str, "/")
app := AppInfo{
AppBaseInfo: AppBaseInfo{
BundleId: s[0],
Activity: s[1],
PackageName: s[0],
Activity: s[1],
},
}
return app, nil

2
hrp/pkg/uixt/android_test.go
View File

@@ -357,7 +357,7 @@ func TestDriver_IsAppInForeground(t *testing.T) {
app, err := driverExt.Driver.GetForegroundApp()
checkErr(t, err)
if app.BundleId != "com.android.settings" {
if app.PackageName != "com.android.settings" {
t.FailNow()
}
if app.Activity != ".Settings" {

8
hrp/pkg/uixt/interface.go
View File

@@ -251,9 +251,11 @@ type AppInfo struct {
}
type AppBaseInfo struct {
Pid int `json:"pid,omitempty"`
BundleId string `json:"bundleId"` // package name for android
Activity string // view controller for ios
Pid int `json:"pid,omitempty"`
BundleId string `json:"bundleId,omitempty"` // ios package name
ViewController string `json:"viewController,omitempty"` // ios view controller
PackageName string `json:"packageName,omitempty"` // android package name
Activity string `json:"activity,omitempty"` // android activity
}
type AppState int

28
hrp/pkg/uixt/video_crawler.go
View File

@@ -89,8 +89,17 @@ func (l *LiveCrawler) Run(driver *DriverExt, enterPoint PointF) error {
return err
}
// take screenshot and get screen texts by OCR
_, err := l.driver.GetScreenTextsByOCR()
if err != nil {
log.Error().Err(err).Msg("OCR GetTexts failed")
continue
}
// TODO: check live type
// swipe to next live video
err := l.driver.SwipeUp()
err = l.driver.SwipeUp()
// TODO: sleep custom random time
time.Sleep(15 * time.Second)
if err != nil {
@@ -110,9 +119,8 @@ func (l *LiveCrawler) Run(driver *DriverExt, enterPoint PointF) error {
}
func (l *LiveCrawler) exitLiveRoom() error {
// FIXME: exit live room
for i := 0; i < 5; i++ {
l.driver.SwipeRelative(0, 0.5, 0.5, 0.5)
for i := 0; i < 3; i++ {
l.driver.SwipeRelative(0.1, 0.5, 0.9, 0.5)
time.Sleep(2 * time.Second)
// check if back to feed page
@@ -159,7 +167,7 @@ func (dExt *DriverExt) VideoCrawler(configs *VideoCrawlerConfigs) (err error) {
texts, err := dExt.GetScreenTextsByOCR()
if err != nil {
log.Error().Err(err).Msg("OCR GetTexts failed")
return err
continue
}
// automatic handling of pop-up windows
@@ -202,8 +210,8 @@ func (dExt *DriverExt) VideoCrawler(configs *VideoCrawlerConfigs) (err error) {
return nil
}
func (dExt *DriverExt) assertActivity(pacakgeName, activityType string) error {
log.Debug().Str("pacakge_name", pacakgeName).
func (dExt *DriverExt) assertActivity(packageName, activityType string) error {
log.Debug().Str("pacakge_name", packageName).
Str("activity_type", activityType).Msg("assert activity")
app, err := dExt.Driver.GetForegroundApp()
if err != nil {
@@ -211,11 +219,11 @@ func (dExt *DriverExt) assertActivity(pacakgeName, activityType string) error {
return err
}
if app.BundleId != pacakgeName {
return fmt.Errorf("app %s is not in foreground", pacakgeName)
if app.PackageName != packageName {
return fmt.Errorf("app %s is not in foreground", packageName)
}
if activities, ok := androidActivities[app.BundleId]; ok {
if activities, ok := androidActivities[app.PackageName]; ok {
if activity, ok := activities[activityType]; ok {
if strings.HasSuffix(app.Activity, activity) {
return nil