From a24e1ff251d233f13ea0a1b63c03a522524755d4 Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Thu, 1 Jun 2023 17:42:40 +0800
Subject: [PATCH] feat: add screen resolution in screen results

---
 hrp/pkg/uixt/android_adb_driver.go | 2 +-
 hrp/pkg/uixt/ext.go                | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go
index 650aa9b8..9ab9a7cb 100644
--- a/hrp/pkg/uixt/android_adb_driver.go
+++ b/hrp/pkg/uixt/android_adb_driver.go
@@ -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
diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go
index 4b38d701..782e4ec4 100644
--- a/hrp/pkg/uixt/ext.go
+++ b/hrp/pkg/uixt/ext.go
@@ -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