Merge remote-tracking branch 'origin/master'

src/scrcpy-ed.bat

@@ -0,0 +1,82 @@
+@echo off
+setlocal enabledelayedexpansion
+
+:: 窗口大小
+mode con: cols=50 lines=15
+
+:: -----------------------------
+:: scrcpy 和 adb 路径
+:: 优先使用批处理目录，其次直接 AppData
+:: -----------------------------
+if exist "%~dp0scrcpy.exe" (
+    set SCRCPY_PATH=%~dp0scrcpy.exe
+    set ADB_PATH=%~dp0adb.exe
+) else (
+    set SCRCPY_PATH=%APPDATA%\scrcpy.exe
+    set ADB_PATH=%APPDATA%\adb.exe
+)
+
+:: 已启动设备列表
+set started=
+
+:: 扫描间隔（秒）
+set scan_interval=5
+
+:loop
+cls
+echo =========================================
+echo          jasen88飞猪-投屏工具
+echo =========================================
+
+:: 统计当前在线设备数量
+set device_count=0
+for /f "skip=1 tokens=1,2" %%a in ('"%ADB_PATH%" devices') do (
+    if "%%b"=="device" set /a device_count+=1
+)
+
+:: -----------------------------
+:: 1. 检查已启动设备是否仍在线，如果不在线就移除并提示
+:: -----------------------------
+for %%d in (!started!) do (
+    "%ADB_PATH%" -s %%d get-state >nul 2>&1
+    if errorlevel 1 (
+        echo 设备 %%d 已断开！
+        set started=!started: %%d=!
+    )
+)
+
+:: -----------------------------
+:: 2. 扫描当前在线设备，如果未启动则启动并提示
+:: -----------------------------
+for /f "skip=1 tokens=1,2" %%a in ('"%ADB_PATH%" devices') do (
+    if "%%b"=="device" (
+        set id=%%a
+        echo !started! | find "%%a" >nul
+        if errorlevel 1 (
+            echo 新设备 %%a 已连接，启动投屏...
+            start "" /B "%SCRCPY_PATH%" -s %%a
+            set started=!started! %%a
+            timeout /t 5 >nul
+        )
+    )
+)
+
+:: -----------------------------
+:: 3. 动态倒计时显示
+:: -----------------------------
+set /a counter=%scan_interval%
+:cd_loop
+cls
+echo =========================================
+echo          jasen88飞猪-投屏工具
+echo =========================================
+echo 当前连接设备 %device_count% 个，在 %counter% 秒后扫描新设备...
+echo ----------------------------------------
+
+set /a counter-=1
+if %counter% gtr 0 (
+    ping -n 2 127.0.0.1 >nul
+    goto cd_loop
+)
+
+goto loop

src/scrcpy-user.bat

@@ -1,21 +1,22 @@
 ::[Bat To Exe Converter]
 ::
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbnZ5U9zzcP1skNGHs=
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJBGQhdbFypbxtU
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kznephjxnRd+A==
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJBCR8WfBO/Dg==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kTgd9gozn86
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqok1XVU1tsCC3s=
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1mTgd6Ek2FtKkYUIABc4
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqos0ngUndMJbA==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1mTgd6Ek2E9JmuocBVVcch7L
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoM0nhtkcUtHBIWeh6nDg==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kTydpkp03kXzppCCBdUHg==
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoM0nhtkcU5Hxl5bhvlagM4yQ==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kTyc5k/23tO1Z1dQh9UcnI=
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoswHlVnM4PQU0JMBanYm8=
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kTyYIIk2jcPwYUIABc4
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoswHxVisYNGFYOL1yvYgNU
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kntd4M+1DcL1ptCCBdUHg==
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoswG9OkcdBWUIWeh6nDg==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1kr0cJgS10VOndkBBRVZci2jax0x52xDogQ=
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoh33hPi8lBXVUIMBanYm8=
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbnZ5U9zzRfgM5s
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoixn9Up8ozGB5KcxulbwMLoWtQsyqHNtP8
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbnZ5U9zzdZl8UfAxddMBCqem8=
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJCCQNdHg==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbnZ5U9zzdUl8gDAghXchfleA0nyQ==
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJBDxRWbR2na0E2qHoi
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbnZ5U9zzdJndkaCQk4
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJBAhRbcRy4YQMx53hApQQ=
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1nbAWcRj0nZW+A==
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+1WhZiNJBHx5KaBe5Dg==
-::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lbzZ5M+13dKlM5BWVVcch7L
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqoe8lYI1s8AAHs=
+::fBE1pAF6MU+EWHreyHcjLQlHcCWxCViGIroL5uT07u6UnkccR+cxINeWzrubMK1C1lb2dqo+wWhfi8oBHBddM0flagM4yQ==
 ::YAwzoRdxOk+EWAjk
 ::fBw5plQjdCyDJGyX8VAjFDpneTe+GG6pDaET+NT55v6Ft0oiUuMpcYzU1PqHI+9z
 ::YAwzuBVtJxjWCl3EqQJgSA==
