mobile-mcp-ai 2.5.5__py3-none-any.whl → 2.5.7__py3-none-any.whl

mobile_mcp/__init__.py

@@ -22,7 +22,7 @@
     await client.type_text("用户名输入框", "test@example.com")
 """
 
-__version__ = "2.5.5"
+__version__ = "1.0.0"
 
 from .core.mobile_client import MobileClient
 from .core.device_manager import DeviceManager

mobile_mcp/core/basic_tools_lite.py

@@ -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}"}
@@ -2360,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}"}

mobile_mcp/mcp_tools/mcp_server.py

@@ -331,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"]
             }
@@ -860,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":

{mobile_mcp_ai-2.5.5.dist-info → mobile_mcp_ai-2.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mobile-mcp-ai
-Version: 2.5.5
+Version: 2.5.7
 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
 

{mobile_mcp_ai-2.5.5.dist-info → mobile_mcp_ai-2.5.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-mobile_mcp/__init__.py,sha256=8FmpYKR75HYmrgWwCgzV4iellF0FMwSxfoy9u_fzioU,816
+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=rvVCCQEtVhLt24lBgaXMdG0ATb4O89lXEiczD3IrA1w,151423
+mobile_mcp/core/basic_tools_lite.py,sha256=wPrn9y7xUspQUhXRNQXhksekz5CNVVH7CbEfiD8yUeE,153449
 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=XP4nWbeNW0jM7QFvUiQ1DM0CU3UMW8Do8uxwRLAARYc,49527
+mobile_mcp/mcp_tools/mcp_server.py,sha256=fr42BjulYQCBreWoLx5lkWEZjT60Df6RCo_kyXMOHfI,49868
 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.5.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.5.5.dist-info/METADATA,sha256=hIceENDIHhcKXeiGHg9tS3iADHSky7HEPPTHR0QJ9EA,10495
-mobile_mcp_ai-2.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mobile_mcp_ai-2.5.5.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.5.5.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.5.5.dist-info/RECORD,,
+mobile_mcp_ai-2.5.7.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.5.7.dist-info/METADATA,sha256=RN8xuzGt0p_qbnQkSkxcUznXmNVJgtn9KY9lotAN49Q,10213
+mobile_mcp_ai-2.5.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mobile_mcp_ai-2.5.7.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.5.7.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.5.7.dist-info/RECORD,,

{mobile_mcp_ai-2.5.5.dist-info → mobile_mcp_ai-2.5.7.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