GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add screen resolution in screen results

Browse Source
This commit is contained in:
lilong.129
2023-06-01 17:42:40 +08:00
parent 233d5e1b64
commit a24e1ff251
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ func (ad *adbDriver) WindowSize() (size Size, err error) {
// adb shell wm size
resp, err := ad.adbClient.RunShellCommand("wm", "size")
if err != nil {
return size, errors.Wrap(err, "get window size failed")
return size, errors.Wrap(err, "get window size failed with adb")
}
// Physical size: 1080x2340

9
hrp/pkg/uixt/ext.go
View File

@@ -210,6 +210,11 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
cacheData["screenshots"] = dExt.cacheStepData.screenShots
cacheData["screenshots_urls"] = dExt.cacheStepData.screenShotsUrls
screenSize, err := dExt.Driver.WindowSize()
if err != nil {
log.Warn().Err(err).Msg("get screen resolution failed")
screenSize = Size{}
}
screenResults := make(map[string]interface{})
for imagePath, screenResult := range dExt.cacheStepData.screenResults {
o, _ := json.Marshal(screenResult.Texts)
@@ -217,6 +222,10 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
"tags": screenResult.Tags,
"texts": string(o),
"popularity": screenResult.Popularity,
"resolution": map[string]int{
"width": screenSize.Width,
"height": screenSize.Height,
},
}
screenResults[imagePath] = data