diff --git a/.gitignore b/.gitignore index 347e252..dfe7199 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ local.properties # Log/OS Files *.log +.DS_Store # Android Studio generated files and folders captures/ @@ -22,6 +23,9 @@ misc.xml deploymentTargetDropDown.xml render.experimental.xml +# VS Code +.vscode + # Keystore files *.jks *.keystore diff --git a/Andorid/app/.gitignore b/Android/app/.gitignore similarity index 100% rename from Andorid/app/.gitignore rename to Android/app/.gitignore diff --git a/Andorid/app/build.gradle b/Android/app/build.gradle similarity index 100% rename from Andorid/app/build.gradle rename to Android/app/build.gradle diff --git a/Andorid/app/proguard-rules.pro b/Android/app/proguard-rules.pro similarity index 100% rename from Andorid/app/proguard-rules.pro rename to Android/app/proguard-rules.pro diff --git a/Andorid/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml similarity index 100% rename from Andorid/app/src/main/AndroidManifest.xml rename to Android/app/src/main/AndroidManifest.xml diff --git a/Andorid/app/src/main/java/com/ipcamera/CameraPermissionActivity.kt b/Android/app/src/main/java/com/ipcamera/CameraPermissionActivity.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/CameraPermissionActivity.kt rename to Android/app/src/main/java/com/ipcamera/CameraPermissionActivity.kt diff --git a/Andorid/app/src/main/java/com/ipcamera/MainActivity.kt b/Android/app/src/main/java/com/ipcamera/MainActivity.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/MainActivity.kt rename to Android/app/src/main/java/com/ipcamera/MainActivity.kt diff --git a/Andorid/app/src/main/java/com/ipcamera/MainFragment.kt b/Android/app/src/main/java/com/ipcamera/MainFragment.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/MainFragment.kt rename to Android/app/src/main/java/com/ipcamera/MainFragment.kt diff --git a/Andorid/app/src/main/java/com/ipcamera/SettingsFragment.kt b/Android/app/src/main/java/com/ipcamera/SettingsFragment.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/SettingsFragment.kt rename to Android/app/src/main/java/com/ipcamera/SettingsFragment.kt diff --git a/Andorid/app/src/main/java/com/ipcamera/SettingsPreferences.kt b/Android/app/src/main/java/com/ipcamera/SettingsPreferences.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/SettingsPreferences.kt rename to Android/app/src/main/java/com/ipcamera/SettingsPreferences.kt diff --git a/Andorid/app/src/main/java/com/ipcamera/StreamActivity.kt b/Android/app/src/main/java/com/ipcamera/StreamActivity.kt similarity index 100% rename from Andorid/app/src/main/java/com/ipcamera/StreamActivity.kt rename to Android/app/src/main/java/com/ipcamera/StreamActivity.kt diff --git a/Andorid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from Andorid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/Andorid/app/src/main/res/drawable/ic_camera.xml b/Android/app/src/main/res/drawable/ic_camera.xml similarity index 100% rename from Andorid/app/src/main/res/drawable/ic_camera.xml rename to Android/app/src/main/res/drawable/ic_camera.xml diff --git a/Andorid/app/src/main/res/drawable/ic_launcher_background.xml b/Android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Andorid/app/src/main/res/drawable/ic_launcher_background.xml rename to Android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/Andorid/app/src/main/res/layout/camera_permission_activity.xml b/Android/app/src/main/res/layout/camera_permission_activity.xml similarity index 97% rename from Andorid/app/src/main/res/layout/camera_permission_activity.xml rename to Android/app/src/main/res/layout/camera_permission_activity.xml index 620d6a0..c373bc5 100644 --- a/Andorid/app/src/main/res/layout/camera_permission_activity.xml +++ b/Android/app/src/main/res/layout/camera_permission_activity.xml @@ -27,7 +27,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" - app:tint="@color/material_dynamic_tertiary30" /> + app:tint="@color/black" /> /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/VideoServer/gradlew.bat b/VideoServer/gradlew.bat index ac1b06f..7101f8e 100644 --- a/VideoServer/gradlew.bat +++ b/VideoServer/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/VideoServer/src/main/kotlin/CameraServer.kt b/VideoServer/src/main/kotlin/com/videoserver/CameraServer.kt similarity index 99% rename from VideoServer/src/main/kotlin/CameraServer.kt rename to VideoServer/src/main/kotlin/com/videoserver/CameraServer.kt index dade647..3488763 100644 --- a/VideoServer/src/main/kotlin/CameraServer.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/CameraServer.kt @@ -1,3 +1,5 @@ +package com.videoserver + import java.io.DataInputStream import java.io.EOFException import java.io.File diff --git a/VideoServer/src/main/kotlin/Frame.kt b/VideoServer/src/main/kotlin/com/videoserver/Frame.kt similarity index 60% rename from VideoServer/src/main/kotlin/Frame.kt rename to VideoServer/src/main/kotlin/com/videoserver/Frame.kt index 002ba4d..52bdf49 100644 --- a/VideoServer/src/main/kotlin/Frame.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/Frame.kt @@ -1 +1,3 @@ +package com.videoserver + data class Frame(val data: List) \ No newline at end of file diff --git a/VideoServer/src/main/kotlin/MJpegServer.kt b/VideoServer/src/main/kotlin/com/videoserver/MJpegServer.kt similarity index 99% rename from VideoServer/src/main/kotlin/MJpegServer.kt rename to VideoServer/src/main/kotlin/com/videoserver/MJpegServer.kt index 285df72..c82a677 100644 --- a/VideoServer/src/main/kotlin/MJpegServer.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/MJpegServer.kt @@ -1,3 +1,5 @@ +package com.videoserver + import java.io.IOException import java.net.ServerSocket import java.net.Socket diff --git a/VideoServer/src/main/kotlin/Main.kt b/VideoServer/src/main/kotlin/com/videoserver/Main.kt similarity index 97% rename from VideoServer/src/main/kotlin/Main.kt rename to VideoServer/src/main/kotlin/com/videoserver/Main.kt index ddd869f..9dd7cfb 100644 --- a/VideoServer/src/main/kotlin/Main.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/Main.kt @@ -1,3 +1,5 @@ +package com.videoserver + fun main(args: Array) { val cameraServer = CameraServer() diff --git a/VideoServer/src/main/kotlin/ViewerConnectionListener.kt b/VideoServer/src/main/kotlin/com/videoserver/ViewerConnectionListener.kt similarity index 87% rename from VideoServer/src/main/kotlin/ViewerConnectionListener.kt rename to VideoServer/src/main/kotlin/com/videoserver/ViewerConnectionListener.kt index 4eed5a9..656c13c 100644 --- a/VideoServer/src/main/kotlin/ViewerConnectionListener.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/ViewerConnectionListener.kt @@ -1,3 +1,5 @@ +package com.videoserver + interface ViewerConnectionListener { fun onConnect(onFrameAvailable: CameraServer.OnFrameAvailable) fun onDisconnect(onFrameAvailable: CameraServer.OnFrameAvailable) diff --git a/VideoServer/src/main/kotlin/ViewerWebSocketServer.kt b/VideoServer/src/main/kotlin/com/videoserver/ViewerWebSocketServer.kt similarity index 98% rename from VideoServer/src/main/kotlin/ViewerWebSocketServer.kt rename to VideoServer/src/main/kotlin/com/videoserver/ViewerWebSocketServer.kt index 6170b20..d90e481 100644 --- a/VideoServer/src/main/kotlin/ViewerWebSocketServer.kt +++ b/VideoServer/src/main/kotlin/com/videoserver/ViewerWebSocketServer.kt @@ -1,3 +1,5 @@ +package com.videoserver + import org.java_websocket.WebSocket import org.java_websocket.handshake.ClientHandshake import org.java_websocket.server.WebSocketServer