From c05538a82607da612aaa46c1cc6ac42e40448fa5 Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Fri, 28 Jul 2023 13:43:05 +0800
Subject: [PATCH] fix: use Override size if existed, otherwise use Physical
 size

---
 hrp/pkg/uixt/android_adb_driver.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go
index 8f5029ab..ed91b407 100644
--- a/hrp/pkg/uixt/android_adb_driver.go
+++ b/hrp/pkg/uixt/android_adb_driver.go
@@ -62,14 +62,20 @@ func (ad *adbDriver) WindowSize() (size Size, err error) {
 		return size, errors.Wrap(err, "get window size failed with adb")
 	}
 
-	// output may contain both Physical and Override size
+	// output may contain both Physical and Override size, use Override if existed
 	// Physical size: 1080x2340
 	// Override size: 1080x2220
+
+	matchedSizeType := "Physical"
+	if strings.Contains(output, "Override") {
+		matchedSizeType = "Override"
+	}
+
 	var resolution string
 	sizeList := strings.Split(output, "\n")
 	log.Info().Msgf("window size: %v", sizeList)
 	for _, size := range sizeList {
-		if strings.Contains(size, "Physical") {
+		if strings.Contains(size, matchedSizeType) {
 			resolution = strings.Split(size, ": ")[1]
 			// 1080x2340
 			ss := strings.Split(resolution, "x")
@@ -392,6 +398,7 @@ func (ad *adbDriver) StopCaptureLog() (result interface{}, err error) {
 		return "", err
 	}
 	content := ad.logcat.logBuffer.String()
+	log.Info().Str("logcat content", content).Msg("display logcat content")
 	return ConvertPoints(content), nil
 }