GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-12 03:09:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: unload android device screen

Browse Source
This commit is contained in:
lilong.129
2024-12-19 12:12:22 +08:00
parent b1eda1abc1
commit 75f3853b79
3 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,7 +279,18 @@ func (ad *adbDriver) Homescreen() (err error) {
}
func (ad *adbDriver) Unlock() (err error) {
return ad.PressKeyCodes(KCMenu, KMEmpty)
// Notice: brighten should be executed before unlock
// brighten android device screen
if err := ad.PressKeyCodes(KCWakeup, KMEmpty); err != nil {
log.Error().Err(err).Msg("brighten android device screen failed")
}
// unlock android device screen
if err := ad.PressKeyCodes(KCMenu, KMEmpty); err != nil {
log.Error().Err(err).Msg("press menu key to unlock screen failed")
}
// swipe up to unlock
return ad.Swipe(500, 1500, 500, 500)
}
func (ad *adbDriver) Backspace(count int, options ...ActionOption) (err error) {
@@ -287,12 +298,12 @@ func (ad *adbDriver) Backspace(count int, options ...ActionOption) (err error) {
return nil
}
if count == 1 {
return ad.PressKeyCode(67)
return ad.PressKeyCode(KCDel)
}
keyArray := make([]KeyCode, count)
for i := range keyArray {
keyArray[i] = KeyCode(67)
keyArray[i] = KCDel
}
return ad.combinationKey(keyArray)
}
@@ -315,9 +326,18 @@ func (ad *adbDriver) PressKeyCode(keyCode KeyCode) (err error) {
}
func (ad *adbDriver) PressKeyCodes(keyCode KeyCode, metaState KeyMeta) (err error) {
// adb shell input keyevent <keyCode>
_, err = ad.runShellCommand(
"input", "keyevent", fmt.Sprintf("%d", keyCode))
// adb shell input keyevent [--longpress] KEYCODE [METASTATE]
if metaState != KMEmpty {
// press key with metastate, e.g. KMShiftOn/KMCtrlOn
_, err = ad.runShellCommand(
"input", "keyevent", "--longpress",
fmt.Sprintf("%d", keyCode),
fmt.Sprintf("%d", metaState))
} else {
_, err = ad.runShellCommand(
"input", "keyevent",
fmt.Sprintf("%d", keyCode))
}
return
}