hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use seq for translate mode and use commitText

Browse Source
This commit is contained in:
mcfans 2023-10-24 13:34:52 +08:00
parent d900f2c47c
commit dd33c0e582
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/InputService.kt
View File

@ -21,10 +21,12 @@ import android.accessibilityservice.AccessibilityServiceInfo
import android.accessibilityservice.AccessibilityServiceInfo.FLAG_INPUT_METHOD_EDITOR import android.accessibilityservice.AccessibilityServiceInfo.FLAG_INPUT_METHOD_EDITOR
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import java.util.* import java.util.*
import java.lang.Character
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.max import kotlin.math.max
import hbb.MessageOuterClass.KeyEvent; import hbb.MessageOuterClass.KeyEvent
import hbb.KeyEventConverter; import hbb.MessageOuterClass.KeyboardMode
import hbb.KeyEventConverter
const val LIFT_DOWN = 9 const val LIFT_DOWN = 9
const val LIFT_MOVE = 8 const val LIFT_MOVE = 8
@ -265,12 +267,39 @@ class InputService : AccessibilityService() {
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
fun onKeyEvent(data: ByteArray) { fun onKeyEvent(data: ByteArray) {
val keyEvent = KeyEvent.parseFrom(data); val keyEvent = KeyEvent.parseFrom(data)
val down = keyEvent.getDown()
val keyboardMode = keyEvent.getMode()
var textToCommit: String? = null
if (keyboardMode == KeyboardMode.Legacy) {
if (keyEvent.hasChr() && keyEvent.getDown()) {
val chr = keyEvent.getChr()
if (chr != null) {
textToCommit = String(Character.toChars(chr))
}
}
} else if (keyboardMode == KeyboardMode.Translate) {
if (keyEvent.hasSeq() && keyEvent.getDown()) {
val seq = keyEvent.getSeq()
if (seq != null) {
textToCommit = seq
}
}
}
if (Build.VERSION.SDK_INT >= 33) { if (Build.VERSION.SDK_INT >= 33) {
getInputMethod()?.let { inputMethod -> getInputMethod()?.let { inputMethod ->
inputMethod.getCurrentInputConnection()?.let { inputConnection -> inputMethod.getCurrentInputConnection()?.let { inputConnection ->
KeyEventConverter.toAndroidKeyEvent(keyEvent).let { event -> if (textToCommit != null) {
inputConnection.sendKeyEvent(event) textToCommit?.let { text ->
inputConnection.commitText(text, 1, null)
}
} else {
KeyEventConverter.toAndroidKeyEvent(keyEvent).let { event ->
inputConnection.sendKeyEvent(event)
}
} }
} }
} }
@ -296,26 +325,24 @@ class InputService : AccessibilityService() {
} }
} }
if (keyEvent.hasSeq()) { if (textToCommit != null) {
val seq = keyEvent.getSeq()
var newText = "" var newText = ""
if ((textSelectionStart == -1) || (textSelectionEnd == -1)) { if ((textSelectionStart == -1) || (textSelectionEnd == -1)) {
newText = seq newText = textToCommit
} else { } else if (text != null) {
Log.d(logTag, "text selection start $textSelectionStart $textSelectionEnd")
newText = text.let { newText = text.let {
it.substring(0, textSelectionStart) + seq + it.substring(textSelectionStart) it.substring(0, textSelectionStart) + textToCommit + it.substring(textSelectionStart)
} }
} }
val arguments = Bundle() val arguments = Bundle()
arguments.putCharSequence( arguments.putCharSequence(
AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE,
newText newText
) )
node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, arguments) node.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, arguments)
} else { } else {
KeyEventConverter.toAndroidKeyEvent(keyEvent).let { event -> KeyEventConverter.toAndroidKeyEvent(keyEvent).let { event ->
if (isShowingHint) { if (isShowingHint) {
@ -332,7 +359,6 @@ class InputService : AccessibilityService() {
this.fakeEditTextForTextStateCalculation?.dispatchKeyEvent(event) this.fakeEditTextForTextStateCalculation?.dispatchKeyEvent(event)
this.fakeEditTextForTextStateCalculation?.getText()?.let { newText -> this.fakeEditTextForTextStateCalculation?.getText()?.let { newText ->
Log.d(logTag, "event $event text $text newText $newText")
val arguments = Bundle() val arguments = Bundle()
arguments.putCharSequence( arguments.putCharSequence(
AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE,