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

fix: AppInfo VersionCode maybe int or string

Browse Source
This commit is contained in:
lilong.129
2024-12-24 17:43:55 +08:00
parent 1812c00360
commit bb04d80a05
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/internal/version/VERSION
+1 -1
View File
@@ -1 +1 @@
v5.0.0+2412241739 v5.0.0+2412241743
hrp/pkg/uixt/android_adb_driver.go
-1
View File
@@ -876,7 +876,6 @@ func (ad *adbDriver) GetForegroundApp() (app AppInfo, err error) {
if err != nil { if err != nil {
return app, err return app, err
} }
log.Info().Msg(packageInfo)
err = json.Unmarshal([]byte(strings.TrimSpace(packageInfo)), &app) err = json.Unmarshal([]byte(strings.TrimSpace(packageInfo)), &app)
if err != nil { if err != nil {
log.Error().Err(err).Str("packageInfo", packageInfo).Msg("get foreground app failed") log.Error().Err(err).Str("packageInfo", packageInfo).Msg("get foreground app failed")
hrp/pkg/uixt/interface.go
+10 -10
View File
@@ -264,16 +264,16 @@ type WindowInfo struct {
} }
type AppBaseInfo struct { type AppBaseInfo struct {
Pid int `json:"pid,omitempty"` Pid int `json:"pid,omitempty"`
BundleId string `json:"bundleId,omitempty"` // ios package name BundleId string `json:"bundleId,omitempty"` // ios package name
ViewController string `json:"viewController,omitempty"` // ios view controller ViewController string `json:"viewController,omitempty"` // ios view controller
PackageName string `json:"packageName,omitempty"` // android package name PackageName string `json:"packageName,omitempty"` // android package name
Activity string `json:"activity,omitempty"` // android activity Activity string `json:"activity,omitempty"` // android activity
VersionName string `json:"versionName,omitempty"` VersionName string `json:"versionName,omitempty"`
VersionCode string `json:"versionCode,omitempty"` VersionCode interface{} `json:"versionCode,omitempty"` // int or string
AppName string `json:"appName,omitempty"` AppName string `json:"appName,omitempty"`
AppPath string `json:"appPath,omitempty"` AppPath string `json:"appPath,omitempty"`
AppMD5 string `json:"appMD5,omitempty"` AppMD5 string `json:"appMD5,omitempty"`
// AppIcon string `json:"appIcon,omitempty"` // AppIcon string `json:"appIcon,omitempty"`
} }