mobile-mcp-ai 2.3.1__py3-none-any.whl → 2.3.3__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -813,6 +813,97 @@ class BasicMobileToolsLite:
         except Exception as e:
             return {"success": False, "message": f"❌ 断言失败: {e}"}
     
+    def close_ad(self, keywords: Optional[List[str]] = None, max_attempts: int = 3) -> Dict:
+        """关闭广告弹窗
+        
+        自动检测并点击广告关闭按钮，支持多种关闭方式：
+        1. 文本匹配：关闭、跳过、Skip、Close 等
+        2. 特殊符号：×、X、✕ 等
+        3. content-desc 匹配
+        
+        Args:
+            keywords: 自定义关键词列表，默认使用内置关键词
+            max_attempts: 最大尝试次数，默认3次（处理多层弹窗）
+        
+        Returns:
+            关闭结果，包含关闭的广告数量
+        """
+        # 默认关键词（按优先级排序）
+        default_keywords = [
+            '关闭', '跳过', 'Skip', 'Close', 'close',
+            '×', 'X', '✕', '╳',
+            '我知道了', '稍后再说', '不再提示', '取消',
+            '知道了', '好的', '确定',
+            'Later', 'No thanks', 'Not now', 'Dismiss'
+        ]
+        
+        search_keywords = keywords if keywords else default_keywords
+        closed_count = 0
+        closed_items = []
+        
+        try:
+            for attempt in range(max_attempts):
+                found_in_this_round = False
+                
+                for keyword in search_keywords:
+                    try:
+                        if self._is_ios():
+                            ios_client = self._get_ios_client()
+                            if ios_client and hasattr(ios_client, 'wda'):
+                                # iOS: 尝试 name 和 label
+                                elem = ios_client.wda(name=keyword)
+                                if not elem.exists:
+                                    elem = ios_client.wda(label=keyword)
+                                if not elem.exists:
+                                    elem = ios_client.wda(nameContains=keyword)
+                                
+                                if elem.exists:
+                                    elem.click()
+                                    time.sleep(0.5)
+                                    closed_count += 1
+                                    closed_items.append(keyword)
+                                    found_in_this_round = True
+                                    break
+                        else:
+                            # Android: 尝试 text 和 content-desc
+                            elem = self.client.u2(text=keyword)
+                            if not elem.exists(timeout=0.2):
+                                elem = self.client.u2(textContains=keyword)
+                            if not elem.exists(timeout=0.2):
+                                elem = self.client.u2(description=keyword)
+                            if not elem.exists(timeout=0.2):
+                                elem = self.client.u2(descriptionContains=keyword)
+                            
+                            if elem.exists(timeout=0.2):
+                                elem.click()
+                                time.sleep(0.5)
+                                closed_count += 1
+                                closed_items.append(keyword)
+                                found_in_this_round = True
+                                break
+                    except Exception:
+                        continue
+                
+                if not found_in_this_round:
+                    # 这一轮没找到广告，退出
+                    break
+            
+            if closed_count > 0:
+                return {
+                    "success": True,
+                    "closed_count": closed_count,
+                    "closed_items": closed_items,
+                    "message": f"✅ 已关闭 {closed_count} 个广告弹窗: {', '.join(closed_items)}"
+                }
+            else:
+                return {
+                    "success": True,
+                    "closed_count": 0,
+                    "message": "✅ 未发现广告弹窗（或已全部关闭）"
+                }
+        except Exception as e:
+            return {"success": False, "message": f"❌ 关闭广告失败: {e}"}
+    
     # ==================== 脚本生成 ====================
     
     def get_operation_history(self, limit: Optional[int] = None) -> Dict:

mobile_mcp/core/ios_client_wda.py

@@ -548,3 +548,4 @@ class IOSClientWDA:
 
 
 
+

mobile_mcp/core/mobile_client.py

@@ -380,10 +380,12 @@ class MobileClient:
                                         break
                                 
                                 if not found:
-                                    # 🎯 定位失败，自动使用Cursor AI视觉识别（截图分析）
-                                    print(f"  ⚠️  元素'{ref}'未找到，自动使用Cursor AI视觉识别（截图分析）...", file=sys.stderr)
+                                    # 🎯 定位失败，提示用户
+                                    # 注意：CursorVisionHelper 是实验性功能，当前版本建议使用 MCP 方式
+                                    print(f"  ⚠️  元素'{ref}'未找到", file=sys.stderr)
                                     try:
                                         from .locator.cursor_vision_helper import CursorVisionHelper
