mobile-mcp-ai 2.3.6__py3-none-any.whl → 2.3.8__py3-none-any.whl

mobile_mcp/core/basic_tools_lite.py

@@ -652,7 +652,14 @@ class BasicMobileToolsLite:
     # ==================== 输入操作 ====================
     
     def input_text_by_id(self, resource_id: str, text: str) -> Dict:
-        """通过 resource-id 输入文本"""
+        """通过 resource-id 输入文本
+        
+        优化策略：
+        1. 先用 resourceId 定位
+        2. 如果只有 1 个元素 → 直接输入
+        3. 如果有多个相同 ID（>5个说明 ID 不可靠）→ 改用 EditText 类型定位
+        4. 多个 EditText 时选择最靠上的（搜索框通常在顶部）
+        """
         try:
             if self._is_ios():
                 ios_client = self._get_ios_client()
@@ -667,13 +674,70 @@ class BasicMobileToolsLite:
                         return {"success": True, "message": f"✅ 输入成功: '{text}'"}
                     return {"success": False, "message": f"❌ 输入框不存在: {resource_id}"}
             else:
-                elem = self.client.u2(resourceId=resource_id)
-                if elem.exists(timeout=0.5):
-                    elem.set_text(text)
-                    time.sleep(0.3)
-                    self._record_operation('input', element=resource_id, ref=resource_id, text=text)
-                    return {"success": True, "message": f"✅ 输入成功: '{text}'"}
+                elements = self.client.u2(resourceId=resource_id)
+                
+                # 检查是否存在
+                if elements.exists(timeout=0.5):
+                    count = elements.count
+                    
+                    # 只有 1 个元素，直接输入
+                    if count == 1:
+                        elements.set_text(text)
+                        time.sleep(0.3)
+                        self._record_operation('input', element=resource_id, ref=resource_id, text=text)
+                        return {"success": True, "message": f"✅ 输入成功: '{text}'"}
+                    
+                    # 多个相同 ID（<=5个），尝试智能选择
+                    if count <= 5:
+                        for i in range(count):
+                            try:
+                                elem = elements[i]
+                                info = elem.info
+                                # 优先选择可编辑的
+                                if info.get('editable') or info.get('focusable'):
+                                    elem.set_text(text)
+                                    time.sleep(0.3)
+                                    self._record_operation('input', element=resource_id, ref=resource_id, text=text)
+                                    return {"success": True, "message": f"✅ 输入成功: '{text}'"}
+                            except:
+                                continue
+                        # 没找到可编辑的，用第一个
+                        elements[0].set_text(text)
+                        time.sleep(0.3)
+                        self._record_operation('input', element=resource_id, ref=resource_id, text=text)
+                        return {"success": True, "message": f"✅ 输入成功: '{text}'"}
+                
+                # ID 不可靠（不存在或太多），改用 EditText 类型定位
+                edit_texts = self.client.u2(className='android.widget.EditText')
+                if edit_texts.exists(timeout=0.5):
+                    et_count = edit_texts.count
+                    if et_count == 1:
+                        edit_texts.set_text(text)
+                        time.sleep(0.3)
+                        self._record_operation('input', element='EditText', ref='EditText', text=text)
+                        return {"success": True, "message": f"✅ 输入成功: '{text}' (通过 EditText 定位)"}
+                    
+                    # 多个 EditText，选择最靠上的
+                    best_elem = None
+                    min_top = 9999
+                    for i in range(et_count):
+                        try:
+                            elem = edit_texts[i]
+                            top = elem.info.get('bounds', {}).get('top', 9999)
+                            if top < min_top:
+                                min_top = top
+                                best_elem = elem
+                        except:
+                            continue
+                    
+                    if best_elem:
+                        best_elem.set_text(text)
+                        time.sleep(0.3)
+                        self._record_operation('input', element='EditText', ref='EditText', text=text)
+                        return {"success": True, "message": f"✅ 输入成功: '{text}' (通过 EditText 定位，选择最顶部的)"}
+                
                 return {"success": False, "message": f"❌ 输入框不存在: {resource_id}"}
+                    
         except Exception as e:
             return {"success": False, "message": f"❌ 输入失败: {e}"}
     
@@ -941,9 +1005,10 @@ class BasicMobileToolsLite:
         """智能关闭弹窗
         
         策略：
-        1. 从控件树找可能的关闭按钮（clickable=true，尺寸小，位置靠右上角）
-        2. 如果找到，计算中心点并点击
-        3. 如果没找到，返回需要视觉识别的提示
+        1. 从控件树找可能的关闭按钮（clickable=true，尺寸小）
+        2. 搜索范围：右上角、左上角、正下方中间、右下角、左下角
+        3. 如果找到，计算中心点并点击
+        4. 如果没找到，返回需要视觉识别的提示
         """
         try:
             # 获取屏幕尺寸
@@ -979,14 +1044,44 @@ class BasicMobileToolsLite:
                 center_x = (x1 + x2) // 2
                 center_y = (y1 + y2) // 2
                 
