mobile-mcp-ai 2.7.4__tar.gz → 2.7.6__tar.gz

{mobile_mcp_ai-2.7.4/mobile_mcp_ai.egg-info → mobile_mcp_ai-2.7.6}/PKG-INFO

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

{mobile_mcp_ai-2.7.4 → mobile_mcp_ai-2.7.6}/core/basic_tools_lite.py

@@ -2687,6 +2687,11 @@ class BasicMobileToolsLite:
                     # class 精简：只保留关键类型
                     if class_name in ('EditText', 'TextInput', 'Button', 'ImageButton', 'CheckBox', 'Switch'):
                         item['type'] = class_name
+                    # 重要：对于 ImageView 等图片类控件，即使没有其他属性，只要有 bounds 就应该返回
+                    # 因为 ImageView 可能是关闭按钮、图标等，对测试很重要
+                    if not item and bounds and class_name in ('ImageView', 'Image', 'ImageButton'):
+                        item['bounds'] = bounds
+                        item['type'] = class_name
                     return item
                 
                 result = []
@@ -3185,6 +3190,10 @@ class BasicMobileToolsLite:
                     center_x = (x1 + x2) // 2
                     center_y = (y1 + y2) // 2
                     
+                    # 计算相对位置（统一在循环开始计算，避免重复计算）
+                    rel_x = center_x / screen_width
+                    rel_y = center_y / screen_height
+                    
                     # 收集所有可点击元素（用于兜底策略：当只有一个可点击元素时点击它）
                     if clickable:
                         all_clickable_elements.append({
@@ -3215,6 +3224,22 @@ class BasicMobileToolsLite:
                         in_popup = (px1 - margin_side <= center_x <= px2 + margin_side and 
                                    py1 - margin_top <= center_y <= py2 + margin_bottom)
                         
+                        # 【新增】兼容第三方广告页面：右上角的 ImageView 即使不在弹窗范围内，也可能是在弹窗上方的关闭按钮
+                        # 判断条件：ImageView 位于屏幕右上角（rel_x > 0.85, rel_y < 0.15）且尺寸合适
+                        is_top_right_imageview = (
+                            'Image' in class_name and
+                            not clickable and
+                            rel_x > 0.85 and
+                            rel_y < 0.15 and
+                            15 <= width <= 120 and
+                            15 <= height <= 120
+                        )
+                        
+                        # 如果是右上角 ImageView，即使不在弹窗范围内，也认为是关闭按钮候选
+                        if is_top_right_imageview:
+                            in_popup = True
+                            is_floating_close = True  # 标记为浮动关闭按钮
+                        
                         # 检查是否是浮动关闭按钮（在弹窗外侧：上方或下方）
                         # 上方浮动关闭按钮（常见：右上角外侧）
                         if center_y < py1 and center_y > py1 - margin_top:
@@ -3241,8 +3266,14 @@ class BasicMobileToolsLite:
                         # 浮动关闭按钮（在弹窗上方外侧）给予高额加分
                         if is_floating_close:
                             popup_edge_bonus += 5.0  # 大幅加分
+                        # 右上角 ImageView 额外加分（第三方广告页面常见）
+                        if is_top_right_imageview:
+                            popup_edge_bonus += 2.0  # 额外加分
                     elif not popup_detected:
-                        # 没有检测到弹窗时，只处理有明确关闭特征的元素
+                        # 没有检测到弹窗时，处理有明确关闭特征的元素
+                        # 同时，也考虑底部中央的 clickable 小元素（可能是关闭按钮）
+                        # 注意：右上角的 ImageView 只在有弹窗的情况下才识别，避免误识别正常页面的右上角图标
+                        
                         # 检查是否有明确的关闭特征（文本、resource-id、content-desc）
                         has_explicit_close_feature = (
                             text in close_texts or
@@ -3251,18 +3282,24 @@ class BasicMobileToolsLite:
                             'dismiss' in resource_id.lower() or
                             'cancel' in resource_id.lower()
                         )
-                        if not has_explicit_close_feature:
-                            continue  # 没有明确关闭特征，跳过
-                        # 有明确关闭特征时，允许处理
+                        
+                        # 【新增】底部中央的 clickable 小元素也可能是关闭按钮（常见于全屏广告、激励视频等）
+                        is_bottom_center_clickable = (
+                            clickable and
+                            rel_y > 0.75 and  # 底部区域（屏幕下方 25%）
+                            0.35 < rel_x < 0.65 and  # 中央区域（屏幕中间 30%）
+                            width >= 20 and width <= 150 and  # 合理尺寸
+                            height >= 20 and height <= 150
+                        )
+                        
+                        if not has_explicit_close_feature and not is_bottom_center_clickable:
+                            continue  # 没有明确关闭特征，且不是底部中央的 clickable 小元素，跳过
+                        # 有明确关闭特征或底部中央 clickable 小元素时，允许处理
                         in_popup = True
                     
                     if not in_popup:
                         continue
                     
-                    # 相对位置（0-1）
-                    rel_x = center_x / screen_width
-                    rel_y = center_y / screen_height
-                    
                     score = 0
                     match_type = ""
                     position = self._get_position_name(rel_x, rel_y)
@@ -3280,7 +3317,7 @@ class BasicMobileToolsLite:
                     # ===== 策略3：clickable 的小尺寸元素（优先于非 clickable）=====
                     elif clickable:
                         min_size = max(20, int(screen_width * 0.03))
-                        max_size = max(120, int(screen_width * 0.15))
+                        max_size = max(150, int(screen_width * 0.15))  # 扩大最大尺寸，兼容更大的关闭按钮
                         if min_size <= width <= max_size and min_size <= height <= max_size:
                             # clickable 元素基础分更高
                             base_score = 8.0
@@ -3288,6 +3325,10 @@ class BasicMobileToolsLite:
                             if is_floating_close:
                                 base_score = 12.0
                                 match_type = "floating_close"
+                            # 【新增】底部中央的 clickable 小元素（可能是关闭按钮，常见于全屏广告）
+                            elif rel_y > 0.75 and 0.35 < rel_x < 0.65:
+                                base_score = 10.0  # 给予较高分数
+                                match_type = "bottom_center_close"
                             elif 'Image' in class_name:
                                 score = base_score + 2.0
                                 match_type = "clickable_image"
@@ -3296,12 +3337,19 @@ class BasicMobileToolsLite:
                             score = base_score + self._get_position_score(rel_x, rel_y) + popup_edge_bonus
                     
                     # ===== 策略4：ImageView/ImageButton 类型的小元素（非 clickable）=====
+                    # 【增强】兼容第三方广告页面：右上角的 ImageView 即使 clickable="false" 也识别为关闭按钮
                     elif 'Image' in class_name:
                         min_size = max(15, int(screen_width * 0.02))
                         max_size = max(120, int(screen_width * 0.12))
                         if min_size <= width <= max_size and min_size <= height <= max_size:
-                            score = 5.0 + self._get_position_score(rel_x, rel_y) + popup_edge_bonus
-                            match_type = "ImageView"
+                            base_score = 5.0
+                            # 右上角的 ImageView 给予更高分数（第三方广告页面常见）
+                            if rel_x > 0.85 and rel_y < 0.15:
+                                base_score = 8.0  # 提高分数，优先识别
+                                match_type = "ImageView_top_right"
+                            else:
+                                match_type = "ImageView"
+                            score = base_score + self._get_position_score(rel_x, rel_y) + popup_edge_bonus
                     
                     # XML 顺序加分（后出现的元素在上层，更可能是弹窗内的元素）
                     if score > 0:
@@ -3328,7 +3376,7 @@ class BasicMobileToolsLite:
                 pass
             
             if not close_candidates:
-                # 兜底策略：如果检测到弹窗但未找到关闭按钮，且页面元素很少（只有1个可点击元素），直接点击它
+                # 兜底策略1：如果检测到弹窗但未找到关闭按钮，且页面元素很少（只有1个可点击元素），直接点击它
                 if popup_detected and popup_bounds and len(all_clickable_elements) == 1:
                     single_element = all_clickable_elements[0]
                     self.client.u2.click(single_element['center_x'], single_element['center_y'])
@@ -3354,6 +3402,37 @@ class BasicMobileToolsLite:
                             result["returned"] = return_result['success']
                     return result
                 
+                # 兜底策略2：即使未检测到弹窗，如果页面只有一个可点击元素，也尝试点击它（可能是特殊类型的弹窗）
+                # 这种情况通常出现在：下载浮层、特殊弹窗等，它们的 resource-id 可能不包含 dialog/popup 等关键词
+                if len(all_clickable_elements) == 1:
+                    single_element = all_clickable_elements[0]
+                    # 检查元素是否占据较大屏幕区域（可能是弹窗）
+                    element_area_ratio = (single_element['width'] * single_element['height']) / (screen_width * screen_height)
+                    # 如果元素占据屏幕 20% 以上，认为是可能的弹窗
+                    if element_area_ratio > 0.2:
+                        self.client.u2.click(single_element['center_x'], single_element['center_y'])
+                        time.sleep(0.5)
+                        
+                        # 检查应用是否跳转
+                        app_check = self._check_app_switched()
+                        return_result = None
+                        if app_check['switched']:
+                            return_result = self._return_to_target_app()
+                        
+                        # 记录操作
+                        rel_x = single_element['center_x'] / screen_width
+                        rel_y = single_element['center_y'] / screen_height
+                        self._record_click('percent', f"{round(rel_x * 100, 1)}%,{round(rel_y * 100, 1)}%", 
+                                          round(rel_x * 100, 1), round(rel_y * 100, 1),
+                                          element_desc="唯一可点击元素(特殊弹窗兜底)")
+                        
+                        result = {"success": True, "clicked": True, "method": "single_clickable_special_popup_fallback"}
+                        if app_check['switched']:
+                            result["switched"] = True
+                            if return_result:
+                                result["returned"] = return_result['success']
+                        return result
+                
                 # 如果没有找到关闭按钮，且不满足兜底条件，返回fallback
                 if popup_detected and popup_bounds:
                     return {"success": False, "fallback": "vision", "popup": True}
@@ -3522,8 +3601,69 @@ class BasicMobileToolsLite:
                     has_mask_layer = True
                     mask_idx = elem['idx']
             
-            # 跳过全屏元素
-            if area_ratio > 0.9:
+            # 先检查是否有强弹窗特征（用于后续判断）
+            has_strong_popup_feature = (
+                any(kw in class_name for kw in dialog_class_keywords) or
+                any(kw in resource_id.lower() for kw in dialog_id_keywords) or
+                any(kw in resource_id.lower() for kw in ad_popup_keywords)  # 广告弹窗关键词
+            )
+            
+            # 检查是否有子元素是关闭按钮（作为弹窗特征）
+            has_close_button_child = False
+            elem_bounds = elem['bounds']
+            for other_elem in all_elements:
+                if other_elem['idx'] == elem['idx']:
+                    continue
+                if other_elem['is_close_button']:
+                    # 检查关闭按钮是否在这个元素范围内
+                    ox1, oy1, ox2, oy2 = other_elem['bounds']
+                    ex1, ey1, ex2, ey2 = elem_bounds
+                    if ex1 <= ox1 and ey1 <= oy1 and ex2 >= ox2 and ey2 >= oy2:
+                        has_close_button_child = True
+                        break
+            
+            # 检查是否有右上角的 ImageView 关闭按钮（全屏广告页常见）
+            has_top_right_close = False
+            if area_ratio > 0.9:  # 全屏元素才检查
+                for other_elem in all_elements:
+                    if other_elem['idx'] == elem['idx']:
+                        continue
+                    # 检查是否是右上角的 ImageView
+                    ox1, oy1, ox2, oy2 = other_elem['bounds']
+                    o_center_x = other_elem['center_x']
+                    o_center_y = other_elem['center_y']
+                    o_width = other_elem['width']
+                    o_height = other_elem['height']
+                    o_class = other_elem['class']
+                    
+                    rel_x = o_center_x / screen_width
+                    rel_y = o_center_y / screen_height
+                    
+                    # 右上角的 ImageView（即使 clickable="false"）
+                    if ('Image' in o_class and
+                        rel_x > 0.85 and rel_y < 0.15 and
+                        15 <= o_width <= 120 and 15 <= o_height <= 120):
+                        # 检查是否在当前元素范围内或附近
+                        if (ex1 <= ox1 and ey1 <= oy1 and ex2 >= ox2 and ey2 >= oy2) or \
+                           (abs(ex2 - ox1) < 50 and abs(ey1 - oy2) < 50):  # 在元素右上角附近
+                            has_top_right_close = True
+                            break
+            
+            # 【特殊处理】全屏广告页：如果面积 > 90% 但有关闭按钮或广告特征，也识别为弹窗
+            is_fullscreen_ad = (
+                area_ratio > 0.9 and
+                (
+                    # 有关闭按钮作为子元素
+                    has_close_button_child or
+                    # 有右上角的 ImageView 关闭按钮
+                    has_top_right_close or
+                    # 有广告相关的强特征
+                    any(kw in resource_id.lower() for kw in ad_popup_keywords)
+                )
+            )
+            
+            # 如果不是全屏广告页，跳过全屏元素
+            if area_ratio > 0.9 and not is_fullscreen_ad:
                 continue
             
             # 跳过太小的元素
@@ -3546,27 +3686,6 @@ class BasicMobileToolsLite:
                 if 'search' in resource_id.lower() or 'Search' in class_name:
                     continue  # 跳过顶部搜索栏
             
-            # 先检查是否有强弹窗特征（用于后续判断）
-            has_strong_popup_feature = (
-                any(kw in class_name for kw in dialog_class_keywords) or
-                any(kw in resource_id.lower() for kw in dialog_id_keywords) or
-                any(kw in resource_id.lower() for kw in ad_popup_keywords)  # 广告弹窗关键词
-            )
-            
-            # 检查是否有子元素是关闭按钮（作为弹窗特征）
-            has_close_button_child = False
-            elem_bounds = elem['bounds']
-            for other_elem in all_elements:
-                if other_elem['idx'] == elem['idx']:
-                    continue
-                if other_elem['is_close_button']:
-                    # 检查关闭按钮是否在这个元素范围内
-                    ox1, oy1, ox2, oy2 = other_elem['bounds']
-                    ex1, ey1, ex2, ey2 = elem_bounds
-                    if ex1 <= ox1 and ey1 <= oy1 and ex2 >= ox2 and ey2 >= oy2:
-                        has_close_button_child = True
-                        break
-            
             # 【非弹窗特征】如果元素包含明显的页面内容特征，则不是弹窗
             # 检查是否包含视频播放器、内容列表等页面元素
             page_content_keywords = ['video', 'player', 'recycler', 'list', 'scroll', 'viewpager', 'fragment']
@@ -3605,6 +3724,10 @@ class BasicMobileToolsLite:
             if has_close_button_child:
                 confidence += 0.3
             
+            # 【强特征】全屏广告页且有右上角关闭按钮 (+0.4)
+            if is_fullscreen_ad and has_top_right_close:
+                confidence += 0.4
+            
             # 【中等特征】居中显示 (+0.2)
             # 但如果没有强特征，降低权重
             center_x = elem['center_x']
@@ -3616,7 +3739,8 @@ class BasicMobileToolsLite:
                 any(kw in class_name for kw in dialog_class_keywords) or
                 any(kw in resource_id.lower() for kw in dialog_id_keywords) or
                 any(kw in resource_id.lower() for kw in ad_popup_keywords) or
-                has_close_button_child
+                has_close_button_child or
+                (is_fullscreen_ad and has_top_right_close)  # 全屏广告页且有右上角关闭按钮
             )
             
             if is_centered_x and is_centered_y:
@@ -4812,4 +4936,92 @@ class BasicMobileToolsLite:
             return {"success": False, "error": f"需要安装依赖: {e}"}
         except Exception as e:
             return {"success": False, "error": f"添加模板失败: {e}"}
+    
+    def open_new_chat(self, message: str = "继续执行飞书用例") -> Dict:
+        """打开 Cursor 新会话并发送消息
+        
+        用于飞书用例批量执行时，自动分批继续。
+        
+        Args:
+            message: 发送到新会话的消息，默认"继续执行飞书用例"
+        
+        Returns:
+            执行结果
+        
+        依赖:
+            pip install pyautogui pyperclip pygetwindow (macOS/Windows)
+        """
+        import sys
+        import platform
+        
+        try:
+            import pyautogui
+            import pyperclip
+        except ImportError:
+            return {
+                "success": False,
+                "error": "缺少依赖，请执行: pip install pyautogui pyperclip pygetwindow"
+            }
+        
+        try:
+            system = platform.system()
+            
+            # 1. 激活 Cursor 窗口
+            if system == "Darwin":  # macOS
+                import subprocess
+                # 使用 osascript 激活 Cursor
+                script = '''
+                tell application "Cursor"
+                    activate
+                end tell
+                '''
+                subprocess.run(["osascript", "-e", script], check=True)
+                time.sleep(0.3)
+                
+                # 2. 快捷键打开新会话 (Cmd+T)
+                pyautogui.hotkey('command', 't')
+                
+            elif system == "Windows":
+                try:
+                    import pygetwindow as gw
+                    cursor_windows = gw.getWindowsWithTitle('Cursor')
+                    if cursor_windows:
+                        cursor_windows[0].activate()
+                        time.sleep(0.3)
+                except:
+                    pass  # 如果激活失败，继续尝试发送快捷键
+                
+                # 2. 快捷键打开新会话 (Ctrl+T)
+                pyautogui.hotkey('ctrl', 't')
+                
+            else:  # Linux
+                # 2. 快捷键打开新会话 (Ctrl+T)
+                pyautogui.hotkey('ctrl', 't')
+            
+            time.sleep(0.5)  # 等待新会话打开
+            
+            # 3. 复制消息到剪贴板并粘贴
+            pyperclip.copy(message)
+            time.sleep(0.1)
+            
+            if system == "Darwin":
+                pyautogui.hotkey('command', 'v')
+            else:
+                pyautogui.hotkey('ctrl', 'v')
+            
+            time.sleep(0.2)
+            
+            # 4. 按 Enter 发送
+            pyautogui.press('enter')
+            
+            return {
+                "success": True,
+                "message": f"✅ 已打开新会话并发送: {message}"
+            }
+            
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"打开新会话失败: {e}"
+            }
 

