mobile-mcp-ai 2.5.4__py3-none-any.whl → 2.5.6__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -1587,8 +1587,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 +1608,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 +1640,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}"}
     
@@ -2325,22 +2360,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}"}

mobile_mcp/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)
@@ -480,7 +503,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 +515,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"]
@@ -880,7 +915,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.dist-info → mobile_mcp_ai-2.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mobile-mcp-ai
-Version: 2.5.4
+Version: 2.5.6
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi
@@ -31,21 +31,6 @@ Provides-Extra: ai
 Requires-Dist: dashscope>=1.10.0; extra == "ai"
 Requires-Dist: openai>=1.0.0; extra == "ai"
 Requires-Dist: anthropic>=0.3.0; extra == "ai"
-Provides-Extra: test
-Requires-Dist: pytest>=8.0.0; extra == "test"
-Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
-Requires-Dist: allure-pytest>=2.13.0; extra == "test"
-Provides-Extra: dev
-Requires-Dist: pytest>=8.0.0; extra == "dev"
-Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
-Requires-Dist: twine>=4.0.0; extra == "dev"
-Requires-Dist: build>=0.10.0; extra == "dev"
-Provides-Extra: ios
-Requires-Dist: tidevice>=0.11.0; extra == "ios"
-Requires-Dist: facebook-wda>=1.4.0; extra == "ios"
-Provides-Extra: h5
-Requires-Dist: Appium-Python-Client>=3.0.0; extra == "h5"
-Requires-Dist: selenium>=4.0.0; extra == "h5"
 Provides-Extra: all
 Requires-Dist: dashscope>=1.10.0; extra == "all"
 Requires-Dist: openai>=1.0.0; extra == "all"
@@ -55,19 +40,21 @@ Requires-Dist: selenium>=4.0.0; extra == "all"
 Requires-Dist: pytest>=8.0.0; extra == "all"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "all"
 Requires-Dist: allure-pytest>=2.13.0; extra == "all"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0.0; extra == "dev"
+Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
+Requires-Dist: twine>=4.0.0; extra == "dev"
+Requires-Dist: build>=0.10.0; extra == "dev"
+Provides-Extra: h5
+Requires-Dist: Appium-Python-Client>=3.0.0; extra == "h5"
+Requires-Dist: selenium>=4.0.0; extra == "h5"
+Provides-Extra: ios
+Requires-Dist: tidevice>=0.11.0; extra == "ios"
+Requires-Dist: facebook-wda>=1.4.0; extra == "ios"
+Provides-Extra: test
+Requires-Dist: pytest>=8.0.0; extra == "test"
+Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Requires-Dist: allure-pytest>=2.13.0; extra == "test"
 
 # 📱 Mobile MCP AI
 
@@ -408,10 +395,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 +417,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.dist-info → mobile_mcp_ai-2.5.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=BzPT180GPQjhTNHaAKl46m1jvCM5KoQIPgySGdNSD30,149836
+mobile_mcp/core/basic_tools_lite.py,sha256=BgzErXm0jfYaVK8Se8vCvMXqCudEnUYWI3yivyzxktg,152356
 mobile_mcp/core/device_manager.py,sha256=PX3-B5bJFnKNt6C8fT7FSY8JwD-ngZ3toF88bcOV9qA,8766
 mobile_mcp/core/dynamic_config.py,sha256=Ja1n1pfb0HspGByqk2_A472mYVniKmGtNEWyjUjmgK8,9811
 mobile_mcp/core/ios_client_wda.py,sha256=Nq9WxevhTWpVpolM-Ymp-b0nUQV3tXLFszmJHbDC4wA,18770
@@ -19,14 +19,14 @@ mobile_mcp/core/utils/logger.py,sha256=XXQAHUwT1jc70pq_tYFmL6f_nKrFlYm3hcgl-5RYR
 mobile_mcp/core/utils/operation_history_manager.py,sha256=gi8S8HJAMqvkUrY7_-kVbko3Xt7c4GAUziEujRd-N-Y,4792
 mobile_mcp/core/utils/smart_wait.py,sha256=PvKXImfN9Irru3bQJUjf4FLGn8LjY2VLzUNEl-i7xLE,8601
 mobile_mcp/mcp_tools/__init__.py,sha256=xkro8Rwqv_55YlVyhh-3DgRFSsLE3h1r31VIb3bpM6E,143
-mobile_mcp/mcp_tools/mcp_server.py,sha256=wqNOkjWYxxPYTAjU8e8yn8EyeRtO9NMhPTqGZ18jfnM,47471
+mobile_mcp/mcp_tools/mcp_server.py,sha256=XP4nWbeNW0jM7QFvUiQ1DM0CU3UMW8Do8uxwRLAARYc,49527
 mobile_mcp/utils/__init__.py,sha256=8EH0i7UGtx1y_j_GEgdN-cZdWn2sRtZSEOLlNF9HRnY,158
 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.4.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.5.4.dist-info/METADATA,sha256=EUiIZ3uxIiyK-P9Sf558k8nu6dAWnl1U6mcjBby0Lso,9745
-mobile_mcp_ai-2.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mobile_mcp_ai-2.5.4.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.5.4.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.5.4.dist-info/RECORD,,
+mobile_mcp_ai-2.5.6.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.5.6.dist-info/METADATA,sha256=dd3JeAJ-53sZNKzN9-ga11MFJ8rf4YF9Cb8RX6fYq64,10213
+mobile_mcp_ai-2.5.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mobile_mcp_ai-2.5.6.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.5.6.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.5.6.dist-info/RECORD,,

{mobile_mcp_ai-2.5.4.dist-info → mobile_mcp_ai-2.5.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any