调整文件目录

Q05-Lidar/pack_q05_lidar.bat

@@ -116,11 +116,11 @@ if exist "%APPDIR%resource.dat" copy "%APPDIR%resource.dat" . >nul
 echo [5/6] PyInstaller...
 set ADD_RESOURCE=
 if exist "resource.dat" set ADD_RESOURCE=--add-data "resource.dat;."
-"%PY%" -m PyInstaller --onefile --windowed --name="%NAME%" --icon="app.ico" --add-data "adb.exe;." --add-data "AdbWinApi.dll;." --add-data "AdbWinUsbApi.dll;." --add-data "7za.exe;." --add-data "fastboot.exe;." %ADD_RESOURCE% --add-binary "_core.pyd;." --hidden-import=queue --hidden-import=threading --hidden-import=tkinter --hidden-import=zipfile --hidden-import=json --hidden-import=urllib --hidden-import=cryptography --collect-all tkinter --collect-all cryptography --uac-admin launcher.py
-if errorlevel 1 (
-    cd ..
-    echo [ERROR] PyInstaller failed
-    pause
+"%PY%" -m PyInstaller --onefile --windowed --name="%NAME%" --icon="app.ico" --add-data "app.ico;." --add-data "adb.exe;." --add-data "AdbWinApi.dll;." --add-data "AdbWinUsbApi.dll;." --add-data "7za.exe;." --add-data "fastboot.exe;." --add-data "%APPDIR%usb_driver;usb_driver" %ADD_RESOURCE% --add-binary "_core.pyd;." --hidden-import=queue --hidden-import=threading --hidden-import=tkinter --hidden-import=zipfile --hidden-import=json --hidden-import=urllib --hidden-import=cryptography --collect-all tkinter --collect-all cryptography --uac-admin launcher.py
+if errorlevel 1 (
+    cd ..
+    echo [ERROR] PyInstaller failed
+    pause
     exit /b
 )
 
@@ -157,6 +157,12 @@ if errorlevel 1 (
     pause
     exit /b 1
 )
+if not exist "%APPDIR%usb_driver\android_winusb.inf" (
+    cd ..
+    echo [ERROR] usb_driver\android_winusb.inf not found at %APPDIR%usb_driver
+    pause
+    exit /b 1
+)
 
 echo [7/7] Cleanup...
 del /q _core.py _core.c _core.pyd %PYD% launcher.py setup_cython.py adb.exe AdbWinApi.dll AdbWinUsbApi.dll 7za.exe fastboot.exe resource.dat 2>nul