mobile-mcp-ai 2.5.4__tar.gz → 2.5.8__tar.gz

{mobile_mcp_ai-2.5.4/mobile_mcp_ai.egg-info → mobile_mcp_ai-2.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mobile-mcp-ai
-Version: 2.5.4
+Version: 2.5.8
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi
@@ -408,10 +408,18 @@ tidevice list
 |:---:|------|------|
 | 📋 | `mobile_list_elements` | 列出页面元素 |
 | 📸 | `mobile_take_screenshot` | 截图 |
+| 📸 | `mobile_screenshot_with_som` | Set-of-Mark 截图（智能标注） |
+| 📸 | `mobile_screenshot_with_grid` | 带网格坐标的截图 |
 | 📐 | `mobile_get_screen_size` | 屏幕尺寸 |
 | 👆 | `mobile_click_by_text` | 文本点击 |
 | 👆 | `mobile_click_by_id` | ID 点击 |
 | 👆 | `mobile_click_at_coords` | 坐标点击 |
+| 👆 | `mobile_click_by_percent` | 百分比点击 |
+| 👆 | `mobile_click_by_som` | SoM 编号点击 |
+| 👆 | `mobile_long_press_by_id` | ID 长按 |
+| 👆 | `mobile_long_press_by_text` | 文本长按 |
+| 👆 | `mobile_long_press_by_percent` | 百分比长按 |
+| 👆 | `mobile_long_press_at_coords` | 坐标长按 |
 | ⌨️ | `mobile_input_text_by_id` | ID 输入 |
 | ⌨️ | `mobile_input_at_coords` | 坐标输入 |
 | 👆 | `mobile_swipe` | 滑动 |
@@ -422,6 +430,11 @@ tidevice list
 | 📦 | `mobile_list_apps` | 列出应用 |
 | 📱 | `mobile_list_devices` | 列出设备 |
 | 🔌 | `mobile_check_connection` | 检查连接 |
+| 🔍 | `mobile_find_close_button` | 查找关闭按钮 |
+| 🚫 | `mobile_close_popup` | 关闭弹窗 |
+| 🚫 | `mobile_close_ad` | 智能关闭广告弹窗 |
+| 🎯 | `mobile_template_close` | 模板匹配关闭弹窗 |
+| ➕ | `mobile_template_add` | 添加 X 号模板 |
 | ✅ | `mobile_assert_text` | 断言文本 |
 | 📜 | `mobile_get_operation_history` | 操作历史 |
 | 🗑️ | `mobile_clear_operation_history` | 清空历史 |

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/README.md

@@ -337,10 +337,18 @@ tidevice list
 |:---:|------|------|
 | 📋 | `mobile_list_elements` | 列出页面元素 |
 | 📸 | `mobile_take_screenshot` | 截图 |
+| 📸 | `mobile_screenshot_with_som` | Set-of-Mark 截图（智能标注） |
+| 📸 | `mobile_screenshot_with_grid` | 带网格坐标的截图 |
 | 📐 | `mobile_get_screen_size` | 屏幕尺寸 |
 | 👆 | `mobile_click_by_text` | 文本点击 |
 | 👆 | `mobile_click_by_id` | ID 点击 |
 | 👆 | `mobile_click_at_coords` | 坐标点击 |
+| 👆 | `mobile_click_by_percent` | 百分比点击 |
+| 👆 | `mobile_click_by_som` | SoM 编号点击 |
+| 👆 | `mobile_long_press_by_id` | ID 长按 |
+| 👆 | `mobile_long_press_by_text` | 文本长按 |
+| 👆 | `mobile_long_press_by_percent` | 百分比长按 |
+| 👆 | `mobile_long_press_at_coords` | 坐标长按 |
 | ⌨️ | `mobile_input_text_by_id` | ID 输入 |
 | ⌨️ | `mobile_input_at_coords` | 坐标输入 |
 | 👆 | `mobile_swipe` | 滑动 |
@@ -351,6 +359,11 @@ tidevice list
 | 📦 | `mobile_list_apps` | 列出应用 |
 | 📱 | `mobile_list_devices` | 列出设备 |
 | 🔌 | `mobile_check_connection` | 检查连接 |
+| 🔍 | `mobile_find_close_button` | 查找关闭按钮 |
+| 🚫 | `mobile_close_popup` | 关闭弹窗 |
+| 🚫 | `mobile_close_ad` | 智能关闭广告弹窗 |
+| 🎯 | `mobile_template_close` | 模板匹配关闭弹窗 |
+| ➕ | `mobile_template_add` | 添加 X 号模板 |
 | ✅ | `mobile_assert_text` | 断言文本 |
 | 📜 | `mobile_get_operation_history` | 操作历史 |
 | 🗑️ | `mobile_clear_operation_history` | 清空历史 |

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/core/basic_tools_lite.py

@@ -354,7 +354,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()
+                    xml_string = self.client.u2.dump_hierarchy(compressed=False)
                     root = ET.fromstring(xml_string)
                     
                     # 检测弹窗区域
@@ -531,7 +531,7 @@ class BasicMobileToolsLite:
             else:
                 try:
                     import xml.etree.ElementTree as ET
-                    xml_string = self.client.u2.dump_hierarchy()
+                    xml_string = self.client.u2.dump_hierarchy(compressed=False)
                     root = ET.fromstring(xml_string)
                     
                     for elem in root.iter():
@@ -1089,7 +1089,7 @@ class BasicMobileToolsLite:
     def _find_element_in_tree(self, text: str) -> Optional[Dict]:
         """在 XML 树中查找包含指定文本的元素"""
         try:
-            xml = self.client.u2.dump_hierarchy()
+            xml = self.client.u2.dump_hierarchy(compressed=False)
             import xml.etree.ElementTree as ET
             root = ET.fromstring(xml)
             
@@ -1126,9 +1126,16 @@ class BasicMobileToolsLite:
         except Exception:
             return None
     
-    def click_by_id(self, resource_id: str) -> Dict:
-        """通过 resource-id 点击"""
+    def click_by_id(self, resource_id: str, index: int = 0) -> Dict:
+        """通过 resource-id 点击（支持点击第 N 个元素）
+        
+        Args:
+            resource_id: 元素的 resource-id
+            index: 第几个元素（从 0 开始），默认 0 表示第一个
+        """
         try:
+            index_desc = f"[{index}]" if index > 0 else ""
+            
             if self._is_ios():
                 ios_client = self._get_ios_client()
                 if ios_client and hasattr(ios_client, 'wda'):
@@ -1136,18 +1143,28 @@ class BasicMobileToolsLite:
                     if not elem.exists:
                         elem = ios_client.wda(name=resource_id)
                     if elem.exists:
-                        elem.click()
-                        time.sleep(0.3)
-                        self._record_operation('click', element=resource_id, ref=resource_id)
-                        return {"success": True, "message": f"✅ 点击成功: {resource_id}"}
+                        # 获取所有匹配的元素
+                        elements = elem.find_elements()
+                        if index < len(elements):
+                            elements[index].click()
+                            time.sleep(0.3)
+                            self._record_operation('click', element=f"{resource_id}{index_desc}", ref=resource_id, index=index)
+                            return {"success": True, "message": f"✅ 点击成功: {resource_id}{index_desc}"}
+                        else:
+                            return {"success": False, "message": f"❌ 索引超出范围: 找到 {len(elements)} 个元素，但请求索引 {index}"}
                     return {"success": False, "message": f"❌ 元素不存在: {resource_id}"}
             else:
                 elem = self.client.u2(resourceId=resource_id)
                 if elem.exists(timeout=0.5):
-                    elem.click()
-                    time.sleep(0.3)
-                    self._record_operation('click', element=resource_id, ref=resource_id)
-                    return {"success": True, "message": f"✅ 点击成功: {resource_id}"}
+                    # 获取匹配元素数量
+                    count = elem.count
+                    if index < count:
+                        elem[index].click()
+                        time.sleep(0.3)
+                        self._record_operation('click', element=f"{resource_id}{index_desc}", ref=resource_id, index=index)
+                        return {"success": True, "message": f"✅ 点击成功: {resource_id}{index_desc}" + (f" (共 {count} 个)" if count > 1 else "")}
+                    else:
+                        return {"success": False, "message": f"❌ 索引超出范围: 找到 {count} 个元素，但请求索引 {index}"}
                 return {"success": False, "message": f"❌ 元素不存在: {resource_id}"}
         except Exception as e:
             return {"success": False, "message": f"❌ 点击失败: {e}"}
@@ -1587,8 +1604,14 @@ class BasicMobileToolsLite:
     
     # ==================== 导航操作 ====================
     
-    async def swipe(self, direction: str) -> Dict:
-        """滑动屏幕"""
+    async def swipe(self, direction: str, y: Optional[int] = None, y_percent: Optional[float] = None) -> Dict:
+        """滑动屏幕
+        
+        Args:
+            direction: 滑动方向 (up/down/left/right)
+            y: 左右滑动时指定的高度坐标（像素）
+            y_percent: 左右滑动时指定的高度百分比 (0-100)
+        """
         try:
             if self._is_ios():
                 ios_client = self._get_ios_client()
@@ -1602,11 +1625,26 @@ class BasicMobileToolsLite:
             
             center_x, center_y = width // 2, height // 2
             
+            # 对于左右滑动，如果指定了 y 或 y_percent，使用指定的高度
+            if direction in ['left', 'right']:
+                if y_percent is not None:
+                    if not (0 <= y_percent <= 100):
+                        return {"success": False, "message": f"❌ y_percent 必须在 0-100 之间: {y_percent}"}
+                    swipe_y = int(height * y_percent / 100)
+                elif y is not None:
+                    if not (0 <= y <= height):
+                        return {"success": False, "message": f"❌ y 坐标超出屏幕范围 (0-{height}): {y}"}
+                    swipe_y = y
+                else:
+                    swipe_y = center_y
+            else:
+                swipe_y = center_y
+            
             swipe_map = {
                 'up': (center_x, int(height * 0.8), center_x, int(height * 0.2)),
                 'down': (center_x, int(height * 0.2), center_x, int(height * 0.8)),
-                'left': (int(width * 0.8), center_y, int(width * 0.2), center_y),
-                'right': (int(width * 0.2), center_y, int(width * 0.8), center_y),
+                'left': (int(width * 0.8), swipe_y, int(width * 0.2), swipe_y),
+                'right': (int(width * 0.2), swipe_y, int(width * 0.8), swipe_y),
             }
             
             if direction not in swipe_map:
@@ -1619,9 +1657,23 @@ class BasicMobileToolsLite:
             else:
                 self.client.u2.swipe(x1, y1, x2, y2, duration=0.5)
             
-            self._record_operation('swipe', direction=direction)
-            
-            return {"success": True, "message": f"✅ 滑动成功: {direction}"}
+            # 记录操作信息
+            record_info = {'direction': direction}
+            if y is not None:
+                record_info['y'] = y
+            if y_percent is not None:
+                record_info['y_percent'] = y_percent
+            self._record_operation('swipe', **record_info)
+            
+            # 构建返回消息
+            msg = f"✅ 滑动成功: {direction}"
+            if direction in ['left', 'right']:
+                if y_percent is not None:
+                    msg += f" (高度: {y_percent}% = {swipe_y}px)"
+                elif y is not None:
+                    msg += f" (高度: {y}px)"
+            
+            return {"success": True, "message": msg}
         except Exception as e:
             return {"success": False, "message": f"❌ 滑动失败: {e}"}
     
@@ -1779,7 +1831,7 @@ class BasicMobileToolsLite:
                     return ios_client.list_elements()
                 return [{"error": "iOS 暂不支持元素列表，建议使用截图"}]
             else:
-                xml_string = self.client.u2.dump_hierarchy()
+                xml_string = self.client.u2.dump_hierarchy(compressed=False)
                 elements = self.client.xml_parser.parse(xml_string)
                 
                 result = []
@@ -1816,7 +1868,7 @@ class BasicMobileToolsLite:
             screen_height = self.client.u2.info.get('displayHeight', 1280)
             
             # 获取元素列表
-            xml_string = self.client.u2.dump_hierarchy()
+            xml_string = self.client.u2.dump_hierarchy(compressed=False)
             import xml.etree.ElementTree as ET
             root = ET.fromstring(xml_string)
             
@@ -1970,7 +2022,7 @@ class BasicMobileToolsLite:
             screen_height = self.client.u2.info.get('displayHeight', 1280)
             
             # 获取原始 XML
-            xml_string = self.client.u2.dump_hierarchy()
+            xml_string = self.client.u2.dump_hierarchy(compressed=False)
             
             # 关闭按钮的文本特征
             close_texts = ['×', 'X', 'x', '关闭', '取消', 'close', 'Close', 'CLOSE', '跳过', '知道了']
@@ -2325,22 +2377,43 @@ class BasicMobileToolsLite:
             return 0.5
     
     def assert_text(self, text: str) -> Dict:
-        """检查页面是否包含文本"""
+        """检查页面是否包含文本（支持精确匹配和包含匹配）"""
         try:
+            exists = False
+            match_type = ""
+            
             if self._is_ios():
                 ios_client = self._get_ios_client()
                 if ios_client and hasattr(ios_client, 'wda'):
-                    exists = ios_client.wda(name=text).exists or ios_client.wda(label=text).exists
-                else:
-                    exists = False
+                    # 先尝试精确匹配
+                    if ios_client.wda(name=text).exists or ios_client.wda(label=text).exists:
+                        exists = True
+                        match_type = "精确匹配"
+                    # 再尝试包含匹配
+                    elif ios_client.wda(nameContains=text).exists or ios_client.wda(labelContains=text).exists:
+                        exists = True
+                        match_type = "包含匹配"
+            else:
+                # Android: 先尝试精确匹配
+                if self.client.u2(text=text).exists():
+                    exists = True
+                    match_type = "精确匹配"
+                # 再尝试包含匹配
+                elif self.client.u2(textContains=text).exists():
+                    exists = True
+                    match_type = "包含匹配"
+            
+            if exists:
+                message = f"✅ 文本'{text}' 存在（{match_type}）"
             else:
-                exists = self.client.u2(text=text).exists()
+                message = f"❌ 文本'{text}' 不存在"
             
             return {
                 "success": True,
                 "found": exists,
                 "text": text,
-                "message": f"✅ 文本'{text}' {'存在' if exists else '不存在'}"
+                "match_type": match_type if exists else None,
+                "message": message
             }
         except Exception as e:
             return {"success": False, "message": f"❌ 断言失败: {e}"}
@@ -2821,7 +2894,7 @@ class BasicMobileToolsLite:
             import xml.etree.ElementTree as ET
             
             # ========== 第1步：控件树查找关闭按钮 ==========
-            xml_string = self.client.u2.dump_hierarchy()
+            xml_string = self.client.u2.dump_hierarchy(compressed=False)
             root = ET.fromstring(xml_string)
             
             # 关闭按钮的常见特征

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/core/device_manager.py

@@ -208,7 +208,7 @@ class DeviceManager:
         
         try:
             # 尝试获取页面结构，如果失败可能是无障碍服务未启用
-            xml = self.u2.dump_hierarchy()
+            xml = self.u2.dump_hierarchy(compressed=False)
             if xml and len(xml) > 100:  # 有内容说明无障碍服务正常
                 print(f"   ✅ 无障碍服务: 已启用", file=sys.stderr)
                 return
@@ -235,7 +235,7 @@ class DeviceManager:
         
         try:
             # 尝试获取页面结构
-            xml = self.u2.dump_hierarchy()
+            xml = self.u2.dump_hierarchy(compressed=False)
             if xml and len(xml) > 100:
                 return {
                     'enabled': True,

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/core/mobile_client.py

@@ -190,7 +190,7 @@ class MobileClient:
         
         # Android平台
         # 获取XML
-        xml_string = self.u2.dump_hierarchy()
+        xml_string = self.u2.dump_hierarchy(compressed=False)
         
         # 确保xml_string是字符串类型
         if not isinstance(xml_string, str):
@@ -321,7 +321,7 @@ class MobileClient:
                         # 🎯 改进：尝试模糊匹配（忽略空格、括号）
                         ref_normalized = ref.replace(' ', '').replace('(', '').replace(')', '').replace('（', '').replace('）', '')
                         # 获取所有元素，手动匹配
-                        xml_string = self.u2.dump_hierarchy()
+                        xml_string = self.u2.dump_hierarchy(compressed=False)
                         elements = self.xml_parser.parse(xml_string)
                         for elem in elements:
                             elem_desc = elem.get('content_desc', '')
@@ -434,7 +434,7 @@ class MobileClient:
             if verify:
                 # 获取点击前页面状态
                 try:
-                    initial_xml = self.u2.dump_hierarchy()
+                    initial_xml = self.u2.dump_hierarchy(compressed=False)
                     initial_length = len(initial_xml)
                     
                     # 等待页面变化
@@ -757,7 +757,7 @@ class MobileClient:
             initial_length = 0
             if verify:
                 try:
-                    initial_xml = self.u2.dump_hierarchy()
+                    initial_xml = self.u2.dump_hierarchy(compressed=False)
                     initial_length = len(initial_xml)
                 except Exception as e:
                     print(f"  ⚠️  获取初始页面状态失败: {e}", file=sys.stderr)
@@ -1008,7 +1008,7 @@ class MobileClient:
                 try:
                     if verify:
                         # 获取操作前页面状态
-                        initial_xml = self.u2.dump_hierarchy()
+                        initial_xml = self.u2.dump_hierarchy(compressed=False)
                         initial_length = len(initial_xml)
                     
                     self.u2.press(key.lower())
@@ -1037,7 +1037,7 @@ class MobileClient:
             # 标准按键处理
             if verify:
                 # 获取操作前页面状态
-                initial_xml = self.u2.dump_hierarchy()
+                initial_xml = self.u2.dump_hierarchy(compressed=False)
                 initial_length = len(initial_xml)
             
             # 使用keycode按键 - uiautomator2使用shell命令
@@ -1099,7 +1099,7 @@ class MobileClient:
         print(f"  🔍 智能搜索键：先尝试SEARCH键...", file=sys.stderr)
         
         # 获取初始页面状态
-        initial_xml = self.u2.dump_hierarchy()
+        initial_xml = self.u2.dump_hierarchy(compressed=False)
         initial_length = len(initial_xml)
         
         # 方案1: 尝试 SEARCH 键 (keycode=84)
@@ -1126,7 +1126,7 @@ class MobileClient:
                 
                 # 方案2: 尝试 ENTER 键 (keycode=66)
                 # 重新获取当前页面状态（因为可能有轻微变化）
-                current_xml = self.u2.dump_hierarchy()
+                current_xml = self.u2.dump_hierarchy(compressed=False)
                 current_length = len(current_xml)
                 
                 self.u2.shell('input keyevent 66')
@@ -1184,7 +1184,7 @@ class MobileClient:
             await asyncio.sleep(0.1)  # 每100ms检查一次
             
             try:
-                current_xml = self.u2.dump_hierarchy()
+                current_xml = self.u2.dump_hierarchy(compressed=False)
                 current_length = len(current_xml)
                 
                 # 计算变化百分比

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/core/utils/smart_wait.py

@@ -61,7 +61,7 @@ class SmartWait:
         while time.time() - start_time < timeout:
             try:
                 # 获取当前页面快照（只获取元素数量，不解析详细内容）
-                xml = self.client.u2.dump_hierarchy()
+                xml = self.client.u2.dump_hierarchy(compressed=False)
                 current_snapshot = len(xml)  # 使用XML长度作为简单的页面状态标识
                 
                 if last_snapshot is not None:
@@ -137,14 +137,14 @@ class SmartWait:
         
         try:
             # 获取初始页面状态
-            initial_xml = self.client.u2.dump_hierarchy()
+            initial_xml = self.client.u2.dump_hierarchy(compressed=False)
             initial_length = len(initial_xml)
             
             while time.time() - start_time < timeout:
                 await asyncio.sleep(self.poll_interval)
                 
                 try:
-                    current_xml = self.client.u2.dump_hierarchy()
+                    current_xml = self.client.u2.dump_hierarchy(compressed=False)
                     current_length = len(current_xml)
                     
                     # 页面变化超过5%认为有变化

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/mcp_tools/mcp_server.py

@@ -34,9 +34,21 @@ from pathlib import Path
 from typing import Optional
 
 # 添加项目根目录到 Python 路径
-# __file__ 在 mcp/ 目录下，需要往上两级到项目根目录
-project_root = Path(__file__).parent.parent
-sys.path.insert(0, str(project_root))
+# 支持两种运行方式：
+# 1. 从源码运行：__file__ 在 mcp_tools/ 目录下，往上两级到项目根目录
+# 2. 从已安装包运行：包已安装时，mobile_mcp 应该可以直接导入
+# 先尝试从已安装的包导入，如果失败则从源码路径导入
+try:
+    # 尝试导入已安装的包
+    import mobile_mcp.core.mobile_client
+    import mobile_mcp.core.basic_tools_lite
+    # 如果成功，说明包已安装，不需要添加路径
+except ImportError:
+    # 包未安装或导入失败，从源码运行
+    # __file__ 在 mcp_tools/ 目录下，往上两级到项目根目录
+    project_root = Path(__file__).parent.parent
+    if str(project_root) not in sys.path:
+        sys.path.insert(0, str(project_root))
 
 # 尝试导入 MCP，处理可能的路径冲突
 try:
@@ -115,8 +127,19 @@ class MobileMCPServer:
         platform = self._detect_platform()
         
         try:
-            from mobile_mcp.core.mobile_client import MobileClient
-            from mobile_mcp.core.basic_tools_lite import BasicMobileToolsLite
+            # 尝试导入，如果失败会抛出 ImportError
+            try:
+                from mobile_mcp.core.mobile_client import MobileClient
+                from mobile_mcp.core.basic_tools_lite import BasicMobileToolsLite
+            except ImportError as import_err:
+                # 如果导入失败，尝试从源码路径导入
+                # 这通常发生在开发模式下，包未安装时
+                project_root = Path(__file__).parent.parent
+                if str(project_root) not in sys.path:
+                    sys.path.insert(0, str(project_root))
+                # 再次尝试导入
+                from mobile_mcp.core.mobile_client import MobileClient
+                from mobile_mcp.core.basic_tools_lite import BasicMobileToolsLite
             
             self.client = MobileClient(platform=platform)
             self.tools = BasicMobileToolsLite(self.client)
@@ -308,11 +331,13 @@ class MobileMCPServer:
             description="👆 通过 resource-id 点击元素（最推荐）\n\n"
                        "✅ 最稳定的定位方式\n"
                        "✅ 实时检测元素是否存在，元素不存在会报错\n"
-                       "📋 使用前先调用 mobile_list_elements 获取元素 ID",
+                       "📋 使用前先调用 mobile_list_elements 获取元素 ID\n"
+                       "💡 当有多个相同 ID 的元素时，用 index 指定第几个（从 0 开始）",
             inputSchema={
                 "type": "object",
                 "properties": {
-                    "resource_id": {"type": "string", "description": "元素的 resource-id"}
+                    "resource_id": {"type": "string", "description": "元素的 resource-id"},
+                    "index": {"type": "integer", "description": "第几个元素（从 0 开始），默认 0 表示第一个", "default": 0}
                 },
                 "required": ["resource_id"]
             }
@@ -480,7 +505,11 @@ class MobileMCPServer:
         # ==================== 导航操作 ====================
         tools.append(Tool(
             name="mobile_swipe",
-            description="👆 滑动屏幕。方向：up/down/left/right",
+            description="👆 滑动屏幕。方向：up/down/left/right\n\n"
+                       "💡 左右滑动时，可指定高度坐标或百分比：\n"
+                       "- y: 指定高度坐标（像素）\n"
+                       "- y_percent: 指定高度百分比 (0-100)\n"
+                       "- 两者都未指定时，使用屏幕中心高度",
             inputSchema={
                 "type": "object",
                 "properties": {
@@ -488,6 +517,14 @@ class MobileMCPServer:
                         "type": "string",
                         "enum": ["up", "down", "left", "right"],
                         "description": "滑动方向"
+                    },
+                    "y": {
+                        "type": "integer",
+                        "description": "左右滑动时指定的高度坐标（像素，0-屏幕高度）"
+                    },
+                    "y_percent": {
+                        "type": "number",
+                        "description": "左右滑动时指定的高度百分比 (0-100)"
                     }
                 },
                 "required": ["direction"]
@@ -825,7 +862,10 @@ class MobileMCPServer:
                 return [TextContent(type="text", text=self.format_response(result))]
             
             elif name == "mobile_click_by_id":
-                result = self.tools.click_by_id(arguments["resource_id"])
+                result = self.tools.click_by_id(
+                    arguments["resource_id"],
+                    arguments.get("index", 0)
+                )
                 return [TextContent(type="text", text=self.format_response(result))]
             
             elif name == "mobile_click_by_percent":
@@ -880,7 +920,11 @@ class MobileMCPServer:
             
             # 导航
             elif name == "mobile_swipe":
-                result = await self.tools.swipe(arguments["direction"])
+                result = await self.tools.swipe(
+                    arguments["direction"],
+                    y=arguments.get("y"),
+                    y_percent=arguments.get("y_percent")
+                )
                 return [TextContent(type="text", text=self.format_response(result))]
             
             elif name == "mobile_press_key":

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8/mobile_mcp_ai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mobile-mcp-ai
-Version: 2.5.4
+Version: 2.5.8
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi
@@ -408,10 +408,18 @@ tidevice list
 |:---:|------|------|
 | 📋 | `mobile_list_elements` | 列出页面元素 |
 | 📸 | `mobile_take_screenshot` | 截图 |
+| 📸 | `mobile_screenshot_with_som` | Set-of-Mark 截图（智能标注） |
+| 📸 | `mobile_screenshot_with_grid` | 带网格坐标的截图 |
 | 📐 | `mobile_get_screen_size` | 屏幕尺寸 |
 | 👆 | `mobile_click_by_text` | 文本点击 |
 | 👆 | `mobile_click_by_id` | ID 点击 |
 | 👆 | `mobile_click_at_coords` | 坐标点击 |
+| 👆 | `mobile_click_by_percent` | 百分比点击 |
+| 👆 | `mobile_click_by_som` | SoM 编号点击 |
+| 👆 | `mobile_long_press_by_id` | ID 长按 |
+| 👆 | `mobile_long_press_by_text` | 文本长按 |
+| 👆 | `mobile_long_press_by_percent` | 百分比长按 |
+| 👆 | `mobile_long_press_at_coords` | 坐标长按 |
 | ⌨️ | `mobile_input_text_by_id` | ID 输入 |
 | ⌨️ | `mobile_input_at_coords` | 坐标输入 |
 | 👆 | `mobile_swipe` | 滑动 |
@@ -422,6 +430,11 @@ tidevice list
 | 📦 | `mobile_list_apps` | 列出应用 |
 | 📱 | `mobile_list_devices` | 列出设备 |
 | 🔌 | `mobile_check_connection` | 检查连接 |
+| 🔍 | `mobile_find_close_button` | 查找关闭按钮 |
+| 🚫 | `mobile_close_popup` | 关闭弹窗 |
+| 🚫 | `mobile_close_ad` | 智能关闭广告弹窗 |
+| 🎯 | `mobile_template_close` | 模板匹配关闭弹窗 |
+| ➕ | `mobile_template_add` | 添加 X 号模板 |
 | ✅ | `mobile_assert_text` | 断言文本 |
 | 📜 | `mobile_get_operation_history` | 操作历史 |
 | 🗑️ | `mobile_clear_operation_history` | 清空历史 |

{mobile_mcp_ai-2.5.4 → mobile_mcp_ai-2.5.8}/setup.py

@@ -25,7 +25,7 @@ if requirements_file.exists():
 
 setup(
     name="mobile-mcp-ai",
-    version="2.5.4",  # 修复：设备断开后自动重连
+    version="2.5.8",  # dump_hierarchy 使用 compressed=False 获取完整 XML 树
     author="douzi",
     author_email="1492994674@qq.com",
     description="移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）",