mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-07 16:40:50 +08:00
feat: add screen resolution in screen results
This commit is contained in:
@@ -59,7 +59,7 @@ func (ad *adbDriver) WindowSize() (size Size, err error) {
|
|||||||
// adb shell wm size
|
// adb shell wm size
|
||||||
resp, err := ad.adbClient.RunShellCommand("wm", "size")
|
resp, err := ad.adbClient.RunShellCommand("wm", "size")
|
||||||
if err != nil {
|
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
|
// Physical size: 1080x2340
|
||||||
|
|||||||
@@ -210,6 +210,11 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
|
|||||||
cacheData["screenshots"] = dExt.cacheStepData.screenShots
|
cacheData["screenshots"] = dExt.cacheStepData.screenShots
|
||||||
cacheData["screenshots_urls"] = dExt.cacheStepData.screenShotsUrls
|
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{})
|
screenResults := make(map[string]interface{})
|
||||||
for imagePath, screenResult := range dExt.cacheStepData.screenResults {
|
for imagePath, screenResult := range dExt.cacheStepData.screenResults {
|
||||||
o, _ := json.Marshal(screenResult.Texts)
|
o, _ := json.Marshal(screenResult.Texts)
|
||||||
@@ -217,6 +222,10 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
|
|||||||
"tags": screenResult.Tags,
|
"tags": screenResult.Tags,
|
||||||
"texts": string(o),
|
"texts": string(o),
|
||||||
"popularity": screenResult.Popularity,
|
"popularity": screenResult.Popularity,
|
||||||
|
"resolution": map[string]int{
|
||||||
|
"width": screenSize.Width,
|
||||||
|
"height": screenSize.Height,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
screenResults[imagePath] = data
|
screenResults[imagePath] = data
|
||||||
|
|||||||
Reference in New Issue
Block a user