From 11b7fd7cfeedba03918e68061103a4f4a37de157 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Tue, 29 Aug 2023 17:42:19 +0800 Subject: [PATCH] fix: AssertForegroundApp log --- hrp/pkg/uixt/ext.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go index c5524e36..99a7a8df 100644 --- a/hrp/pkg/uixt/ext.go +++ b/hrp/pkg/uixt/ext.go @@ -341,14 +341,19 @@ func (dExt *DriverExt) AssertImage(imagePath, assert string) bool { } func (dExt *DriverExt) AssertForegroundApp(appName, assert string) bool { - var err error + app, err := dExt.Driver.GetForegroundApp() + if err != nil { + log.Warn().Err(err).Msg("get foreground app failed, skip app/activity assertion") + return true // Notice: ignore error when get foreground app failed + } + log.Debug().Interface("app", app).Msg("get foreground app") + + // assert package name switch assert { case AssertionEqual: - err = dExt.Driver.AssertForegroundApp(appName) - return err == nil + return app.PackageName == appName case AssertionNotEqual: - err = dExt.Driver.AssertForegroundApp(appName) - return err != nil + return app.PackageName != appName default: log.Warn().Str("assert method", assert).Msg("unexpected assert method") }