GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-25 01:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: adb wm size may contain both Physical and Override size

Browse Source
This commit is contained in:
lilong.129
2023-06-01 21:47:12 +08:00
parent ac2ccc2c79
commit 11b96d0728
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hrp/pkg/uixt/android_adb_driver.go
View File

@@ -57,17 +57,29 @@ func (ad *adbDriver) BatteryInfo() (batteryInfo BatteryInfo, err error) {
func (ad *adbDriver) WindowSize() (size Size, err error) { func (ad *adbDriver) WindowSize() (size Size, err error) {
// adb shell wm size // adb shell wm size
resp, err := ad.adbClient.RunShellCommand("wm", "size") output, err := ad.adbClient.RunShellCommand("wm", "size")
if err != nil { if err != nil {
return size, errors.Wrap(err, "get window size failed with adb") return size, errors.Wrap(err, "get window size failed with adb")
} }
// output may contain both Physical and Override size
// Physical size: 1080x2340 // Physical size: 1080x2340
s := strings.Trim(strings.Split(resp, ": ")[1], "\n") // Override size: 1080x2220
ss := strings.Split(s, "x") var resolution string
width, _ := strconv.Atoi(ss[0]) sizeList := strings.Split(output, "\n")
height, _ := strconv.Atoi(ss[1]) log.Info().Msgf("window size: %v", sizeList)
size = Size{Width: width, Height: height} for _, size := range sizeList {
if strings.Contains(size, "Physical") {
resolution = strings.Split(size, ": ")[1]
// 1080x2340
ss := strings.Split(resolution, "x")
width, _ := strconv.Atoi(ss[0])
height, _ := strconv.Atoi(ss[1])
return Size{Width: width, Height: height}, nil
}
}
err = errors.New("physical window size not found by adb")
return return
} }