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

{mobile_mcp_ai-2.5.5/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.5
+Version: 2.5.8
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi

{mobile_mcp_ai-2.5.5 → mobile_mcp_ai-2.5.8}/__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_ai-2.5.5 → 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}"}
@@ -1814,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 = []
@@ -1851,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)
             
@@ -2005,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', '跳过', '知道了']
@@ -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}"}
@@ -2856,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.5 → 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.5 → 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.5 → 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.5 → mobile_mcp_ai-2.5.8}/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 → 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.5
+Version: 2.5.8
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi

{mobile_mcp_ai-2.5.5 → mobile_mcp_ai-2.5.8}/mobile_mcp_ai.egg-info/SOURCES.txt

@@ -65,6 +65,16 @@ templates/close_buttons/auto_x_0112_152840.png
 templates/close_buttons/auto_x_0112_153256.png
 templates/close_buttons/auto_x_0112_154847.png
 templates/close_buttons/gray_x_stock_ad.png
+tests/test_mind_cloud_my_space.py
+tests/test_mind_correct.py
+tests/test_mind_improved.py
+tests/test_mind_optimized.py
+tests/test_open_mind.py
+tests/test_priority_demo.py
+tests/test_simple.py
+tests/test_举报.py
+tests/test_切换语言到English.py
+tests/test_测试.py
 utils/__init__.py
 utils/logger.py
 utils/xml_formatter.py

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