+                                        print(f"  🔍 尝试使用Cursor AI视觉识别...", file=sys.stderr)
                                         cursor_helper = CursorVisionHelper(self)
                                         # 🎯 传递 auto_analyze=True，自动创建请求文件并等待结果
                                         cursor_result = await cursor_helper.analyze_with_cursor(element, auto_analyze=True)
@@ -415,12 +417,17 @@ class MobileClient:
                                             # 其他情况，抛出异常
                                             screenshot_path = cursor_result.get('screenshot_path', 'unknown') if cursor_result else 'unknown'
                                             raise ValueError(f"Cursor AI分析失败: {screenshot_path}")
+                                    except ImportError:
+                                        # CursorVisionHelper 模块不存在，跳过视觉识别
+                                        print(f"  💡 提示：建议使用 MCP 方式调用，Cursor AI 会自动进行视觉识别", file=sys.stderr)
                                     except ValueError as ve:
                                         if "Cursor AI" in str(ve):
                                             raise ve
                                         print(f"  ⚠️  Cursor视觉识别失败: {ve}", file=sys.stderr)
+                                    except Exception as e:
+                                        print(f"  ⚠️  视觉识别异常: {e}", file=sys.stderr)
                                     
-                                    raise ValueError(f"无法找到元素: {ref}（已等待3秒，并尝试Cursor视觉识别，可能元素不存在）")
+                                    raise ValueError(f"无法找到元素: {ref}（建议使用 MCP 方式，Cursor AI 会自动进行视觉识别）")
             
             # 验证点击（可选）
             page_changed = False
@@ -818,29 +825,34 @@ class MobileClient:
                     return {"success": False, "reason": str(e)}
             
             # Android平台
-            # 🎯 优先使用智能启动（推荐）
+            # 🎯 尝试使用智能启动（如果模块存在）
             if smart_wait:
-                from .smart_app_launcher import SmartAppLauncher
-                launcher = SmartAppLauncher(self)
-                # 优化：快速模式，最多3秒
-                smart_wait_time = min(wait_time, 3)
-                
-                # 🎯 从环境变量读取是否自动关闭广告（默认True）
-                import os
-                auto_close_ads = os.environ.get('AUTO_CLOSE_ADS', 'true').lower() in ['true', '1', 'yes']
-                
-                result = await launcher.launch_with_smart_wait(
-                    package_name,
-                    max_wait=smart_wait_time,
-                    auto_close_ads=auto_close_ads
-                )
-                
-                # 打印截图路径（供Cursor AI查看验证）
-                if result.get('screenshot_path'):
-                    print(f"\n📸 启动截图已保存: {result['screenshot_path']}", file=sys.stderr)
-                    print(f"💡 提示: 请查看截图确认App是否已正确进入主页", file=sys.stderr)
-                
-                return result
+                try:
+                    from .smart_app_launcher import SmartAppLauncher
+                    launcher = SmartAppLauncher(self)
+                    # 优化：快速模式，最多3秒
+                    smart_wait_time = min(wait_time, 3)
+                    
+                    # 🎯 从环境变量读取是否自动关闭广告（默认True）
+                    import os
+                    auto_close_ads = os.environ.get('AUTO_CLOSE_ADS', 'true').lower() in ['true', '1', 'yes']
+                    
+                    result = await launcher.launch_with_smart_wait(
+                        package_name,
+                        max_wait=smart_wait_time,
+                        auto_close_ads=auto_close_ads
+                    )
+                    
+                    # 打印截图路径（供Cursor AI查看验证）
+                    if result.get('screenshot_path'):
+                        print(f"\n📸 启动截图已保存: {result['screenshot_path']}", file=sys.stderr)
+                        print(f"💡 提示: 请查看截图确认App是否已正确进入主页", file=sys.stderr)
+                    
+                    return result
+                except ImportError:
+                    # SmartAppLauncher 模块不存在，使用传统方式
+                    print(f"  💡 智能启动模块未安装，使用传统启动方式", file=sys.stderr)
+                    # 继续执行下面的传统方式
             
             # 传统方式（快速启动，不等待加载）
             print(f"  📱 启动App: {package_name}", file=sys.stderr)

mobile_mcp/mcp_tools/mcp_server.py

@@ -379,6 +379,32 @@ class MobileMCPServer:
             }
         ))
         
