Fix: ime not shown when enter input mode

LmeSzinc · May 24, 2024 · 86044c5 · 86044c5
1 parent affc053
commit 86044c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/module/device/input.py b/module/device/input.py
@@ -3,6 +3,10 @@
 
 
 class Input(Uiautomator2):
+    def ime_shown(self) -> bool:
+        _, shown = self.u2_current_ime()
+        return shown
+
     def text_input_and_confirm(self, text: str, clear: bool=False):
         for fail_count in range(3):
             try:

diff --git a/module/device/method/uiautomator_2.py b/module/device/method/uiautomator_2.py
@@ -328,6 +328,9 @@ def u2_shell_background(self, cmdline, timeout=10) -> ShellBackgroundResponse:
     def u2_set_fastinput_ime(self, enable: bool):
         self.u2.set_fastinput_ime(enable)
 
+    def u2_current_ime(self):
+        return self.u2.current_ime()
+
     def u2_send_keys(self, text: str, clear: bool=False):
         self.u2.send_keys(text=text, clear=clear)
 

diff --git a/module/equipment/equipment_code.py b/module/equipment/equipment_code.py
@@ -171,7 +171,7 @@ def enter_equip_code_input_mode(self, skip_first_screenshot=True):
                 continue
 
             # End
-            if not self.appear(EQUIPMENT_CODE_ENTER):
+            if self.device.ime_shown():
                 break
 
     def confirm_equip_code(self, skip_first_screenshot=False):