{mobile_mcp_ai-2.7.4 → mobile_mcp_ai-2.7.6}/mcp_tools/mcp_server.py

@@ -867,6 +867,19 @@ class MobileMCPServer:
             }
         ))
         
+        # ==================== Cursor 会话管理 ====================
+        tools.append(Tool(
+            name="mobile_open_new_chat",
+            description="🆕 打开Cursor新会话。用于飞书用例批量执行时自动分批继续。",
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "message": {"type": "string", "description": "发送到新会话的消息", "default": "继续执行飞书用例"}
+                },
+                "required": []
+            }
+        ))
+        
         return tools
     
     async def handle_tool_call(self, name: str, arguments: dict):
@@ -1152,6 +1165,12 @@ class MobileMCPServer:
                     result = {"success": False, "error": "请提供 x_percent/y_percent 或 screenshot_path/x/y/width/height"}
                 return [TextContent(type="text", text=self.format_response(result))]
             
+            # Cursor 会话管理
+            elif name == "mobile_open_new_chat":
+                message = arguments.get("message", "继续执行飞书用例")
+                result = self.tools.open_new_chat(message)
+                return [TextContent(type="text", text=self.format_response(result))]
+            
             else:
                 return [TextContent(type="text", text=f"❌ 未知工具: {name}")]
         
@@ -1174,7 +1193,7 @@ async def async_main():
     async def call_tool(name: str, arguments: dict):
         return await server.handle_tool_call(name, arguments)
     
-    print("🚀 Mobile MCP Server 启动中... [26 个工具]", file=sys.stderr)
+    print("🚀 Mobile MCP Server 启动中... [27 个工具]", file=sys.stderr)
     print("📱 支持 Android / iOS", file=sys.stderr)
     print("👁️ 完全依赖 Cursor 视觉能力，无需 AI 密钥", file=sys.stderr)
     

{mobile_mcp_ai-2.7.4 → mobile_mcp_ai-2.7.6/mobile_mcp_ai.egg-info}/PKG-INFO

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

{mobile_mcp_ai-2.7.4 → mobile_mcp_ai-2.7.6}/setup.py

@@ -25,7 +25,7 @@ if requirements_file.exists():
 
 setup(
     name="mobile-mcp-ai",
-    version="2.7.4",  # 优化_find_element_in_tree支持精确匹配和包含匹配，优化点击失败时使用控件中心坐标
+    version="2.7.6",  # 更新飞书用例执行规则：执行状态改为执行结果，支持PASS/FAIL
     author="douzi",
     author_email="1492994674@qq.com",
     description="移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）",