+        tools.append(Tool(
+            name="mobile_close_ad",
+            description="📢 关闭广告弹窗（自动检测并点击关闭按钮）\n\n"
+                       "🎯 自动检测以下关闭方式：\n"
+                       "- 文本：关闭、跳过、Skip、Close、我知道了、稍后再说\n"
+                       "- 符号：×、X、✕ 等\n"
+                       "- 无障碍描述（content-desc）\n\n"
+                       "💡 支持多层弹窗，最多尝试3次\n"
+                       "✅ 比视觉识别更准确，推荐使用！",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "keywords": {
+                        "type": "array",
+                        "items": {"type": "string"},
+                        "description": "自定义关键词列表（可选，默认使用内置关键词）"
+                    },
+                    "max_attempts": {
+                        "type": "number",
+                        "description": "最大尝试次数（可选，默认3次，用于处理多层弹窗）"
+                    }
+                },
+                "required": []
+            }
+        ))
+        
         # ==================== pytest 脚本生成 ====================
         tools.append(Tool(
             name="mobile_get_operation_history",
@@ -514,6 +540,13 @@ class MobileMCPServer:
                 result = self.tools.assert_text(arguments["text"])
                 return [TextContent(type="text", text=self.format_response(result))]
             
+            elif name == "mobile_close_ad":
+                result = self.tools.close_ad(
+                    arguments.get("keywords"),
+                    arguments.get("max_attempts", 3)
+                )
+                return [TextContent(type="text", text=self.format_response(result))]
+            
             # 脚本生成
             elif name == "mobile_get_operation_history":
                 result = self.tools.get_operation_history(arguments.get("limit"))

{mobile_mcp_ai-2.3.1.dist-info → mobile_mcp_ai-2.3.3.dist-info}/METADATA

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

{mobile_mcp_ai-2.3.1.dist-info → mobile_mcp_ai-2.3.3.dist-info}/RECORD

@@ -1,25 +1,25 @@
 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=_D8QmVO3UAYHvQ50C4vyd_N7LubEjt6zwUhLXfZffLE,47894
+mobile_mcp/core/basic_tools_lite.py,sha256=7C2Z87vG69fqmR0FiOC3qxshdo9Sjl5jhADiIFTC8uk,52023
 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=aE-j79hqIOF5_9LdEZ7hF8Fwm0pPwXRITsfRW9c9hhE,18751
+mobile_mcp/core/ios_client_wda.py,sha256=St6nOeXW0wiolLm6iQ2Etuwr1cvzwnlnYwGUxA3-JD4,18752
 mobile_mcp/core/ios_device_manager_wda.py,sha256=A44glqI-24un7qST-E3w6BQD8mV92YVUbxy4rLlTScY,11264
-mobile_mcp/core/mobile_client.py,sha256=o8DMIspGhyo8U3HRb5C8I9i3tlh7M4NAe281I0oPc0M,61969
+mobile_mcp/core/mobile_client.py,sha256=lmscB8-osGh_ngVG9XdNGe6fNJLsAwNI5qUSobE-Ln8,62964
 mobile_mcp/core/utils/__init__.py,sha256=RhMMsPszmEn8Q8GoNufypVSHJxyM9lio9U6jjpnuoPI,378
 mobile_mcp/core/utils/logger.py,sha256=XXQAHUwT1jc70pq_tYFmL6f_nKrFlYm3hcgl-5RYRg0,3402
 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=-1nXie3q4co9bAPhKI7QAO-hC4zflB-iEqVhozshP4w,24353
+mobile_mcp/mcp_tools/mcp_server.py,sha256=pAph7z6ERezoK3aAVqc8OkZ7sPllQhPPsIW1HlDC12g,25892
 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.3.1.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.3.1.dist-info/METADATA,sha256=kA5qxvfDBVPeAXncNFCIFA9gTuecrIIr_VKxNrML-c4,9705
-mobile_mcp_ai-2.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mobile_mcp_ai-2.3.1.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.3.1.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.3.1.dist-info/RECORD,,
+mobile_mcp_ai-2.3.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.3.3.dist-info/METADATA,sha256=Ur70uKGsYUu_Ibg6jZ9XLpdx3bod8Ir_pLXSoGe6KD4,9705
+mobile_mcp_ai-2.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mobile_mcp_ai-2.3.3.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.3.3.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.3.3.dist-info/RECORD,,