myagent-ai 1.47.29 → 1.47.30

package/core/vnc_manager.py

@@ -56,6 +56,72 @@ logger = get_logger("myagent.vnc")
 
 DEFAULT_DISPLAY = ":99"
 DEFAULT_XVFB_RESOLUTION = "1080x1920x24"  # [v1.47.3] 默认竖屏(手机)，旋转切换到横屏
+
+
+def _detect_android_screen_size() -> Optional[tuple]:
+    """[v1.47.29] 检测 Android 设备屏幕物理尺寸（宽x高，像素）。
+
+    优先级:
+      1. 环境变量 MYAGENT_SCREEN (用户手动指定，格式 "1097x550")
+      2. getprop ro.hardware.screen_width/height (部分 ROM)
+      3. /sys/class/graphics/fb0/virtual_size (内核帧缓冲区)
+      4. getprop qemu.sf.lcd_density + ro.sf.lcd_density 推算
+
+    Returns:
+        (width, height) 元组，检测失败返回 None
+    """
+    # 1. 环境变量
+    env_screen = os.environ.get("MYAGENT_SCREEN", "").strip()
+    if env_screen and "x" in env_screen:
+        try:
+            parts = env_screen.lower().split("x")
+            w, h = int(parts[0]), int(parts[1])
+            if w > 0 and h > 0:
+                logger.info(f"屏幕尺寸来自环境变量 MYAGENT_SCREEN: {w}x{h}")
+                return (w, h)
+        except (ValueError, IndexError):
+            pass
+
+    # 2. getprop 属性（部分 ROM 有 ro.hardware.screen_width/height）
+    try:
+        result_w = subprocess.run(
+            ["getprop", "ro.hardware.screen_width"],
+            capture_output=True, text=True, timeout=3,
+        )
+        result_h = subprocess.run(
+            ["getprop", "ro.hardware.screen_height"],
+            capture_output=True, text=True, timeout=3,
+        )
+        if result_w.returncode == 0 and result_h.returncode == 0:
+            sw = result_w.stdout.strip()
+            sh = result_h.stdout.strip()
+            if sw and sh and sw.isdigit() and sh.isdigit():
+                w, h = int(sw), int(sh)
+                if w > 0 and h > 0:
+                    logger.info(f"屏幕尺寸来自 getprop: {w}x{h}")
+                    return (w, h)
+    except Exception:
+        pass
+
+    # 3. 内核帧缓冲区尺寸
+    fb_path = "/sys/class/graphics/fb0/virtual_size"
+    try:
+        if os.path.exists(fb_path):
+            with open(fb_path, "r") as f:
+                content = f.read().strip()
+            # 格式通常是 "1097,550"
+            if "," in content:
+                parts = content.split(",")
+                w, h = int(parts[0]), int(parts[1])
+                if w > 0 and h > 0:
+                    logger.info(f"屏幕尺寸来自帧缓冲区: {w}x{h}")
+                    return (w, h)
+    except Exception:
+        pass
+
+    return None
+
+
 DEFAULT_X11VNC_PORT = 5900
 DEFAULT_NOVNC_PORT = 6080  # WebSocket 代理端口（供 noVNC 客户端连接）
 
@@ -75,11 +141,21 @@ class VNCManager:
     def __init__(
         self,
         display: str = DEFAULT_DISPLAY,
-        resolution: str = DEFAULT_XVFB_RESOLUTION,
+        resolution: str = "",
         x11vnc_port: int = DEFAULT_X11VNC_PORT,
         novnc_port: int = DEFAULT_NOVNC_PORT,
     ):
         self.display = display
+        # [v1.47.29] 自动检测 Android 屏幕尺寸设置 VNC 分辨率
+        if not resolution:
+            screen_size = _detect_android_screen_size()
+            if screen_size:
+                w, h = screen_size
+                resolution = f"{w}x{h}x24"
+                logger.info(f"VNC 分辨率已适配设备屏幕: {w}x{h}")
+            else:
+                resolution = DEFAULT_XVFB_RESOLUTION
+                logger.info(f"未检测到设备屏幕尺寸，使用默认分辨率: {resolution}")
         self.resolution = resolution
         self.x11vnc_port = x11vnc_port
         self.novnc_port = novnc_port
@@ -5015,9 +5091,19 @@ exec "$BROWSER" "$@"
                 "-nowcr",             # 禁用 cursor shape updates
                 "-nocursorshape",
                 "-deferupdate", "5",  # 延迟更新（降低带宽）
-                "-scale", "2/3",      # 缩小 2/3（降低带宽）
             ]
 
+            # [v1.47.29] VNC 缩放策略：分辨率匹配屏幕时不缩放，大分辨率缩小 2/3
+            try:
+                res_parts = self.resolution.split("x")
+                res_w, res_h = int(res_parts[0]), int(res_parts[1])
+                if res_w * res_h > 1600 * 900:
+                    # 大分辨率（如 1080x1920）→ 缩小 2/3 降低带宽
+                    cmd.extend(["-scale", "2/3"])
+                # else: 小/匹配分辨率 → 不缩放，保持清晰
+            except (ValueError, IndexError):
+                cmd.extend(["-scale", "2/3"])
+
             # [v1.18.5] 不使用 -threads 模式：与 -scale 组合在 0.9.17 中
             # 会导致父进程 fork 后立即退出，端口延迟监听
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.47.29",
+  "version": "1.47.30",
   "description": "\u672c\u5730\u684c\u9762\u7aef\u6267\u884c\u578bAI\u52a9\u624b - Open Interpreter \u98ce\u683c | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {