's'

web-console/components/live-product/LiveAndroidStreamConsole.tsx

@@ -176,6 +176,8 @@ export function LiveAndroidStreamConsole({
   const [connBusy, setConnBusy] = useState(false);
   const [bookmarks, setBookmarks] = useState<string[]>([]);
   const [scrcpyStream, setScrcpyStream] = useState(false);
+  /** 用户在本机序列号上点了「关闭真流」后，不再自动拉起，直到切换设备。 */
+  const [scrcpyUserStoppedForSerial, setScrcpyUserStoppedForSerial] = useState<string | null>(null);
   const [scrcpyConnected, setScrcpyConnected] = useState(false);
   const [scrcpyErr, setScrcpyErr] = useState<string | null>(null);
   const [scrcpyInfo, setScrcpyInfo] = useState<{
@@ -288,6 +290,45 @@ export function LiveAndroidStreamConsole({
     if (!scrcpyStream) setScrcpyErr(null);
   }, [scrcpyStream]);
 
+  useEffect(() => {
+    setScrcpyUserStoppedForSerial(null);
+  }, [serial]);
+
+  useEffect(() => {
+    const row = devices.find((d) => d.serial === serial);
+    const userStopped = Boolean(serial && scrcpyUserStoppedForSerial === serial);
+    const canAuto =
+      adbAvailable &&
+      Boolean(serial) &&
+      row?.state === "device" &&
+      Boolean(scrcpyInfo?.server_jar) &&
+      webCodecsH264Supported() &&
+      !userStopped;
+
+    if (canAuto) {
+      setScrcpyStream(true);
+      setLiveMs(0);
+      return;
+    }
+
+    if (userStopped || !serial || !adbAvailable) {
+      setScrcpyStream(false);
+      return;
+    }
+    if (scrcpyInfo && !scrcpyInfo.server_jar) {
+      setScrcpyStream(false);
+      return;
+    }
+    if (!webCodecsH264Supported()) {
+      setScrcpyStream(false);
+      return;
+    }
+    if (row && row.state !== "device") {
+      setScrcpyStream(false);
+      return;
+    }
+  }, [serial, devices, adbAvailable, scrcpyInfo, scrcpyUserStoppedForSerial]);
+
   useEffect(() => {
     if (!scrcpyStream || !serial || !adbAvailable) {
       wsRef.current?.close();
@@ -666,8 +707,8 @@ export function LiveAndroidStreamConsole({
                 </h3>
                 <p className="mt-1 max-w-xl text-[11px] leading-relaxed text-zinc-500">
                   {t(
-                    "统一适配 USB / Redroid / 无线 adb：可选官方 scrcpy-server 经 WebSocket 的 H.264 真流（与桌面 ",
-                    "USB / Redroid / wireless adb: optional real H.264 from official scrcpy-server over WebSocket (same stack as ",
+                    "统一适配 USB / Redroid / 无线 adb：已授权设备默认走官方 scrcpy-server 的 WebSocket H.264 真流（与桌面 ",
+                    "USB / Redroid / wireless adb: authorized devices default to official scrcpy-server WebSocket H.264 (same stack as ",
                   )}
                   <a href={ESCRCPY_URL} target="_blank" rel="noreferrer" className="text-emerald-300/90 underline-offset-2 hover:underline">
                     escrcpy
@@ -676,7 +717,7 @@ export function LiveAndroidStreamConsole({
                   <a href={SCRCPY_URL} target="_blank" rel="noreferrer" className="text-emerald-300/90 underline-offset-2 hover:underline">
                     scrcpy
                   </a>
-                  {t("）；截图轮询作备用。", "); polled PNG as fallback.")}
+                  {t("）；无 jar 或关闭真流时用截图。", "); PNG screenshot when jar missing or stream off.")}
                 </p>
               </div>
             </div>
@@ -818,11 +859,13 @@ export function LiveAndroidStreamConsole({
                   onClick={() => {
                     setScrcpyStream((v) => {
                       const next = !v;
-                      notify(
-                        next
-                          ? t("已请求 Scrcpy 真流（WebSocket）", "Scrcpy WebSocket stream starting")
-                          : t("已关闭 Scrcpy 真流", "Scrcpy stream stopped"),
-                      );
+                      if (next) {
+                        setScrcpyUserStoppedForSerial(null);
+                        notify(t("已开启实时画面（H.264 WebSocket）", "Live H.264 WebSocket stream on"));
+                      } else {
+                        if (serial) setScrcpyUserStoppedForSerial(serial);
+                        notify(t("已关闭实时画面（将使用截图）", "Live stream off — screenshot mode"));
+                      }
                       return next;
                     });
                   }}
@@ -833,7 +876,7 @@ export function LiveAndroidStreamConsole({
                   }`}
                 >
                   <Radio className="h-3 w-3" />
-                  {scrcpyStream ? t("关闭真流", "Stop WS") : t("Scrcpy 真流", "Scrcpy WS")}
+                  {scrcpyStream ? t("关闭真流", "Stop WS") : t("实时画面", "Live H.264")}
                 </button>
               </div>
               {scrcpyInfo && !scrcpyInfo.server_jar ? (