From 3530036e4e06a5d4f1255786f6c8f4fcaad3b65a Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Tue, 29 Aug 2023 14:47:49 +0800
Subject: [PATCH] change: screen result resolution

---
 hrp/pkg/uixt/ext.go           | 36 +++--------------------------------
 hrp/pkg/uixt/service_vedem.go |  1 +
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go
index a7d93797..c5524e36 100644
--- a/hrp/pkg/uixt/ext.go
+++ b/hrp/pkg/uixt/ext.go
@@ -2,7 +2,6 @@ package uixt
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"image"
 	"image/gif"
@@ -56,6 +55,7 @@ type ScreenResult struct {
 	imagePath   string        // image file path
 	imageResult *ImageResult  // image result
 
+	Resolution  Size        `json:"resolution"`
 	UploadedURL string      `json:"uploaded_url"`         // uploaded image url
 	Texts       OCRTexts    `json:"texts"`                // dumped raw OCRTexts
 	Icons       UIResultMap `json:"icons"`                // CV 识别的图标
@@ -177,7 +177,7 @@ func newDriverExt(device Device, driver WebDriver, plugin funplugin.IPlugin) (dE
 	// get device window size
 	dExt.windowSize, err = dExt.Driver.WindowSize()
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "get screen resolution failed")
 	}
 
 	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()
 	dExt.cacheStepData.screenResults.updatePopupCloseStatus()
-
-	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
+	cacheData["screen_results"] = dExt.cacheStepData.screenResults
 
 	// clear cache
 	dExt.cacheStepData.reset()
diff --git a/hrp/pkg/uixt/service_vedem.go b/hrp/pkg/uixt/service_vedem.go
index 099cd9cd..1f539ac1 100644
--- a/hrp/pkg/uixt/service_vedem.go
+++ b/hrp/pkg/uixt/service_vedem.go
@@ -373,6 +373,7 @@ func (dExt *DriverExt) GetScreenResult(options ...ActionOption) (screenResult *S
 		bufSource:             bufSource,
 		imagePath:             imagePath,
 		Tags:                  nil,
+		Resolution:            dExt.windowSize,
 		ScreenshotTakeElapsed: screenshotTakeElapsed,
 	}