GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-02 22:39:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: driver ScreenShot

Browse Source
This commit is contained in:
lilong.129
2025-02-11 18:13:49 +08:00
parent 792d3ae9bc
commit cf1f553489
8 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/uixt/android_driver_adb.go
View File

@@ -520,13 +520,26 @@ func (ad *ADBDriver) SetRotation(rotation types.Rotation) (err error) {
return
}
func (ad *ADBDriver) ScreenShot() (raw *bytes.Buffer, err error) {
func (ad *ADBDriver) ScreenShot(opts ...option.ActionOption) (raw *bytes.Buffer, err error) {
resp, err := ad.runShellCommand("screencap", "-p")
if err != nil {
return nil, errors.Wrap(err, "adb screencap failed")
return nil, errors.Wrapf(code.DeviceScreenShotError,
"adb screencap failed %v", err)
}
raw = bytes.NewBuffer([]byte(resp))
actionOptions := option.NewActionOptions(opts...)
if actionOptions.ScreenShotFileName != "" {
// save screenshot to file
path, err := saveScreenShot(raw, actionOptions.ScreenShotFileName)
if err != nil {
return nil, errors.Wrapf(code.DeviceScreenShotError,
"save screenshot file failed %v", err)
}
log.Info().Str("path", path).Msg("screenshot saved")
}
return bytes.NewBuffer([]byte(resp)), nil
return raw, nil
}
func (ad *ADBDriver) Source(srcOpt ...option.SourceOption) (source string, err error) {