mobile-mcp-ai 2.5.8__py3-none-any.whl → 2.5.9__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -53,7 +53,34 @@ class BasicMobileToolsLite:
         }
         self.operation_history.append(record)
     
-    
+    def _get_full_hierarchy(self) -> str:
+        """获取完整的 UI 层级 XML（包含 NAF 元素）
+        
+        优先使用 ADB 直接 dump，比 uiautomator2.dump_hierarchy 更完整
+        """
+        import sys
+        
+        if self._is_ios():
+            # iOS 使用 page_source
+            ios_client = self._get_ios_client()
+            if ios_client and hasattr(ios_client, 'wda'):
+                return ios_client.wda.source()
+            return ""
+        
+        # Android: 优先使用 ADB 直接 dump
+        try:
+            # 方法1: ADB dump（获取最完整的 UI 树，包括 NAF 元素）
+            self.client.u2.shell('uiautomator dump /sdcard/ui_dump.xml')
+            result = self.client.u2.shell('cat /sdcard/ui_dump.xml')
+            if result and isinstance(result, str) and result.strip().startswith('<?xml'):
+                xml_string = result.strip()
+                self.client.u2.shell('rm /sdcard/ui_dump.xml')
+                return xml_string
+        except Exception as e:
+            print(f"  ⚠️  ADB dump 失败: {e}", file=sys.stderr)
+        
+        # 方法2: 回退到 uiautomator2
+        return self.client.u2.dump_hierarchy(compressed=False)
     
     # ==================== 截图 ====================
     
@@ -354,7 +381,7 @@ class BasicMobileToolsLite:
             if show_popup_hints and not self._is_ios():
                 try:
                     import xml.etree.ElementTree as ET
-                    xml_string = self.client.u2.dump_hierarchy(compressed=False)
+                    xml_string = self._get_full_hierarchy()
                     root = ET.fromstring(xml_string)
                     
                     # 检测弹窗区域
@@ -531,7 +558,7 @@ class BasicMobileToolsLite:
             else:
                 try:
                     import xml.etree.ElementTree as ET
-                    xml_string = self.client.u2.dump_hierarchy(compressed=False)
+                    xml_string = self._get_full_hierarchy()
                     root = ET.fromstring(xml_string)
                     
                     for elem in root.iter():
@@ -1087,9 +1114,9 @@ class BasicMobileToolsLite:
             return {"success": False, "message": f"❌ 点击失败: {e}"}
     
     def _find_element_in_tree(self, text: str) -> Optional[Dict]:
-        """在 XML 树中查找包含指定文本的元素"""
+        """在 XML 树中查找包含指定文本的元素（使用完整 UI 层级）"""
         try:
-            xml = self.client.u2.dump_hierarchy(compressed=False)
+            xml = self._get_full_hierarchy()
             import xml.etree.ElementTree as ET
             root = ET.fromstring(xml)
             
@@ -1831,7 +1858,7 @@ class BasicMobileToolsLite:
                     return ios_client.list_elements()
                 return [{"error": "iOS 暂不支持元素列表，建议使用截图"}]
             else:
-                xml_string = self.client.u2.dump_hierarchy(compressed=False)
+                xml_string = self._get_full_hierarchy()
                 elements = self.client.xml_parser.parse(xml_string)
                 
                 result = []
@@ -1867,8 +1894,8 @@ class BasicMobileToolsLite:
             screen_width = self.client.u2.info.get('displayWidth', 720)
             screen_height = self.client.u2.info.get('displayHeight', 1280)
             
-            # 获取元素列表
-            xml_string = self.client.u2.dump_hierarchy(compressed=False)
+            # 获取元素列表（使用完整 UI 层级）
+            xml_string = self._get_full_hierarchy()
             import xml.etree.ElementTree as ET
             root = ET.fromstring(xml_string)
             
@@ -2021,8 +2048,8 @@ class BasicMobileToolsLite:
             screen_width = self.client.u2.info.get('displayWidth', 720)
             screen_height = self.client.u2.info.get('displayHeight', 1280)
             
-            # 获取原始 XML
-            xml_string = self.client.u2.dump_hierarchy(compressed=False)
+            # 获取原始 XML（使用完整 UI 层级）
+            xml_string = self._get_full_hierarchy()
             
             # 关闭按钮的文本特征
             close_texts = ['×', 'X', 'x', '关闭', '取消', 'close', 'Close', 'CLOSE', '跳过', '知道了']
@@ -2893,8 +2920,8 @@ class BasicMobileToolsLite:
         try:
             import xml.etree.ElementTree as ET
             
-            # ========== 第1步：控件树查找关闭按钮 ==========
-            xml_string = self.client.u2.dump_hierarchy(compressed=False)
+            # ========== 第1步：控件树查找关闭按钮（使用完整 UI 层级）==========
+            xml_string = self._get_full_hierarchy()
             root = ET.fromstring(xml_string)
             
             # 关闭按钮的常见特征

mobile_mcp/core/mobile_client.py

@@ -189,8 +189,29 @@ class MobileClient:
             return xml_string
         
         # Android平台
