mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-28 14:58:10 +08:00
Merge branch 'master' into nightly
This commit is contained in:
3
alas.bat
3
alas.bat
@@ -599,10 +599,7 @@ rem Keep local changes
|
|||||||
pause > NUL
|
pause > NUL
|
||||||
call :alas
|
call :alas
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
:: -----------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------
|
||||||
|
|
||||||
::Add paths
|
::Add paths
|
||||||
rem call :AddPath %ALAS_PATH%
|
rem call :AddPath %ALAS_PATH%
|
||||||
rem call :AddPath %ADB%
|
rem call :AddPath %ADB%
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ call %ADB% connect %ADB_PORT%
|
|||||||
if %menu%==8 GOTO adbss
|
if %menu%==8 GOTO adbss
|
||||||
if %menu%==9 GOTO u2ss
|
if %menu%==9 GOTO u2ss
|
||||||
if %menu%==10 GOTO adbc
|
if %menu%==10 GOTO adbc
|
||||||
|
if %menu%==11 GOTO adbcap
|
||||||
if %menu%==exit GOTO EOF
|
if %menu%==exit GOTO EOF
|
||||||
|
|
||||||
else (
|
else (
|
||||||
@@ -278,17 +279,33 @@ goto adbss
|
|||||||
:adbc
|
:adbc
|
||||||
rem create output file name and path from parameters and date and time
|
rem create output file name and path from parameters and date and time
|
||||||
::loop
|
::loop
|
||||||
|
call %ADB% -s %ADB_PORT% shell mkdir /sdcard/dcim/Screenshot 2>nul
|
||||||
:LOOP
|
:LOOP
|
||||||
FOR /f %%a IN ('WMIC OS GET LocalDateTime ^| FIND "."') DO SET DTS=%%a
|
FOR /f %%a IN ('WMIC OS GET LocalDateTime ^| FIND "."') DO SET DTS=%%a
|
||||||
SET DATETIME=%DTS:~0,8%-%DTS:~8,6%-%DTS:~9,2%
|
SET DATETIME=%DTS:~0,8%-%DTS:~8,6%-%DTS:~9,2%
|
||||||
SET SCREENCAP_FILE_NAME=screenshot-%DATETIME%.png
|
SET SCREENCAP_FILE_NAME=screenshot-%DATETIME%.png
|
||||||
SET SCREENCAP_FILE_PATH=%SCREENSHOT_FOLDER%\%SCREENCAP_FILE_NAME%
|
SET SCREENCAP_FILE_PATH=%SCREENSHOT_FOLDER%\%SCREENCAP_FILE_NAME%
|
||||||
::calling adb shell screencap, pull and remove the previos file
|
::calling adb shell screencap, pull and remove the previos file
|
||||||
call %ADB% -s %ADB_PORT% shell mkdir /sdcard/dcim/Screenshot 2>nul
|
|
||||||
call %ADB% -s %ADB_PORT% shell screencap -p /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
call %ADB% -s %ADB_PORT% shell screencap -p /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
||||||
call %ADB% -s %ADB_PORT% pull /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME% %SCREENCAP_FILE_PATH%
|
call %ADB% -s %ADB_PORT% pull /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME% %SCREENCAP_FILE_PATH%
|
||||||
call %ADB% -s %ADB_PORT% shell rm /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
call %ADB% -s %ADB_PORT% shell rm /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
||||||
goto:LOOP
|
goto:LOOP
|
||||||
|
:: -----------------------------------------------------------------------------
|
||||||
|
:adbcap
|
||||||
|
call %ADB% -s %ADB_PORT% shell mkdir /sdcard/dcim/Screenshot 2>nul
|
||||||
|
:begin
|
||||||
|
REM Set the Screenshot Capture Date and Time as found on the Android Device
|
||||||
|
FOR /f %%a IN ('WMIC OS GET LocalDateTime ^| FIND "."') DO SET DTS=%%a
|
||||||
|
SET DATETIME=%DTS:~0,8%-%DTS:~8,6%-%DTS:~9,2%
|
||||||
|
SET SCREENCAP_FILE_NAME=screenshot-%DATETIME%.png
|
||||||
|
SET SCREENCAP_FILE_PATH=%SCREENSHOT_FOLDER%\%capname%
|
||||||
|
REM Use ADB to take a screenshot within the newly created directory as above
|
||||||
|
call %ADB% -s %ADB_PORT% shell screencap -p /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
||||||
|
call %ADB% -s %ADB_PORT% pull /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME% %SCREENCAP_FILE_PATH%
|
||||||
|
call %ADB% -s %ADB_PORT% shell rm /sdcard/dcim/Screenshot/%SCREENCAP_FILE_NAME%
|
||||||
|
set /p DUMMY=Please Press the "Enter" key to continue with the infinite loop...
|
||||||
|
Goto begin
|
||||||
|
:: -----------------------------------------------------------------------------
|
||||||
|
|
||||||
:EOF
|
:EOF
|
||||||
exit
|
exit
|
||||||
Reference in New Issue
Block a user