fix: 多设备环境下所有adb命令统一带-s serial + 前端显示分辨率

根本原因：
- _device.extra['serial']从未被设置，导致adb命令不带-s参数
- 多设备环境（MuMu 7555 + emulator 5556）下adb命令冲突
- adb截图、点击、输入、force-stop等全部受影响

修复：
1. launch成功后从Appium caps提取deviceUDID保存到_device.extra['serial']
2. 将所有裸['adb','shell',...]改为使用_adb_args()（自动带-s参数）
   - launch中的force-stop/am-start
   - _rebuild_session_and_launch中的6处adb调用
   - _recover_u2_session中的kill_uia2
   - _is_u2_process_alive中的ps检测
   - _dismiss_keyboard中的keyevent
3. _adb_args()优先使用_device.extra['serial']（Appium真实UDID）
4. 前端设备检测加上分辨率+Android版本显示

Author: zcj220

extension/src/sidebarProvider.ts

@@ -1057,9 +1057,13 @@ ${commonRules}`;
       }
       const serial = lines[0].split("\t")[0];
       const model = (await run(`adb -s ${serial} shell getprop ro.product.model`)).trim() || serial;
+      const resRaw = (await run(`adb -s ${serial} shell wm size`)).trim();
+      const resolution = resRaw.includes(":") ? resRaw.split(":").pop()!.trim() : "";
+      const androidVer = (await run(`adb -s ${serial} shell getprop ro.build.version.release`)).trim();
+      const infoParts = [model, resolution, androidVer ? `Android ${androidVer}` : ""].filter(Boolean);
       this._postMessage({
         command: "deviceStatusResult",
-        data: { connected: true, message: `设备已连接：${model}`, deviceName: model },
+        data: { connected: true, message: `${infoParts.join("，")}`, deviceName: model },
       });
     } catch (err: unknown) {
       const message = err instanceof Error ? err.message : String(err);

src/controller/android.py

@@ -443,18 +443,21 @@ async def launch(self) -> None:
         # 先杀掉可能残留的 APP 和 U2 进程
         # Flutter app 如果已在运行且有活跃动画，XPath 策略会因 waitForIdle 卡死
         loop = asyncio.get_event_loop()
+        adb_pre = ["adb"]
+        if self._config.device_name:
+            adb_pre.extend(["-s", self._config.device_name])
         if self._config.app_package:
             await loop.run_in_executor(
                 None, lambda: subprocess.run(
-                    ["adb", "shell", "am", "force-stop", self._config.app_package],
+                    adb_pre + ["shell", "am", "force-stop", self._config.app_package],
                     capture_output=True, timeout=5,
                 )
             )
         for u2_pkg in ("io.appium.uiautomator2.server",
                         "io.appium.uiautomator2.server.test"):
             await loop.run_in_executor(
                 None, lambda pkg=u2_pkg: subprocess.run(
-                    ["adb", "shell", "am", "force-stop", pkg],
+                    adb_pre + ["shell", "am", "force-stop", pkg],
                     capture_output=True, timeout=5,
                 )
             )
@@ -483,6 +486,12 @@ async def launch(self) -> None:
             self._device.screen_width = int(parts[0])
             self._device.screen_height = int(parts[1])
         self._device.is_connected = True
+        # 保存设备序列号到extra，供adb命令（截图/点击/输入等）使用-s参数
+        device_udid = caps.get("deviceUDID", "") or caps.get("udid", "")
+        if device_udid:
+            self._device.extra["serial"] = device_udid
+        elif self._config.device_name:
+            self._device.extra["serial"] = self._config.device_name
 
         logger.info("Appium Session 创建成功 | ID={} | 设备={}",
                      self._session_id[:8], self._device.name)
@@ -518,9 +527,10 @@ async def launch(self) -> None:
             component = f"{self._config.app_package}/{self._config.app_activity}"
             try:
                 loop2 = asyncio.get_event_loop()
+                _adb_fg = self._adb_args()
                 await loop2.run_in_executor(
                     None, lambda: subprocess.run(
-                        ["adb", "shell", "am", "start", "-n", component],
+                        _adb_fg + ["shell", "am", "start", "-n", component],
                         capture_output=True, timeout=10,
                     )
                 )
@@ -644,9 +654,10 @@ async def _rebuild_session_and_launch(
         解决 Flutter app 重启后 UiAutomator2 Server 死锁的问题。
         """
         # 1. adb force-stop 杀掉 app
+        _adb = self._adb_args()
         await loop.run_in_executor(
             None, lambda: subprocess.run(
-                ["adb", "shell", "am", "force-stop", pkg],
+                _adb + ["shell", "am", "force-stop", pkg],
                 capture_output=True, timeout=10,
             )
         )
@@ -669,12 +680,12 @@ async def _rebuild_session_and_launch(
         #    新Session会复用死锁的Server，所以必须手动杀掉
         def _kill_uia2():
             subprocess.run(
-                ["adb", "shell", "am", "force-stop",
+                _adb + ["shell", "am", "force-stop",
                  "io.appium.uiautomator2.server"],
                 capture_output=True, timeout=5,
             )
             subprocess.run(
-                ["adb", "shell", "am", "force-stop",
+                _adb + ["shell", "am", "force-stop",
                  "io.appium.uiautomator2.server.test"],
                 capture_output=True, timeout=5,
             )
@@ -723,9 +734,10 @@ def _kill_uia2():
             logger.warning("设置waitForIdleTimeout失败: {}", e)
 
         # 6. 确保 APP 在前台
+        _adb2 = self._adb_args()
         await loop.run_in_executor(
             None, lambda: subprocess.run(
-                ["adb", "shell", "am", "start", "-n", component],
+                _adb2 + ["shell", "am", "start", "-n", component],
                 capture_output=True, timeout=10,
             )
         )
@@ -934,9 +946,10 @@ async def hide_keyboard(self) -> None:
             return
         loop = asyncio.get_event_loop()
         try:
+            _adb_kb = self._adb_args()
             await loop.run_in_executor(
                 None, lambda: subprocess.run(
-                    ["adb", "shell", "input", "keyevent", "111"],
+                    _adb_kb + ["shell", "input", "keyevent", "111"],
                     capture_output=True, timeout=5,
                 )
             )
@@ -1094,9 +1107,9 @@ def _capture():
     # ── Logcat 日志收集 ──────────────────────────────────
 
     def _adb_args(self) -> list[str]:
-        """构建带设备序列号的 adb 命令前缀。"""
+        """构建带设备序列号的 adb 命令前缀。多设备环境必须带 -s。"""
         cmd = ["adb"]
-        serial = self._config.device_name
+        serial = self._device.extra.get("serial", "") or self._config.device_name
         if serial:
             cmd.extend(["-s", serial])
         return cmd
@@ -1556,7 +1569,7 @@ def _is_u2_process_alive(self) -> bool:
         """同步检测设备上 UiAutomator2 Server 进程是否存活。"""
         try:
             r = subprocess.run(
-                ["adb", "shell", "ps", "-A"],
+                self._adb_args() + ["shell", "ps", "-A"],
                 capture_output=True, text=True, timeout=5,
             )
             return "uiautomator" in r.stdout
@@ -1582,11 +1595,12 @@ async def _recover_u2_session(self) -> None:
         self._session_id = None
 
         # 2. 清理残留的 U2 进程
+        _adb_r = self._adb_args()
         def _kill_uia2():
             for pkg in ("io.appium.uiautomator2.server",
                         "io.appium.uiautomator2.server.test"):
                 subprocess.run(
-                    ["adb", "shell", "am", "force-stop", pkg],
+                    _adb_r + ["shell", "am", "force-stop", pkg],
                     capture_output=True, timeout=5,
                 )
         await loop.run_in_executor(None, _kill_uia2)