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

fix: get foreground app

Browse Source
This commit is contained in:
lilong.129
2023-05-30 16:42:08 +08:00
parent 788d2aed9c
commit 4c6cce1d17
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/android_adb_driver.go
+4 -2
View File
@@ -392,7 +392,7 @@ func (ad *adbDriver) AssertAppForeground(packageName string) error {
} }
func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) { func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) {
// adb shell dumpsys activity activities | grep mResumedActivity // adb shell dumpsys activity activities
output, err := ad.adbClient.RunShellCommand("dumpsys", "activity", "activities") output, err := ad.adbClient.RunShellCommand("dumpsys", "activity", "activities")
if err != nil { if err != nil {
log.Error().Err(err).Msg("failed to dumpsys activities") log.Error().Err(err).Msg("failed to dumpsys activities")
@@ -402,8 +402,10 @@ func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) {
lines := strings.Split(string(output), "\n") lines := strings.Split(string(output), "\n")
for _, line := range lines { for _, line := range lines {
trimmedLine := strings.TrimSpace(line) trimmedLine := strings.TrimSpace(line)
if strings.HasPrefix(trimmedLine, "mResumedActivity:") { // grep mResumedActivity|ResumedActivity
if strings.HasPrefix(trimmedLine, "mResumedActivity:") || strings.HasPrefix(trimmedLine, "ResumedActivity:") {
// mResumedActivity: ActivityRecord{9656d74 u0 com.android.settings/.Settings t407} // mResumedActivity: ActivityRecord{9656d74 u0 com.android.settings/.Settings t407}
// ResumedActivity: ActivityRecord{8265c25 u0 com.android.settings/.Settings t73}
strs := strings.Split(trimmedLine, " ") strs := strings.Split(trimmedLine, " ")
for _, str := range strs { for _, str := range strs {
if strings.Contains(str, "/") { if strings.Contains(str, "/") {