mobile-mcp-ai 2.3.9__py3-none-any.whl → 2.4.1__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -1376,10 +1376,19 @@ class BasicMobileToolsLite:
             if not close_candidates:
                 # 控件树未找到，自动截全屏图供 AI 分析
                 screenshot_result = self.take_screenshot(description="弹窗全屏", compress=True)
+                
+                # 构建更详细的视觉分析提示
+                visual_hint = "请仔细查看截图，找到关闭按钮（通常是 × 或 X 图标）。"
+                if popup_bounds:
+                    px1, py1, px2, py2 = popup_bounds
+                    visual_hint += f" 弹窗区域大约在 [{px1},{py1}] 到 [{px2},{py2}]，关闭按钮通常在弹窗的右上角或正上方。"
+                else:
+                    visual_hint += " 关闭按钮通常在屏幕右上角、弹窗右上角、或弹窗下方中间位置。"
+                
                 return {
                     "success": False,
                     "message": "❌ 控件树未找到关闭按钮，已截全屏图供 AI 视觉分析",
-                    "action_required": "请分析截图找到 X 关闭按钮位置，然后调用 mobile_click_at_coords",
+                    "action_required": visual_hint + " 找到后调用 mobile_click_at_coords(x, y, image_width, image_height, original_img_width, original_img_height) 点击。",
                     "screenshot": screenshot_result.get("screenshot_path", ""),
                     "screen_size": {"width": screen_width, "height": screen_height},
                     "image_size": {
@@ -1392,7 +1401,14 @@ class BasicMobileToolsLite:
                     },
                     "popup_detected": popup_bounds is not None,
                     "popup_bounds": f"[{popup_bounds[0]},{popup_bounds[1]}][{popup_bounds[2]},{popup_bounds[3]}]" if popup_bounds else None,
-                    "tip": "找到 X 按钮后，直接调用 mobile_click_at_coords(x, y, image_width, image_height, original_img_width, original_img_height)"
+                    "search_areas": [
+                        "弹窗右上角（最常见）",
+                        "弹窗正上方外侧（浮动X按钮）",
+                        "弹窗下方中间（某些广告）",
+                        "屏幕右上角"
+                    ],
+                    "button_features": "关闭按钮通常是：小圆形/方形图标、灰色或白色、带有 × 或 X 符号",
+                    "tip": "注意：不要点击广告内容区域，只点击关闭按钮"
                 }
             
             # 按得分排序，取最可能的
@@ -1401,7 +1417,10 @@ class BasicMobileToolsLite:
             
             # 点击
             self.client.u2.click(best['center_x'], best['center_y'])
-            time.sleep(0.3)
+            time.sleep(0.5)
+            
+            # 点击后截图，让 AI 判断是否成功
+            screenshot_result = self.take_screenshot("关闭弹窗后")
             
             # 记录操作（使用百分比，跨设备兼容）
             self._record_operation(
@@ -1415,20 +1434,30 @@ class BasicMobileToolsLite:
                 ref=f"close_popup_{best['position']}"
             )
             
+            # 返回候选按钮列表，让 AI 看截图判断
+            # 如果弹窗还在，AI 可以选择点击其他候选按钮
             return {
                 "success": True,
-                "message": f"✅ 点击关闭按钮 ({best['position']}): ({best['center_x']}, {best['center_y']})",
-                "match_type": best['match_type'],
-                "bounds": best['bounds'],
-                "position": best['position'],
-                "percent": f"({best['x_percent']}%, {best['y_percent']}%)",
+                "message": f"✅ 已点击关闭按钮 ({best['position']}): ({best['center_x']}, {best['center_y']})",
+                "clicked": {
+                    "position": best['position'],
+                    "match_type": best['match_type'],
+                    "coords": (best['center_x'], best['center_y']),
+                    "percent": (best['x_percent'], best['y_percent'])
+                },
+                "screenshot": screenshot_result.get("screenshot_path", ""),
                 "popup_detected": popup_bounds is not None,
                 "popup_bounds": f"[{popup_bounds[0]},{popup_bounds[1]}][{popup_bounds[2]},{popup_bounds[3]}]" if popup_bounds else None,
-                "candidates_count": len(close_candidates),
-                "top_candidates": [
-                    {"position": c['position'], "type": c['match_type'], "score": round(c['score'], 1)}
-                    for c in close_candidates[:3]
-                ]
+                "other_candidates": [
+                    {
+                        "position": c['position'], 
+                        "type": c['match_type'], 
+                        "coords": (c['center_x'], c['center_y']),
+                        "percent": (c['x_percent'], c['y_percent'])
+                    }
+                    for c in close_candidates[1:4]  # 返回其他3个候选，AI 可以选择
+                ],
+                "tip": "请查看截图判断弹窗是否已关闭。如果弹窗还在，可以尝试点击 other_candidates 中的其他位置；如果误点跳转了，请按返回键"
             }
             
         except Exception as e:

{mobile_mcp_ai-2.3.9.dist-info → mobile_mcp_ai-2.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mobile-mcp-ai
-Version: 2.3.9
+Version: 2.4.1
 Summary: 移动端自动化 MCP Server - 支持 Android/iOS，AI 功能可选（基础工具不需要 AI）
 Home-page: https://github.com/test111ddff-hash/mobile-mcp-ai
 Author: douzi
@@ -31,6 +31,20 @@ 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: Appium-Python-Client>=3.0.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"
@@ -40,20 +54,19 @@ 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"
-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: Appium-Python-Client>=3.0.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"
+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
 
 # 📱 Mobile MCP AI
 

{mobile_mcp_ai-2.3.9.dist-info → mobile_mcp_ai-2.4.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=ki2hTa-1Liupuvf0alQSQMRvKiZM2FJ-hdLVCAVSBOA,83010
+mobile_mcp/core/basic_tools_lite.py,sha256=1fa9DwbZtv-HoCIq7F3Sqv_-1ik6CpX7rfVXEk00ums,84798
 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=QUAoILP3P54YF1TtwgTNXxh8C_uHbuUjlMEdghA6-mk,18757
@@ -17,9 +17,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.3.9.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.3.9.dist-info/METADATA,sha256=t_t_XDylk8sWdLkT276_v85ExSx7Ux8UX85sxtWRP28,9423
-mobile_mcp_ai-2.3.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mobile_mcp_ai-2.3.9.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.3.9.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.3.9.dist-info/RECORD,,
+mobile_mcp_ai-2.4.1.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.4.1.dist-info/METADATA,sha256=b5dKb1bsDbLW3j9JX9323_LTp3GwxlFtzUR0IjBPIrs,9705
+mobile_mcp_ai-2.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mobile_mcp_ai-2.4.1.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.4.1.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.4.1.dist-info/RECORD,,

{mobile_mcp_ai-2.3.9.dist-info → mobile_mcp_ai-2.4.1.dist-info}/WHEEL

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