fix: litter change

Author: codematrixer

README.md

@@ -363,7 +363,7 @@ d.swipe(0.5, 0.8, 0.5, 0.4, speed=2000)
 
 #### 输入
 ```python
-d.input_text(x, y, text)
+d.input_text(text)
 
 # eg.
 d.input_text(0.3, 0.5, "adbcdfg")

example.py

@@ -52,7 +52,7 @@
 d.long_click(500, 1000)
 d.long_click(0.5, 0.4)
 d.swipe(0.5, 0.8, 0.5, 0.4, speed=2000)
-d.input_text(0.5, 0.5, "adbcdfg")
+d.input_text("adbcdfg")
 
 # Device touch gersture
 d.gesture.start(630, 984, interval=.5).move(0.2, 0.4, interval=.5).pause(interval=1).move(0.5, 0.6, interval=.5).pause(interval=1).action()

hmdriver2/_client.py

@@ -13,11 +13,11 @@
 from . import logger
 from .hdc import HdcWrapper
 from .proto import HypiumResponse, DriverData
-from .exception import InvokeHypiumError
+from .exception import InvokeHypiumError, InvokeCaptures
 
 
 UITEST_SERVICE_PORT = 8012
-SOCKET_TIMEOUT = 30
+SOCKET_TIMEOUT = 10
 
 
 class HmClient:
@@ -63,43 +63,27 @@ def _send_msg(self, msg: typing.Dict):
         logger.debug(f"sendMsg: {msg}")
         self.sock.sendall(msg.encode('utf-8') + b'\n')
 
-    def _recv_msg(self, buff_size: int = 1024, decode=False, print=True) -> typing.Union[bytearray, str]:
+    def _recv_msg(self, buff_size: int = 4096, decode=False, print=True) -> typing.Union[bytearray, str]:
+        full_msg = bytearray()
         try:
-            full_message = bytearray()
-            while True:
-                relay = self.sock.recv(buff_size)
-                if not relay:
-                    break
-
-                full_message.extend(relay)
-
-                if decode:
-                    try:
-                        decoded_message = full_message.decode()
-                        # Validate if it's a complete JSON
-                        json.loads(decoded_message)
-                        if print:
-                            logger.debug(f"recvMsg (complete JSON): {decoded_message}")
-                        return decoded_message
-                    except (UnicodeDecodeError, json.JSONDecodeError):
-                        # Incomplete JSON, continue receiving
-                        continue
-                else:
-                    if print:
-                        logger.debug(f"recvMsg (partial): {full_message}")
-
-            # If decode is False, return the full message as bytearray
-            return full_message
+            # FIXME
+            relay = self.sock.recv(buff_size)
+            if decode:
+                relay = relay.decode()
+            if print:
+                logger.debug(f"recvMsg: {relay}")
+            full_msg = relay
 
         except (socket.timeout, UnicodeDecodeError) as e:
             logger.warning(e)
             if decode:
-                return ''
-            return bytearray()
+                full_msg = ""
+
+        return full_msg
 
-    def invoke(self, api: str, this: str = "Driver#0", args: typing.List = [], method: str = None) -> HypiumResponse:
+    def invoke(self, api: str, this: str = "Driver#0", args: typing.List = []) -> HypiumResponse:
         """
-        Invokes a given API method with the specified arguments and handles exceptions.
+        Hypium invokes given API method with the specified arguments and handles exceptions.
 
         Args:
         api (str): The name of the API method to invoke.
@@ -113,25 +97,16 @@ def invoke(self, api: str, this: str = "Driver#0", args: typing.List = [], metho
         """
 
         request_id = datetime.now().strftime("%Y%m%d%H%M%S%f")
-
-        if method is None:
-            # When method is None, include 'this' in params
-            params = {
-                "api": api,
-                "this": this,
-                "args": args,
-                "message_type": "hypium"
-            }
-        else:
-            # When method is specified, 'this' is not needed in params
-            params = {
-                "api": api,
-                "args": args
-            }
+        params = {
+            "api": api,
+            "this": this,
+            "args": args,
+            "message_type": "hypium"
+        }
 
         msg = {
             "module": "com.ohos.devicetest.hypiumApiHelper",
-            "method": method if method else "callHypiumApi",
+            "method": "callHypiumApi",
             "params": params,
             "request_id": request_id
         }
@@ -143,6 +118,27 @@ def invoke(self, api: str, this: str = "Driver#0", args: typing.List = [], metho
             raise InvokeHypiumError(data.exception)
         return data
 
+    def invoke_captures(self, api: str, args: typing.List = []) -> HypiumResponse:
+        request_id = datetime.now().strftime("%Y%m%d%H%M%S%f")
+        params = {
+            "api": api,
+            "args": args
+        }
+
+        msg = {
+            "module": "com.ohos.devicetest.hypiumApiHelper",
+            "method": "Captures",
+            "params": params,
+            "request_id": request_id
+        }
+
+        self._send_msg(msg)
+        raw_data = self._recv_msg(decode=True)
+        data = HypiumResponse(**(json.loads(raw_data)))
+        if data.exception:
+            raise InvokeCaptures(data.exception)
+        return data
+
     def start(self):
         logger.info("Start HmClient connection")
         self._init_so_resource()

hmdriver2/_screenrecord.py

@@ -121,7 +121,7 @@ def stop(self) -> str:
             self.release()
 
             # Invalidate the cached property
-            self.driver.invalidate_cache('screenrecord')
+            self.driver._invalidate_cache('screenrecord')
 
         except Exception as e:
             logger.error(f"An error occurred: {e}")

hmdriver2/driver.py

@@ -50,8 +50,8 @@ def _is_device_online(self):
         _serials = list_devices()
         return True if self.serial in _serials else False
 
-    def _invoke(self, api: str, args: List = [], method: str = None) -> HypiumResponse:
-        return self._client.invoke(api, this="Driver#0", args=args, method=method)
+    def _invoke(self, api: str, args: List = []) -> HypiumResponse:
+        return self._client.invoke(api, this="Driver#0", args=args)
 
     @delay
     def start_app(self, package_name: str, page_name: str = "MainAbility"):
@@ -177,8 +177,8 @@ def device_info(self) -> DeviceInfo:
         )
 
     @delay
-    def open_url(self, url: str, system_browser: bool = None):
-        if system_browser is True:
+    def open_url(self, url: str, system_browser: bool = True):
+        if system_browser:
             # Use the system browser
             self.hdc.shell(f"aa start -A ohos.want.action.viewData -e entity.system.browsable -U {url}")
         else:
@@ -291,22 +291,26 @@ def swipe(self, x1, y1, x2, y2, speed=2000):
         self._invoke(api, args=[point1.x, point1.y, point2.x, point2.y, speed])
 
     @delay
-    def input_text(self, x: int = 1, y: int = 1, text: str = ""):
-        """
-            input_text(100, 100, text="测试")
-            input_text(text="测试")
+    def input_text(self, text: str):
         """
+        Inputs text into the currently focused input field.
+
+        Note: The input field must have focus before calling this method.
 
-        return self._invoke("Driver.inputText", args=[{"x": x, "y": y}, text])
+        Args:
+            text (str): input value
+        """
+        return self._invoke("Driver.inputText", args=[{"x": 1, "y": 1}, text])
 
-    def dump_hierarchy(self) -> HypiumResponse:
+    def dump_hierarchy(self) -> Dict:
         """
         Dump the UI hierarchy of the device screen.
 
         Returns:
             Dict: The dumped UI hierarchy as a dictionary.
         """
-        return self._invoke("captureLayout", method="Captures")
+        # return self._client.invoke_captures("captureLayout").result
+        return self.hdc.dump_hierarchy()
 
     @cached_property
     def gesture(self):
@@ -318,7 +322,7 @@ def screenrecord(self):
         from ._screenrecord import RecordClient
         return RecordClient(self.serial, self)
 
-    def invalidate_cache(self, attribute_name):
+    def _invalidate_cache(self, attribute_name):
         """
         Invalidate the cached property.
 

hmdriver2/exception.py

@@ -24,6 +24,10 @@ class InvokeHypiumError(Exception):
     pass
 
 
+class InvokeCaptures(Exception):
+    pass
+
+
 class InjectGestureError(Exception):
     pass
 

tests/test_driver.py

@@ -145,7 +145,7 @@ def test_swipe(d):
 
 
 def test_input_text(d):
-    d.input_text(0.5, 0.5, "adbcdfg")
+    d.input_text("adbcdfg")
 
 
 def test_dump_hierarchy(d):