fix clear_text not working on some device

Author: codeskyblue

.gitignore

@@ -114,3 +114,4 @@ docs/*.rst
 
 .DS_Store
 *.lock
+junit.xml

uiautomator2/__init__.py

@@ -410,31 +410,22 @@ def set_clipboard(self, text, label=None):
 
     def clear_text(self):
         """ clear input text """
-        try:
-            # 这个问题基本不大
-            # 不过考虑到u2.jar不一定升级成功了，所以还有留个兜底方案·
-            self.jsonrpc.clearInputText()
-        except:
-            self._clear_text_with_ime()
+        self.jsonrpc.clearInputText()
 
-    def send_keys(self, text: str, clear: bool = False):
+    def send_keys(self, text: str):
         """
         send text to focused input area
         
         Args:
             text: input text
             clear: clear text before input
         """
-        if clear:
-            self.clear_text()
-        try:
-            # setClipboard的兼容性并不是特别好，但是这样做有个优点就是不用装输入法了。
-            self.clipboard = text
-            if self.clipboard != text:
-                raise UiAutomationError("setClipboard failed")
-            self.jsonrpc.pasteClipboard()
-        except:
-            self._send_keys_with_ime(text)
+        # 使用el =self(focused=True); el.set_text(el.get_text()+text)不可取
+        # 因为placeholder中的文字也会加进去
+        self.clipboard = text
+        if self.clipboard != text:
+            raise UiAutomationError("setClipboard failed")
+        self.jsonrpc.pasteClipboard()
 
     def keyevent(self, v):
         """
@@ -869,7 +860,32 @@ def swipe_ext(self) -> SwipeExt:
 
 class Device(_Device, _AppMixIn, _PluginMixIn, InputMethodMixIn, _DeprecatedMixIn):
     """ Device object """
-    pass
+    
+    def clear_text(self):
+        """ clear input text """
+        if self.is_input_ime_installed():
+            InputMethodMixIn.clear_text(self)
+        else:
+            _Device.clear_text(self)
+    
+    def send_keys(self, text: str, clear: bool = False):
+        """
+        send text to focused input area
+        
+        Args:
+            text: input text
+            clear: clear text before input
+        """
+        if clear:
+            self.clear_text()    
+        if self.is_input_ime_installed():
+            InputMethodMixIn.send_keys(self, text)
+            return
+        try:
+            _Device.send_keys(self, text)            
+        except:
+            # 安装输入法后继续输入
+            InputMethodMixIn.send_keys(self, text)
 
 
 class Session(Device):

uiautomator2/_input.py

@@ -106,7 +106,7 @@ def _must_broadcast(self, action: str, extras: Dict[str, str] = {}):
         if result.code != BORADCAST_RESULT_OK:
             raise AdbBroadcastError(f"broadcast {action} failed: {result.data}")
 
-    def _send_keys_with_ime(self, text: str):
+    def send_keys(self, text: str):
         try:
             self.set_input_ime()
             btext = text.encode('utf-8')
@@ -149,17 +149,9 @@ def send_action(self, code: Union[str, int] = None):
         else:
             self._must_broadcast('ADB_KEYBOARD_SMART_ENTER')
 
-    def _clear_text_with_ime(self):
-        """ clear text
-        Raises:
-            EnvironmentError
-        """
-        try:
-            self.set_input_ime(True)
-            self._must_broadcast('ADB_KEYBOARD_CLEAR_TEXT')
-        except AdbBroadcastError:
-            # for Android simulator
-            self(focused=True).clear_text()
+    def clear_text(self):
+        self.set_input_ime(True)
+        self._must_broadcast('ADB_KEYBOARD_CLEAR_TEXT')
 
     def current_ime(self) -> str:
         """ Current input method