@@ -25,7 +25,7 @@ if requirements_file.exists():
 
 setup(
     name="mobile-mcp-ai",
-    version="2.5.5",  # 支持左右滑动指定高度坐标和百分比
+    version="2.5.8",  # dump_hierarchy 使用 compressed=False 获取完整 XML 树
     author="douzi",
     author_email="1492994674@qq.com",
     description="移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）",

mobile_mcp_ai-2.5.8/tests/test_mind_cloud_my_space.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+测试用例: Mind云文档我的空间
+生成时间: 2025-12-17 11:00:00
+"""
+import time
+import uiautomator2 as u2
+
+PACKAGE_NAME = "com.im30.mind"
+
+# 广告关闭按钮关键词（可自定义）
+AD_CLOSE_KEYWORDS = ['关闭', '跳过', 'Skip', 'Close', '×', 'X', '我知道了', '稍后再说']
+
+
+def smart_wait(d, timeout=10):
+    """智能等待页面稳定"""
+    d.implicitly_wait(timeout)
+    time.sleep(0.5)  # 额外等待动画
+
+
+def close_ad_if_exists(d):
+    """尝试关闭广告弹窗"""
+    for keyword in AD_CLOSE_KEYWORDS:
+        elem = d(textContains=keyword)
+        if elem.exists(timeout=0.5):
+            try:
+                elem.click()
+                print(f'  📢 关闭广告: {keyword}')
+                time.sleep(0.5)
+                return True
+            except:
+                pass
+    return False
+
+
+def safe_click(d, selector, timeout=5):
+    """安全点击（带等待和重试）"""
+    try:
+        if selector.exists(timeout=timeout):
+            selector.click()
+            return True
+        return False
+    except Exception as e:
+        print(f'  ⚠️ 点击失败: {e}')
+        return False
+
+
+def test_main():
+    # 连接设备
+    d = u2.connect()
+    d.implicitly_wait(10)  # 设置全局等待
+    
+    # 启动应用
+    d.app_start(PACKAGE_NAME)
+    smart_wait(d)
+    
+    # 尝试关闭启动广告
+    close_ad_if_exists(d)
+    
+    # 步骤1: 点击文本 'Mind'
+    safe_click(d, d(text='Mind'))
+    smart_wait(d)
+    close_ad_if_exists(d)  # 检查广告
+    
+    # 步骤2: 点击坐标 (756, 2277)
+    d.click(756, 2277)
+    smart_wait(d)
+    close_ad_if_exists(d)  # 检查广告
+    
+    # 步骤3: 点击坐标 (815, 285)
+    d.click(815, 285)
+    smart_wait(d)
+    close_ad_if_exists(d)  # 检查广告
+    
+    print('✅ 测试完成')
+
+
+if __name__ == '__main__':
+    test_main()

mobile_mcp_ai-2.5.8/tests/test_mind_correct.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+测试用例: Mind云文档我的空间_正确版
+生成时间: 2025-12-17 11:08:10
+"""
+import time
+import uiautomator2 as u2
+
+PACKAGE_NAME = "com.im30.mind"
+
+# 广告关闭按钮关键词（可自定义）
+AD_CLOSE_KEYWORDS = ['关闭', '跳过', 'Skip', 'Close', '×', 'X', '我知道了', '稍后再说']
+
+
+def smart_wait(d, seconds=1):
+    """等待页面稳定"""
+    time.sleep(seconds)
+
+
+def close_ad_if_exists(d, quick=False):
+    """尝试关闭广告弹窗（quick=True 时只检查常见的）"""
+    keywords = AD_CLOSE_KEYWORDS[:3] if quick else AD_CLOSE_KEYWORDS
+    for keyword in keywords:
+        elem = d(textContains=keyword)
+        if elem.exists(timeout=0.3):  # 缩短超时
+            try:
+                elem.click()
+                print(f'  📢 关闭广告: {keyword}')
+                time.sleep(0.3)
+                return True
+            except:
+                pass
+    return False
+
+
+def safe_click(d, selector, timeout=3):
+    """安全点击（带等待）"""
+    try:
+        if selector.exists(timeout=timeout):
+            selector.click()
+            return True
+        return False
+    except Exception as e:
+        print(f'  ⚠️ 点击失败: {e}')
+        return False
+
+
+def test_main():
+    # 连接设备
+    d = u2.connect()
+    d.implicitly_wait(10)  # 设置全局等待
+    
+    # 启动应用
+    d.app_start(PACKAGE_NAME)
+    smart_wait(d)
+    
+    # 尝试关闭启动广告
+    close_ad_if_exists(d)
+    
+    # 步骤1: 点击坐标 (756, 2277)
+    d.click(756, 2277)
+    time.sleep(0.5)  # 等待响应
+    
+    # 步骤2: 点击坐标 (815, 285)
+    d.click(815, 285)
+    time.sleep(0.5)  # 等待响应
+    
+    print('✅ 测试完成')
+
+
+if __name__ == '__main__':
+    test_main()

mobile_mcp_ai-2.5.8/tests/test_mind_improved.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+测试用例: 打开Mind应用测试
+生成时间: 2025-12-17 10:52:37
+"""
+import time
+import uiautomator2 as u2
+
+PACKAGE_NAME = "com.im30.mind"
+
+# 广告关闭按钮关键词（可自定义）
+AD_CLOSE_KEYWORDS = ['关闭', '跳过', 'Skip', 'Close', '×', 'X', '我知道了', '稍后再说']
+
+
+def smart_wait(d, timeout=10):
+    """智能等待页面稳定"""
+    d.implicitly_wait(timeout)
+    time.sleep(0.5)  # 额外等待动画
+
+
+def close_ad_if_exists(d):
+    """尝试关闭广告弹窗"""
+    for keyword in AD_CLOSE_KEYWORDS:
+        elem = d(textContains=keyword)
+        if elem.exists(timeout=0.5):
+            try:
+                elem.click()
+                print(f'  📢 关闭广告: {keyword}')
+                time.sleep(0.5)
+                return True
+            except:
+                pass
+    return False
+
+
+def safe_click(d, selector, timeout=5):
+    """安全点击（带等待和重试）"""
+    try:
+        if selector.exists(timeout=timeout):
+            selector.click()
+            return True
+        return False
+    except Exception as e:
+        print(f'  ⚠️ 点击失败: {e}')
+        return False
+
+
+def test_main():
+    # 连接设备
+    d = u2.connect()
+    d.implicitly_wait(10)  # 设置全局等待
+    
+    # 启动应用
+    d.app_start(PACKAGE_NAME)
+    smart_wait(d)
+    
+    # 尝试关闭启动广告
+    close_ad_if_exists(d)
+    
+    # 步骤1: 点击文本 'Mind'
+    safe_click(d, d(text='Mind'))
+    smart_wait(d)
+    close_ad_if_exists(d)  # 检查广告
+    
+    # 步骤2: 点击坐标 (540, 1200)
+    d.click(540, 1200)
+    smart_wait(d)
+    close_ad_if_exists(d)  # 检查广告
+    
+    # 步骤3: 输入文本 '测试'
+    d(resourceId='com.im30.mind:id/search').set_text('测试')
+    smart_wait(d)
+    
+    # 步骤4: 滑动 up
+    d.swipe_ext('up')
+    smart_wait(d)
+    
+    print('✅ 测试完成')
+
+
+if __name__ == '__main__':
+    test_main()