fix #941, add more to .info

XPATH.md

@@ -146,6 +146,29 @@ el.screenshot()
 # 控件滑动
 el.swipe("right") # left, right, up, down
 el.swipe("right", scale=0.9) # scale默认0.9, 意思是滑动距离为控件宽度的90%, 上滑则为高度的90%
+
+print(el.info)
+# output example
+{'index': '0',
+ 'text': '',
+ 'resourceId': 'com.example:id/home_searchedit',
+ 'checkable': 'true',
+ 'checked': 'true',
+ 'clickable': 'true',
+ 'enabled': 'true',
+ 'focusable': 'false',
+ 'focused': 'false',
+ 'scrollable': 'false',
+ 'longClickable': 'false',
+ 'password': 'false',
+ 'selected': 'false',
+ 'visibleToUser': 'true',
+ 'childCount': 0,
+ 'className': 'android.widget.Switch',
+ 'bounds': {'left': 882, 'top': 279, 'right': 1026, 'bottom': 423},
+ 'packageName': 'com.android.settings',
+ 'contentDescription': '',
+ 'resourceName': 'android:id/switch_widget'}
 ```
 
 ### 滑动到指定位置

uiautomator2/xpath.py

@@ -23,11 +23,11 @@
 
 logger = logging.getLogger(__name__)
 
-def safe_xmlstr(s):
+def safe_xmlstr(s: str) -> str:
     return s.replace("$", "-")
 
 
-def string_quote(s):
+def string_quote(s: str) -> str:
     """quick way to quote string"""
     return "{!r}".format(s)
 
@@ -46,11 +46,24 @@ def is_xpath_syntax_ok(xpath_expression: str) -> bool:
         return False  # Indicates a syntax error in the XPath expression
 
 
+def convert_to_camel_case(s: str) -> str:
+    """
+    Convert a string from kebab-case to camelCase.
+
+    :param s: A string in kebab-case format.
+    :return: A string converted to camelCase format.
+    """
+    parts = s.split('-')
+    # Convert the first letter of each part to uppercase, except for the first part
+    camel_case_str = parts[0] + ''.join(part.capitalize() for part in parts[1:])
+    return camel_case_str
+
+
 def strict_xpath(xpath: str) -> str:
     """make xpath to be computer recognized xpath"""
     orig_xpath = xpath
 
-    if xpath.startswith("/"):
+    if xpath.startswith("/") or xpath.startswith("(/"):
         pass
     elif xpath.startswith("@"):
         xpath = "//*[@resource-id={!r}]".format(xpath[1:])
@@ -757,25 +770,18 @@ def attrib(self):
     @property
     def info(self) -> Dict[str, Any]:
         ret = {}
-        for key in (
-            "text",
-            "focusable",
-            "enabled",
-            "focused",
-            "scrollable",
-            "selected",
-            "clickable",
-        ):
-            ret[key] = self.attrib.get(key)
+        for k, v in dict(self.attrib).items():
+            if k in ("bounds", "class", "package", "content-desc", "NAF"):
+                continue
+            ret[convert_to_camel_case(k)] = v
+
+        ret["childCount"] = len(self.elem.getchildren())
         ret["className"] = self.elem.tag
         lx, ly, rx, ry = self.bounds
         ret["bounds"] = {"left": lx, "top": ly, "right": rx, "bottom": ry}
-        ret["contentDescription"] = self.attrib.get("content-desc")
-        ret["longClickable"] = self.attrib.get("long-clickable")
+
+        # 名字命名的有点奇怪，为了兼容性暂时保留
         ret["packageName"] = self.attrib.get("package")
+        ret["contentDescription"] = self.attrib.get("content-desc")
         ret["resourceName"] = self.attrib.get("resource-id")
-        ret["resourceId"] = self.attrib.get(
-            "resource-id"
-        )  # this is better than resourceName
-        ret["childCount"] = len(self.elem.getchildren())
         return ret