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

Merge branch 'fix/buyuxiang/actionOptions' into 'video-release'

Browse Source 
fix: updateData isReplace -> replace

See merge request iesqa/httprunner!19
This commit is contained in:
卜雨翔
2023-11-30 11:30:26 +00:00
parent 9f82180364 95fa434d2c
commit 3030b19579
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v4.3.6.2310201510 v4.3.6.2311301910

4
hrp/pkg/uixt/action.go
View File

@@ -300,8 +300,8 @@ func (o *ActionOptions) updateData(data map[string]interface{}) {
data["frequency"] = 60 // default frequency data["frequency"] = 60 // default frequency
} }
if _, ok := data["isReplace"]; !ok { if _, ok := data["replace"]; !ok {
data["isReplace"] = true // default true data["replace"] = true // default true
} }
// custom options // custom options

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

@@ -340,21 +340,30 @@ func (ad *adbDriver) IsAdbKeyBoardInstalled() bool {
func (ad *adbDriver) SendKeysByAdbKeyBoard(text string) (err error) { func (ad *adbDriver) SendKeysByAdbKeyBoard(text string) (err error) {
defer func() { defer func() {
// Reset to default, don't care which keyboard was chosen before switch: // Reset to default, don't care which keyboard was chosen before switch:
_, err = ad.adbClient.RunShellCommand("ime", "reset") if _, resetErr := ad.adbClient.RunShellCommand("ime", "reset"); resetErr != nil {
log.Error().Err(err).Msg("failed to reset ime")
}
}() }()
// Enable ADBKeyBoard from adb // Enable ADBKeyBoard from adb
if _, err = ad.adbClient.RunShellCommand("ime", "enable", AdbKeyBoardPackageName); err != nil { if _, err = ad.adbClient.RunShellCommand("ime", "enable", AdbKeyBoardPackageName); err != nil {
log.Error().Err(err).Msg("failed to enable adbKeyBoard")
return return
} }
// Switch to ADBKeyBoard from adb // Switch to ADBKeyBoard from adb
if _, err = ad.adbClient.RunShellCommand("ime", "set", AdbKeyBoardPackageName); err != nil { if _, err = ad.adbClient.RunShellCommand("ime", "set", AdbKeyBoardPackageName); err != nil {
log.Error().Err(err).Msg("failed to set adbKeyBoard")
return return
} }
time.Sleep(time.Second) time.Sleep(time.Second)
// input Quoted text // input Quoted text
text = strings.ReplaceAll(text, " ", "\\ ") text = strings.ReplaceAll(text, " ", "\\ ")
if _, err = ad.adbClient.RunShellCommand("am", "broadcast", "-a", "ADB_INPUT_TEXT", "--es", "msg", text); err != nil { if _, err = ad.adbClient.RunShellCommand("am", "broadcast", "-a", "ADB_INPUT_TEXT", "--es", "msg", text); err != nil {
log.Error().Err(err).Msg("failed to input by adbKeyBoard")
return
}
if _, err = ad.adbClient.RunShellCommand("input", "keyevent", fmt.Sprintf("%d", KCEnter)); err != nil {
log.Error().Err(err).Msg("failed to input keyevent enter")
return return
} }
time.Sleep(time.Second) time.Sleep(time.Second)