-                # 关闭按钮特征：尺寸小（30-100px），位置偏右上
-                if 30 <= width <= 100 and 30 <= height <= 100:
-                    # 计算"右上角"得分（越靠右上越高）
-                    right_score = center_x / screen_width  # 0-1，越大越靠右
-                    top_score = 1 - (center_y / screen_height)  # 0-1，越大越靠上
-                    # 只考虑屏幕上半部分、右半部分的按钮
-                    if center_y < screen_height * 0.6 and center_x > screen_width * 0.5:
-                        score = right_score * 0.5 + top_score * 0.5
+                # 关闭按钮特征：尺寸小（20-120px）
+                if 20 <= width <= 120 and 20 <= height <= 120:
+                    # 计算位置得分，支持多个区域
+                    score = 0
+                    position = ""
+                    
+                    # 相对位置（0-1）
+                    rel_x = center_x / screen_width
+                    rel_y = center_y / screen_height
+                    
+                    # 右上角（最常见）: x > 0.6, y < 0.4
+                    if rel_x > 0.6 and rel_y < 0.4:
+                        score = 1.0 + (rel_x - 0.6) * 2 + (0.4 - rel_y) * 2
+                        position = "右上角"
+                    
+                    # 左上角: x < 0.4, y < 0.4
+                    elif rel_x < 0.4 and rel_y < 0.4:
+                        score = 0.9 + (0.4 - rel_x) * 2 + (0.4 - rel_y) * 2
+                        position = "左上角"
+                    
+                    # 正下方中间（弹窗底部）: 0.3 < x < 0.7, y > 0.5
+                    elif 0.3 < rel_x < 0.7 and rel_y > 0.5:
+                        # 越靠近中间下方得分越高
+                        center_score = 1 - abs(rel_x - 0.5) * 2
+                        score = 0.8 + center_score * 0.5 + (rel_y - 0.5) * 0.5
+                        position = "正下方"
+                    
+                    # 右下角: x > 0.6, y > 0.6
+                    elif rel_x > 0.6 and rel_y > 0.6:
+                        score = 0.7 + (rel_x - 0.6) + (rel_y - 0.6)
+                        position = "右下角"
+                    
+                    # 左下角: x < 0.4, y > 0.6
+                    elif rel_x < 0.4 and rel_y > 0.6:
+                        score = 0.6 + (0.4 - rel_x) + (rel_y - 0.6)
+                        position = "左下角"
+                    
+                    if score > 0:
                         close_candidates.append({
                             'bounds': bounds,
                             'center_x': center_x,
@@ -994,6 +1089,7 @@ class BasicMobileToolsLite:
                             'width': width,
                             'height': height,
                             'score': score,
+                            'position': position,
                             'resource_id': elem.get('resource_id', ''),
                             'text': elem.get('text', '')
                         })
@@ -1002,7 +1098,8 @@ class BasicMobileToolsLite:
                 return {
                     "success": False,
                     "message": "❌ 控件树未找到关闭按钮，请使用截图+视觉识别",
-                    "suggestion": "尝试局部截图右上角区域，用 crop_x, crop_y, crop_size 参数"
+                    "suggestion": "先全屏截图让 AI 分析关闭按钮位置，再用局部截图精确定位",
+                    "screen_size": f"{screen_width}x{screen_height}"
                 }
             
             # 按得分排序，取最可能的
@@ -1022,9 +1119,11 @@ class BasicMobileToolsLite:
             
             return {
                 "success": True,
-                "message": f"✅ 点击关闭按钮: ({best['center_x']}, {best['center_y']})",
+                "message": f"✅ 点击关闭按钮 ({best['position']}): ({best['center_x']}, {best['center_y']})",
                 "bounds": best['bounds'],
-                "candidates_count": len(close_candidates)
+                "position": best['position'],
+                "candidates_count": len(close_candidates),
+                "all_positions": [c['position'] for c in close_candidates[:5]]
             }
             
         except Exception as e:

{mobile_mcp_ai-2.3.6.dist-info → mobile_mcp_ai-2.3.8.dist-info}/METADATA

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

{mobile_mcp_ai-2.3.6.dist-info → mobile_mcp_ai-2.3.8.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=uqd-YG9vTxQmJEVmio_z_yj8LOeZnhvRP7YxvSueuZs,59803
+mobile_mcp/core/basic_tools_lite.py,sha256=Z4K9TTGR-vyvk7MzWGiE7Mwarnckqji5ToH5GpFKo5Y,64772
 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=KudSbWTy-0l8OMQjXpsDYAiL59w7HVrw-i7ApfExJLA,18755
@@ -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.6.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-mobile_mcp_ai-2.3.6.dist-info/METADATA,sha256=sJOSvqLIeuVVfxEE0mR_AyuT37uzBnnCHwM1EV3k_1g,9423
-mobile_mcp_ai-2.3.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mobile_mcp_ai-2.3.6.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
-mobile_mcp_ai-2.3.6.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
-mobile_mcp_ai-2.3.6.dist-info/RECORD,,
+mobile_mcp_ai-2.3.8.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+mobile_mcp_ai-2.3.8.dist-info/METADATA,sha256=E5wnga67GNtSj3kqS7_KDYGtt3ckgw90Vq4McIFksP0,9423
+mobile_mcp_ai-2.3.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mobile_mcp_ai-2.3.8.dist-info/entry_points.txt,sha256=KB_FglozgPHBprSM1vFbIzGyheFuHFmGanscRdMJ_8A,68
+mobile_mcp_ai-2.3.8.dist-info/top_level.txt,sha256=lLm6YpbTv855Lbh8BIA0rPxhybIrvYUzMEk9OErHT94,11
+mobile_mcp_ai-2.3.8.dist-info/RECORD,,