149 Commits

Author SHA1 Message Date
5d31f0bb46 Adapted Parameters 2023-06-19 15:47:40 +02:00
ea0e88ed89 Refactor in DetectorService class 2023-06-19 14:51:04 +02:00
7dee124378 Refactor in DetectorService class 2023-06-19 14:41:41 +02:00
0ee1446cbc Merge branch 'bk_video_service' into bk_video
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
2023-06-19 14:40:06 +02:00
bc5227ba4f Refactor of DetectorService 2023-06-19 14:37:49 +02:00
4185cb5200 Proper display of Toasts in Audio Recorder 2023-06-19 14:34:07 +02:00
0a3600d0d6 Refactor 2023-06-19 14:27:04 +02:00
9b2d57ad37 Refactor 2023-06-19 13:35:02 +02:00
847e90f5ac Fixed Bug in VideoDetector 2023-06-19 13:17:17 +02:00
ab41217f0e Added DetectionService 2023-06-19 13:13:23 +02:00
0782bbdd04 merge Kommunikation Version 1.3 UDP Socket 2023-06-19 13:00:22 +02:00
e088b0afa3 Working Recorder and Video Detector 2023-06-18 20:17:19 +02:00
493fa8ca83 Fixed Grey Stripes and Rotation Problems 2023-06-18 18:12:03 +02:00
6954d38143 Moved OpenCV Helper to its own Java File 2023-06-18 13:43:10 +02:00
Leon Market
8a5d720685 Changed to a (hopefully) working version of the Accelerometer 2023-06-18 13:13:30 +02:00
057c7fc139 Added Audio Recorder 2023-06-18 13:03:38 +02:00
29c193b716 Removed Preview Use Case, Audio still not working 2023-06-18 10:55:21 +02:00
Leon Market
90aea5b1bc Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue 2023-06-17 23:58:34 +02:00
76442888f7 Working Video Detector + Recorder WIP: Use Case logic 2023-06-17 19:44:08 +02:00
Leon Market
8a357e0d26 Fixed errors after merge with origin:lm 2023-06-17 19:20:32 +02:00
Leon Market
83268c763b Merge remote-tracking branch 'origin/lm' into lm
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java
2023-06-17 19:17:11 +02:00
Leon Market
3d02d8d4c0 Added 2023-06-17 19:16:48 +02:00
Leon Market
cafe763c4a Removed unnecessary code parts 2023-06-17 19:14:34 +02:00
Leon Market
2cff334056 Added detection report 2023-06-17 19:00:44 +02:00
d32e0a11f5 Fixed bug in Detector and VideoDetector 2023-06-17 11:20:56 +02:00
b94a1d98b7 Working detection with calibration and dB signals. FFT also implemented, but does not work properly at the moment. (Added Complex class, FFT class and imported jjoe64 Graphview (in gradle and gradle.properties) for visualising FFT results) 2023-06-16 16:49:20 +02:00
746eec18ba removed Fragment classes from MainActivity 2023-06-15 17:19:35 +02:00
44e056b5fe Merge branch 'ko'
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
2023-06-15 17:06:56 +02:00
df1fefef5f added Toggle Button to start Cam Detection 2023-06-15 16:59:17 +02:00
df9b28c830 merge Kommunikation Version 1.2 UDP Socket 2023-06-15 16:56:59 +02:00
6ec0b175e4 merge Kommunikation Version 1.2 UDP Socket 2023-06-15 16:56:21 +02:00
e89a5d11a1 Kommunikation Version 1.2 UDP Socket 2023-06-15 16:38:49 +02:00
5bcd465ecc Merge branch 'master' into ko
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/activity_main.xml
#	gradle/wrapper/gradle-wrapper.properties
2023-06-15 16:20:40 +02:00
a6fdf3f774 added landscape xml file 2023-06-15 16:12:30 +02:00
b46db4cdfc reworked Button Positions 2023-06-15 16:04:50 +02:00
b246ad8624 Kommunikation Version 1.1 UDP Socket 2023-06-15 15:09:19 +02:00
Leon Market
6c4905d0e7 Added constructors for activity and textView in ThreadDemo 2023-06-15 14:27:25 +02:00
fb8bdcd895 Fixed up Video detector 2023-06-15 12:40:54 +02:00
Leon Market
402b73e4bd Removed calibration code and added method checkAlarm 2023-06-14 22:28:05 +02:00
Leon Market
9e5b669986 Added Accelerometer as Runnable Class and ThreadDemo as example 2023-06-14 22:25:54 +02:00
Leon Market
8275d8bd5a Added 2023-06-14 22:11:17 +02:00
7ef0df48dd Refactored Detector 2023-06-14 20:14:06 +02:00
50b579705e Detector based on OpenCV working 2023-06-14 19:43:18 +02:00
8551abfc5d Changde Detector class 2023-06-14 16:38:33 +02:00
bbd333426d unfinished changes in Detector 2023-06-13 20:55:30 +02:00
74eb3e0d98 Added Toggle Buttons for Detection Mode
Added Scrollview for alarm
2023-06-12 20:23:42 +02:00
5f7e2a43f2 added new Project ueberwachungssystem 2023-06-12 19:04:22 +02:00
e98ae10267 refactor 2023-06-12 19:03:52 +02:00
07f60f974b added new Project ueberwachungssystem 2023-06-12 14:15:39 +02:00
7d29ed1ca9 Rebuild to use openCV. Alarm not yet implemented 2023-06-09 20:56:14 +02:00