GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-12 16:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: implement video crawler

Browse Source
This commit is contained in:
lilong.129
2023-04-28 21:48:59 +08:00
parent 8498fe10e3
commit 68dc545f35
7 changed files with 208 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,22 +367,22 @@ func (ad *adbDriver) AssertAppForeground(packageName string) error {
return errors.New("package name is not given")
}
foreApp, err := ad.GetForegroundApp()
app, err := ad.GetForegroundApp()
if err != nil {
return err
}
if foreApp != packageName {
if app.BundleId != packageName {
return errors.New("app is not in foreground")
}
return nil
}
func (ad *adbDriver) GetForegroundApp() (packageName string, err error) {
func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) {
// adb shell dumpsys activity activities | grep mResumedActivity
output, err := ad.adbClient.RunShellCommand("dumpsys", "activity", "activities")
if err != nil {
log.Error().Err(err).Msg("failed to dumpsys activities")
return "", errors.Wrap(code.AndroidShellExecError, err.Error())
return AppInfo{}, errors.Wrap(code.AndroidShellExecError, err.Error())
}
lines := strings.Split(string(output), "\n")
@@ -394,11 +394,18 @@ func (ad *adbDriver) GetForegroundApp() (packageName string, err error) {
for _, str := range strs {
if strings.Contains(str, "/") {
// com.android.settings/.Settings
return strings.Split(str, "/")[0], nil
s := strings.Split(str, "/")
app := AppInfo{
AppBaseInfo: AppBaseInfo{
BundleId: s[0],
Activity: s[1],
},
}
return app, nil
}
}
}
}
return "", errors.New("get foreground app failed")
return AppInfo{}, errors.New("get foreground app failed")
}