Fix: fix wrong uiautomator2 init

Author: MetalDevOps

alas.bat

@@ -5,6 +5,15 @@
 :: Last updated: 2020-08-23
 :: >>> Get updated from: https://github.com/LmeSzinc/AzurLaneAutoScript <<<
 @echo off
+chcp | find "932" >NUL && set "IME=true" || set "IME=false"
+if "%IME%"=="true" (
+   echo ====================================================================================================
+   echo Incorrect encoding, visit this link to correct: https://bit.ly/34t8ubY
+   echo To copy, select the link and CTRL+SHFT+C
+   echo ====================================================================================================
+   pause
+   goto :eof
+   )
 pushd "%~dp0"
 setlocal EnableDelayedExpansion
 set "Version=3.0" 
@@ -19,6 +28,17 @@ set "root=%~dp0"
 set "root=%root:~0,-1%"
 cd "%root%"
 
+rem ================= Variables =================
+
+set "pyBin=%root%\toolkit\python.exe"
+set "adbBin=%root%\toolkit\Lib\site-packages\adbutils\binaries\adb.exe"
+set "gitBin=%root%\toolkit\Git\mingw64\bin\git.exe"
+set "curlBin=%root%\toolkit\Git\mingw64\bin\curl.exe"
+set "api_json=%root%\config\api_git.json"
+set "AlasConfig=%root%\config\alas.ini"
+set "template=%root%\config\template.ini"
+set "gitFolder=%root%\.git"
+
 :: Import main settings (%Language%, %Region%, %SystemType%) and translation text.
 call command\Get.bat Main
 :: Import the Proxy setting and apply. Then show more info in Option6.
@@ -32,14 +52,6 @@ call command\Get.bat DeployMode
 
 :: Start of Deployment
 title Alas Run Tool V3
-set "pyBin=%root%\toolkit\python.exe"
-set "adbBin=%root%\toolkit\Lib\site-packages\adbutils\binaries\adb.exe"
-set "gitBin=%root%\toolkit\Git\mingw64\bin\git.exe"
-set "curlBin=%root%\toolkit\Git\mingw64\bin\curl.exe"
-set "api_json=%root%\config\api_git.json"
-set "AlasConfig=%root%\config\alas.ini"
-set "template=%root%\config\template.ini"
-set "gitFolder=%root%\.git"
 if "%IsUsingGit%"=="yes" if "%DeployMode%"=="unknown" ( xcopy /Y toolkit\config .git\ > NUL )
 call :UpdateChecker_Alas
 
@@ -104,7 +116,6 @@ rem ================= OPTION 1 =================
 :en
 call :CheckBsBeta
 call :AdbConnect
-rem call :uiautomator2init
 echo ====================================================================================================
 echo Python Found in %pyBin% Proceeding..
 echo Opening alas_en.pyw in %root%
@@ -118,7 +129,6 @@ rem ================= OPTION 2 =================
 :cn
 call :CheckBsBeta
 call :AdbConnect
-rem call :uiautomator2init
 echo ====================================================================================================
 echo Python Found in %pyBin% Proceeding..
 echo Opening alas_en.pyw in %root%
@@ -131,7 +141,6 @@ rem ================= OPTION 3 =================
 :jp
 call :CheckBsBeta
 call :AdbConnect
-rem call :uiautomator2init
 echo ====================================================================================================
 echo Python Found in %pyBin% Proceeding..
 echo Opening alas_en.pyw in %root%
@@ -413,6 +422,11 @@ goto ReturnToSetting
 
 rem ================= FUNCTIONS =================
 
+:CheckAdbConnect
+for /f "tokens=1*" %%g IN ('%adbBin% connect 127.0.0.1:5555') do set adbCheck=%%g
+if "%adbCheck%"=="cannot"
+echo %adbCheck%
+
 :ReturnToSetting
 echo. & echo Press any key to continue...
 pause > NUL
