diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 96a9a9b4..0c444e75 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.6.2310201510 +v4.3.6.2311301910 \ No newline at end of file diff --git a/hrp/pkg/uixt/action.go b/hrp/pkg/uixt/action.go index 59e903b8..c15b4406 100644 --- a/hrp/pkg/uixt/action.go +++ b/hrp/pkg/uixt/action.go @@ -300,8 +300,8 @@ func (o *ActionOptions) updateData(data map[string]interface{}) { data["frequency"] = 60 // default frequency } - if _, ok := data["isReplace"]; !ok { - data["isReplace"] = true // default true + if _, ok := data["replace"]; !ok { + data["replace"] = true // default true } // custom options diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go index 64b4d94e..e44b0745 100644 --- a/hrp/pkg/uixt/android_adb_driver.go +++ b/hrp/pkg/uixt/android_adb_driver.go @@ -340,21 +340,30 @@ func (ad *adbDriver) IsAdbKeyBoardInstalled() bool { func (ad *adbDriver) SendKeysByAdbKeyBoard(text string) (err error) { defer func() { // 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 if _, err = ad.adbClient.RunShellCommand("ime", "enable", AdbKeyBoardPackageName); err != nil { + log.Error().Err(err).Msg("failed to enable adbKeyBoard") return } // Switch to ADBKeyBoard from adb if _, err = ad.adbClient.RunShellCommand("ime", "set", AdbKeyBoardPackageName); err != nil { + log.Error().Err(err).Msg("failed to set adbKeyBoard") return } time.Sleep(time.Second) // input Quoted text text = strings.ReplaceAll(text, " ", "\\ ") 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 } time.Sleep(time.Second)