@@ -23,16 +24,16 @@
 ::Yhs/ulQjdF25
 ::cxAkpRVqdFKZSDk=
 ::cBs/ulQjdF25
-::ZR41oxFsdFKZSDk=
+::ZR41oxFsdFKZSTk=
 ::eBoioBt6dFKZSDk=
 ::cRo6pxp7LAbNWATEpSI=
 ::egkzugNsPRvcWATEpCI=
 ::dAsiuh18IRvcCxnZtBJQ
 ::cRYluBh/LU+EWAnk
-::YxY4rhs+aU+JeA==
+::YxY4rhs+aU+IeA==
-::cxY6rQJ7JhzQF1fEqQJQ
+::cxY6rQJ7JhzQF1fEqQJhZkkaHWQ=
-::ZQ05rAF9IBncCkqN+0xwdVs0
+::ZQ05rAF9IBncCkqN+0xwdVsFAlbMbQs=
-::ZQ05rAF9IAHYFVzEqQJQ
+::ZQ05rAF9IAHYFVzEqQK56+XToM4E1p4/11oKubqqjw==
 ::eg0/rx1wNQPfEVWB+kM9LVsJDGQ=
 ::fBEirQZwNQPfEVWB+kM9LVsJDGQ=
 ::cRolqwZ3JBvQF1fEqQJQ
@@ -42,7 +43,7 @@
 ::ZQ0/vhVqMQ3MEVWAtB9wSA==
 ::Zg8zqx1/OA3MEVWAtB9wSA==
 ::dhA7pRFwIByZRRnk
-::Zh4grVQjdCyDJGyX8VAjFDpneTe+GG6pDaET+NTx7vmCrBVF3SHB/2MRlzJk1WXCBVO1O8R8mH9Cnas=
+::Zh4grVQjdCyDJGyX8VAjFDpneTe+GG6pDaET+NTx7vmCrBVF3SHB/2MRlzJk1WXCBVO1J8dj02Jf+A==
 ::YB416Ek+ZG8=
 ::
 ::
@@ -54,16 +55,10 @@ setlocal enabledelayedexpansion
 mode con: cols=50 lines=15
 
 :: -----------------------------
-:: scrcpy 和 adb 路径
+:: scrcpy ºÍ adb ·¾¶£¨¹Ì¶¨Ê¹Óà AppData£©
-:: 优先使用批处理目录，其次直接 AppData
 :: -----------------------------
-if exist "%~dp0scrcpy.exe" (
-    set SCRCPY_PATH=%~dp0scrcpy.exe
-    set ADB_PATH=%~dp0adb.exe
-) else (
 set SCRCPY_PATH=%APPDATA%\scrcpy.exe
 set ADB_PATH=%APPDATA%\adb.exe
-)
 
 :: ÒÑÆô¶¯É豸Áбí
 set started=