@@ -444,6 +458,7 @@ for /f "tokens=3" %%a in ('reg query HKEY_LOCAL_MACHINE\SOFTWARE\BlueStacks_bgp6
 set SerialRealtime=127.0.0.1:%port%
 echo ====================================================================================================
 echo connecting at %SerialRealtime%
+%adbBin% kill-server > nul 2>&1
 %adbBin% connect %SerialRealtime%
 echo ====================================================================================================
 if "%FirstRun%"=="yes" (
@@ -456,14 +471,23 @@ echo Old Serial:      %SerialAlas%
 echo New Serial:      %SerialRealtime% 
 echo ====================================================================================================
 echo Press any to continue...
+%pyBin% -m uiautomator2 init
 pause > NUL
 :: -----------------------------------------------------------------------------
 goto :eof
 
 :AdbConnect
 if "%RealtimeMode%"=="enable" goto :eof
-if "%FirstRun%"=="yes" ( %adbBin% connect %serial_input% && goto :eof )
-%adbBin% connect %Serial%
+if "%FirstRun%"=="yes" ( goto :eof )
+%adbBin% kill-server > nul 2>&1
+%adbBin% connect %Serial% | find /i "connected to" >nul
+if errorlevel 1 (
+   echo The connection was not successful
+   goto Serial_setting
+   ) else (
+      %pyBin% -m uiautomator2 init
+      echo The connection was Successful
+   )
 goto :eof
 
 :KillAdb

command/GenerateConsoleBatch.bat

@@ -2,21 +2,21 @@
 :: Used for "ADT-V4.bat" in :Create_Console-bat
 :: Please make sure that: only call this batch when %cd% is %root%;
 :: e.g.
-:: call command\GenerateDownloadBatch.bat portable
+:: call command\GenerateConsoleBatch.bat portable
 
 @echo off
 set "console-bat-filename=console.bat"
 REM if "%DeployMode%"=="unknown" exit
-call :GenerateDownloadBatch_Common
-call :GenerateDownloadBatch-%~1
-call :GenerateDownloadBatch_Common2
+call :GenerateConsoleBatch_Common
+call :GenerateConsoleBatch-%~1
+call :GenerateConsoleBatch_Common2
 goto :eof
 
 
 rem ================= FUNCTIONS =================
 
 
-:GenerateDownloadBatch_Common
+:GenerateConsoleBatch_Common
 ( echo @rem
 echo @echo off
 echo.
@@ -50,7 +50,7 @@ echo if NOT exist toolkit\command md toolkit\command
 echo del /Q toolkit\command\*.cmd ^>NUL 2^>NUL) > %console-bat-filename%
 goto :eof
 
-:GenerateDownloadBatch_Common2
+:GenerateConsoleBatch_Common2
 ( REM :: Show the instructions
 echo title Alas Console Debugger
 echo echo This is an console to run adb, git, python and pip.
@@ -70,7 +70,7 @@ echo PROMPT $P$_$G$G$G
 echo cmd /Q /K) >> %console-bat-filename%
 goto :eof
 
-:GenerateDownloadBatch-New
+:GenerateConsoleBatch-New
 ( echo echo @"%%_pyBin%%\python.exe" "%%_pyBin%%\Scripts\pip3.exe" %%%%*^> toolkit\command\pip3.cmd
 echo echo @"%%_pyBin%%\python.exe" "%%_pyBin%%\Scripts\pip.exe" %%%%*^> toolkit\command\pip.cmd
 echo echo @"%%_pyBin%%\python.exe" "%%_pyBin%%\Scripts\wheel.exe" %%%%*^> toolkit\command\wheel.cmd

command/Get.bat

@@ -13,6 +13,8 @@ goto :eof
 
 rem ================= FUNCTIONS =================
 
+:Importo_Deploy
+
 :: %cd%: "%root%"
 :: Get %Language% , %Region% , %SystemType%
 :Import_Main
@@ -65,9 +67,17 @@ echo If you misstype, you can set in Settings menu Option 3
 echo =========================================================================
 set /p serial_input=Please input - SERIAL ^(DEFAULT 127.0.0.1:5555 ^): 
 if "%serial_input%"=="" ( set "serial_input=127.0.0.1:5555" )
-call command\Config.bat Serial %serial_input%
-call command\ConfigTemplate.bat SerialTemplate %serial_input%
-
+%adbBin% kill-server > nul 2>&1
+%adbBin% connect %serial_input% | find /i "connected to" >nul
+if errorlevel 1 (
+    echo The connection was not successful
+    goto Import_Serial
+) else (
+    call command\Config.bat Serial %serial_input%
+    call command\ConfigTemplate.bat SerialTemplate %serial_input%
+    %pyBin% -m uiautomator2 init
+    echo The connection was Successful
+)
 echo =========================================================================
 echo Old Serial:      %Serial%
 echo New Serial:      %serial_input%