-        # 获取XML
-        xml_string = self.u2.dump_hierarchy(compressed=False)
+        # 获取XML - 优先使用 ADB 直接 dump（更完整，包含 NAF 元素）
+        xml_string = None
+        try:
+            # 方法1: 使用 ADB 直接 dump（获取最完整的 UI 树，包括 NAF 元素）
+            import subprocess
+            import tempfile
+            import os
+            
+            # 在设备上执行 dump
+            self.u2.shell('uiautomator dump /sdcard/ui_dump.xml')
+            
+            # 读取文件内容
+            result = self.u2.shell('cat /sdcard/ui_dump.xml')
+            if result and isinstance(result, str) and result.strip().startswith('<?xml'):
+                xml_string = result.strip()
+                # 清理临时文件
+                self.u2.shell('rm /sdcard/ui_dump.xml')
+        except Exception as e:
+            print(f"  ⚠️  ADB dump 失败，使用 uiautomator2: {e}", file=sys.stderr)
+        
+        # 方法2: 回退到 uiautomator2 的 dump_hierarchy
+        if not xml_string:
+            xml_string = self.u2.dump_hierarchy(compressed=False)
         
         # 确保xml_string是字符串类型
         if not isinstance(xml_string, str):

{mobile_mcp_ai-2.5.8.dist-info → mobile_mcp_ai-2.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mobile-mcp-ai
-Version: 2.5.8
+Version: 2.5.9
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi

{mobile_mcp_ai-2.5.8.dist-info → mobile_mcp_ai-2.5.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mobile_mcp/__init__.py,sha256=sQJZTL_sxQFzmcS7jOtS2AHCfUySz40vhX96N6u1qy4,816
 mobile_mcp/config.py,sha256=yaFLAV4bc2wX0GQPtZDo7OYF9E88tXV-av41fQsJwK4,4480
 mobile_mcp/core/__init__.py,sha256=ndMy-cLAIsQDG5op7gM_AIplycqZSZPWEkec1pEhvEY,170
-mobile_mcp/core/basic_tools_lite.py,sha256=hmsNjoNH-EsSU7GAclSsYiYKgds0RlmdrVlGmun3gPw,153561
+mobile_mcp/core/basic_tools_lite.py,sha256=C9_mptagHKGgGfPUxzmoM0t080JNERYDDNb0OrbV8sQ,154736
 mobile_mcp/core/device_manager.py,sha256=xG5DoeNFs45pl-FTEhEWblqVwxtFK-FmVEGlNL6EqRI,8798
 mobile_mcp/core/dynamic_config.py,sha256=Ja1n1pfb0HspGByqk2_A472mYVniKmGtNEWyjUjmgK8,9811
 mobile_mcp/core/ios_client_wda.py,sha256=Nq9WxevhTWpVpolM-Ymp-b0nUQV3tXLFszmJHbDC4wA,18770
 mobile_mcp/core/ios_device_manager_wda.py,sha256=A44glqI-24un7qST-E3w6BQD8mV92YVUbxy4rLlTScY,11264
-mobile_mcp/core/mobile_client.py,sha256=ELl2ypgJunsKVkWwhkXN8zco4mj3OnGGqtSEofpSmWc,62714
+mobile_mcp/core/mobile_client.py,sha256=AaBntQSW2loAw7xL3j_IABNzrJO_Uukf9-F1z1xl6xE,63672
 mobile_mcp/core/template_matcher.py,sha256=tv8RU6zdeDobqphaP4Y8sicb1esg3gcQlZae1tNyitM,14559
 mobile_mcp/core/templates/close_buttons/auto_x_0112_151217.png,sha256=s7tBVaYLBApNSEXjwi5kX8GXwUqgbNyNVEhXYjN9nd4,27373
 mobile_mcp/core/templates/close_buttons/auto_x_0112_152037.png,sha256=s7tBVaYLBApNSEXjwi5kX8GXwUqgbNyNVEhXYjN9nd4,27373
@@ -24,9 +24,9 @@ mobile_mcp/utils/__init__.py,sha256=8EH0i7UGtx1y_j_GEgdN-cZdWn2sRtZSEOLlNF9HRnY,
 mobile_mcp/utils/logger.py,sha256=Sqq2Nr0Y4p03erqcrbYKVPCGiFaNGHMcE_JwCkeOfU4,3626
 mobile_mcp/utils/xml_formatter.py,sha256=uwTRb3vLbqhT8O-udzWT7s7LsV-DyDUz2DkofD3hXOE,4556
 mobile_mcp/utils/xml_parser.py,sha256=QhL8CWbdmNDzmBLjtx6mEnjHgMFZzJeHpCL15qfXSpI,3926
-mobile_mcp_ai-2.5.8.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.5.8.dist-info/METADATA,sha256=vwWnw9dqb_pqiZz635gcRRW4TvyI_WKavutrapxCBHQ,10495
-mobile_mcp_ai-2.5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mobile_mcp_ai-2.5.8.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.5.8.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.5.8.dist-info/RECORD,,
+mobile_mcp_ai-2.5.9.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.5.9.dist-info/METADATA,sha256=j1KcGXfXaAeU3KJiSOAlo150FG9Mvg3cRlmDjJK3nZY,10495
+mobile_mcp_ai-2.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mobile_mcp_ai-2.5.9.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.5.9.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.5.9.dist-info/RECORD,,