GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-10 06:51:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: screen result resolution

Browse Source
This commit is contained in:
lilong.129
2023-08-29 14:47:49 +08:00
parent bd9c761a97
commit 3530036e4e
2 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ package uixt
import ( import (
"bytes" "bytes"
"encoding/json"
"fmt" "fmt"
"image" "image"
"image/gif" "image/gif"
@@ -56,6 +55,7 @@ type ScreenResult struct {
imagePath string // image file path imagePath string // image file path
imageResult *ImageResult // image result imageResult *ImageResult // image result
Resolution Size `json:"resolution"`
UploadedURL string `json:"uploaded_url"` // uploaded image url UploadedURL string `json:"uploaded_url"` // uploaded image url
Texts OCRTexts `json:"texts"` // dumped raw OCRTexts Texts OCRTexts `json:"texts"` // dumped raw OCRTexts
Icons UIResultMap `json:"icons"` // CV 识别的图标 Icons UIResultMap `json:"icons"` // CV 识别的图标
@@ -177,7 +177,7 @@ func newDriverExt(device Device, driver WebDriver, plugin funplugin.IPlugin) (dE
// get device window size // get device window size
dExt.windowSize, err = dExt.Driver.WindowSize() dExt.windowSize, err = dExt.Driver.WindowSize()
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "get screen resolution failed")
} }
if dExt.ImageService, err = newVEDEMImageService(); err != nil { if dExt.ImageService, err = newVEDEMImageService(); err != nil {
@@ -276,37 +276,7 @@ func (dExt *DriverExt) GetStepCacheData() map[string]interface{} {
cacheData["screenshots_urls"] = dExt.cacheStepData.screenResults.getScreenShotUrls() cacheData["screenshots_urls"] = dExt.cacheStepData.screenResults.getScreenShotUrls()
dExt.cacheStepData.screenResults.updatePopupCloseStatus() dExt.cacheStepData.screenResults.updatePopupCloseStatus()
cacheData["screen_results"] = dExt.cacheStepData.screenResults
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 dateTime, screenResult := range dExt.cacheStepData.screenResults {
o, _ := json.Marshal(screenResult.Texts)
data := map[string]interface{}{
"tags": screenResult.Tags,
"texts": string(o),
"resolution": map[string]int{
"width": screenSize.Width,
"height": screenSize.Height,
},
"video_type": screenResult.VideoType,
"feed": screenResult.Feed,
"live": screenResult.Live,
"swipe_start_time": screenResult.SwipeStartTime,
"swipe_finish_time": screenResult.SwipeFinishTime,
"screenshot_take_elapsed": screenResult.ScreenshotTakeElapsed,
"screenshot_cv_elapsed": screenResult.ScreenshotCVElapsed,
"total_elapsed": screenResult.TotalElapsed,
"icons": screenResult.Icons,
"popup": screenResult.Popup,
}
screenResults[dateTime] = data
}
cacheData["screen_results"] = screenResults
// clear cache // clear cache
dExt.cacheStepData.reset() dExt.cacheStepData.reset()

1
hrp/pkg/uixt/service_vedem.go
View File

@@ -373,6 +373,7 @@ func (dExt *DriverExt) GetScreenResult(options ...ActionOption) (screenResult *S
bufSource: bufSource, bufSource: bufSource,
imagePath: imagePath, imagePath: imagePath,
Tags: nil, Tags: nil,
Resolution: dExt.windowSize,
ScreenshotTakeElapsed: screenshotTakeElapsed, ScreenshotTakeElapsed: screenshotTakeElapsed,
} }