mobile-mcp-ai 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -1313,13 +1313,13 @@ class BasicMobileToolsLite:
                         page_texts = self._get_page_texts(10)
                         return {"success": True, "page_texts": page_texts}
                     
-                    # 选择器失败，用坐标兜底
+                    # 选择器失败，用控件中心坐标点兜底
                     if bounds:
                         x = (bounds[0] + bounds[2]) // 2
                         y = (bounds[1] + bounds[3]) // 2
                         self.client.u2.click(x, y)
                         time.sleep(0.3)
-                        self._record_click('percent', f"{x_pct}%,{y_pct}%", x_pct, y_pct,
+                        self._record_click('coords', f"{x},{y}", x_pct, y_pct,
                                           element_desc=text)
                         # 验证逻辑
                         if verify:
@@ -1373,12 +1373,14 @@ class BasicMobileToolsLite:
         except Exception as e:
             return {"success": True, "verified": False, "hint": f"验证异常: {e}"}
     
-    def _find_element_in_tree(self, text: str, position: Optional[str] = None) -> Optional[Dict]:
-        """在 XML 树中查找包含指定文本的元素，优先返回可点击的元素
+    def _find_element_in_tree(self, text: str, position: Optional[str] = None, exact_match: bool = True) -> Optional[Dict]:
+        """在 XML 树中查找指定文本的元素，优先返回可点击的元素
         
         Args:
             text: 要查找的文本
             position: 位置信息，用于在有多个相同文案时筛选
+            exact_match: 是否精确匹配。True=优先精确匹配（用于定位元素如点击），
+                        False=只进行包含匹配（用于验证元素）
         """
         try:
             xml = self.client.u2.dump_hierarchy(compressed=False)
@@ -1410,26 +1412,40 @@ class BasicMobileToolsLite:
                 attr_type = None
                 attr_value = None
                 
-                # 精确匹配 text
-                if elem_text == text:
-                    is_match = True
-                    attr_type = 'text'
-                    attr_value = text
-                # 精确匹配 content-desc
-                elif elem_desc == text:
-                    is_match = True
-                    attr_type = 'description'
-                    attr_value = text
-                # 模糊匹配 text
-                elif text in elem_text:
-                    is_match = True
-                    attr_type = 'textContains'
-                    attr_value = text
-                # 模糊匹配 content-desc
-                elif text in elem_desc:
-                    is_match = True
-                    attr_type = 'descriptionContains'
-                    attr_value = text
+                if exact_match:
+                    # 精确匹配模式（用于定位元素）：优先精确匹配
+                    # 精确匹配 text
+                    if elem_text == text:
+                        is_match = True
+                        attr_type = 'text'
+                        attr_value = text
+                    # 精确匹配 content-desc
+                    elif elem_desc == text:
+                        is_match = True
+                        attr_type = 'description'
+                        attr_value = text
+                    # 精确匹配找不到时，再尝试包含匹配（作为兜底）
+                    elif text in elem_text:
+                        is_match = True
+                        attr_type = 'textContains'
+                        attr_value = text
+                    # 包含匹配 content-desc
+                    elif text in elem_desc:
+                        is_match = True
+                        attr_type = 'descriptionContains'
+                        attr_value = text
+                else:
+                    # 包含匹配模式（用于验证元素）：只进行包含匹配
+                    # 包含匹配 text
+                    if text in elem_text:
+                        is_match = True
+                        attr_type = 'textContains'
+                        attr_value = text
+                    # 包含匹配 content-desc
+                    elif text in elem_desc:
+                        is_match = True
+                        attr_type = 'descriptionContains'
+                        attr_value = text
                 
                 if is_match and bounds:
                     # 计算元素的中心点坐标
@@ -1448,6 +1464,17 @@ class BasicMobileToolsLite:
             if not matched_elements:
                 return None
             
+            # 精确匹配模式下，优先返回精确匹配的元素（text/description），再返回包含匹配的元素
+            if exact_match:
+                exact_matches = [m for m in matched_elements if m['attr_type'] in ['text', 'description']]
+                contains_matches = [m for m in matched_elements if m['attr_type'] in ['textContains', 'descriptionContains']]
+                # 如果有精确匹配，优先使用精确匹配的结果
+                if exact_matches:
+                    matched_elements = exact_matches + contains_matches
+                # 如果没有精确匹配，使用包含匹配的结果
+                else:
+                    matched_elements = contains_matches
+            
             # 如果有位置信息，根据位置筛选
             if position and len(matched_elements) > 1:
                 position_lower = position.lower()
@@ -1486,6 +1513,7 @@ class BasicMobileToolsLite:
                 }
             
             # 没有位置信息时，优先返回可点击的元素
+            # 由于前面已经排序（精确匹配在前），这里会优先返回精确匹配且可点击的元素
             for match in matched_elements:
                 if match['clickable']:
                     return {
@@ -3300,7 +3328,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'])
@@ -3326,6 +3354,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}

{mobile_mcp_ai-2.7.3.dist-info → mobile_mcp_ai-2.7.5.dist-info}/METADATA

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

{mobile_mcp_ai-2.7.3.dist-info → mobile_mcp_ai-2.7.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mobile_mcp/__init__.py,sha256=sQJZTL_sxQFzmcS7jOtS2AHCfUySz40vhX96N6u1qy4,816
 mobile_mcp/config.py,sha256=-xSl9vahp3EFAA97P1ahcnQC-HHAFvccGHpnFAXeKHU,5841
 mobile_mcp/core/__init__.py,sha256=ndMy-cLAIsQDG5op7gM_AIplycqZSZPWEkec1pEhvEY,170
-mobile_mcp/core/basic_tools_lite.py,sha256=DPLPVoi-e-KsYAHANXKlBqCcJPBaE4lV_Qvf-zjL9Ng,219759
+mobile_mcp/core/basic_tools_lite.py,sha256=XRt_T4sWtUpZZFs4fnZsxEMk8x1F3bdoK-8FK-frf08,223778
 mobile_mcp/core/device_manager.py,sha256=xG5DoeNFs45pl-FTEhEWblqVwxtFK-FmVEGlNL6EqRI,8798
 mobile_mcp/core/dynamic_config.py,sha256=Ja1n1pfb0HspGByqk2_A472mYVniKmGtNEWyjUjmgK8,9811
 mobile_mcp/core/ios_client_wda.py,sha256=Nq9WxevhTWpVpolM-Ymp-b0nUQV3tXLFszmJHbDC4wA,18770
@@ -24,9 +24,9 @@ mobile_mcp/utils/__init__.py,sha256=8EH0i7UGtx1y_j_GEgdN-cZdWn2sRtZSEOLlNF9HRnY,
 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.7.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.7.3.dist-info/METADATA,sha256=60jvdRSHcL4QWPCaeiFxLunyBbT_2wkYF0UIo-Fq4v0,11505
-mobile_mcp_ai-2.7.3.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-mobile_mcp_ai-2.7.3.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.7.3.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.7.3.dist-info/RECORD,,
+mobile_mcp_ai-2.7.5.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.7.5.dist-info/METADATA,sha256=N1FCdAUoa4yJ9Rkbawl7n_kNn7sYPYYkR3GzoTBssEg,11505
+mobile_mcp_ai-2.7.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mobile_mcp_ai-2.7.5.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.7.5.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.7.5.dist-info/RECORD,,

{mobile_mcp_ai-2.7.3.dist-info → mobile_mcp_ai-2.7.5.dist-info}/WHEEL

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