Commit Graph

140 Commits

Author SHA1 Message Date
292c3457fa Kommunikation Version 1.4 UDP Socket 2023-06-20 15:22:10 +02:00
79c7c16d21 Kommunikation Version 1.4 UDP Socket 2023-06-20 15:19:29 +02:00
e01e23eccd Refactor 2023-06-20 14:29:10 +02:00
a493bafb79 Refactor 2023-06-20 11:16:26 +02:00
aed079377f Refactor 2023-06-20 11:07:57 +02:00
bff6abbd29 Removed Permission Handling from Video Detector, Added PermissionHandler.java class 2023-06-20 11:00:26 +02:00
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
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
f98079d431 Readded main and main xml 2023-06-09 09:09:50 +02:00
192f88ede5 Kommunikation Version 1 UDP Socket 2023-06-08 18:10:39 +02:00
3c1366bd10 Kommunikation Version 1 UDP Socket 2023-06-08 17:59:47 +02:00
047d45f1cb Added comments to VideoDetector class 2023-06-02 17:48:41 +02:00
95919a6602 preparing branch for merge 2023-06-02 14:56:57 +02:00
19d1bfe1e3 Refactor 2023-05-29 10:43:51 +02:00
804c5aba36 Removed old Luminosity detection 2023-05-28 22:30:22 +02:00
c5577b125f Changed VideoDetector.java to detect based on changed pixel count instead of average luminosity 2023-05-28 22:30:22 +02:00
6100d17bd2 Refactored in Main 2023-05-28 22:30:22 +02:00
9892fc35bc Refactor of Detector.java 2023-05-28 22:19:05 +02:00
62a528d33b Implemented VideoDetector as a child class of abstract class Detector 2023-05-28 21:16:17 +02:00
7c8610facb Move from Mikrofon to MicrophoneDetector class and add of abstract Detector class 2023-05-25 16:58:08 +02:00
Leon Market
4999f1b998 added Detector, DetectorReport, Logger 2023-05-25 16:46:12 +02:00
37617dbd54 Fixed a bug in Detector.java 2023-05-25 10:54:08 +02:00
569bd43163 Adjusted some values in xml and video detector for showcase 2023-05-25 10:20:11 +02:00
fdb0036ea6 Added comments to abstract class "Detector" 2023-05-25 10:19:21 +02:00
f9797f2dca Added Abstract class Detector 2023-05-24 23:51:49 +02:00
ba75c58a23 Refactor 2023-05-24 22:16:54 +02:00
3d799ae461 Rebuild Demo in Main Activity 2023-05-18 15:05:09 +02:00
2501662737 Fixed a bug in the video decoder 2023-05-18 12:02:18 +02:00
d04d166e14 Added log function to detection report 2023-05-18 12:01:45 +02:00
1576719d10 Added onDetectionListener to VideoDecoder 2023-05-16 22:35:50 +02:00
362af75b9a Added DetectionReportCalss 2023-05-16 22:34:32 +02:00
bef5d03494 Added functions for checking luminosity violation 2023-05-16 19:15:57 +02:00
c4ed247a05 added Functions to VideoDetector:
startDetection(), stopDetection(), isRunning()
2023-05-16 17:42:10 +02:00
323786859e added Video Decoder Class 2023-05-12 18:45:13 +02:00
354bf937b2 added camerax libraries to build.gradle 2023-05-12 09:37:58 +02:00
39bb37f5c3 removed VideoDetection.java 2023-05-11 21:46:15 +02:00
b198dc2e06 small refactor 2023-05-11 21:33:40 +02:00
BepsiKohler
d83cd3dc32 Added camera access permission 2023-05-11 20:58:01 +02:00
unknown
90a2aad491 new class Mikrofon 2023-05-11 16:21:59 +02:00
d22952d83b Initial commit Project Version 0 2023-05-11 15:38:14 +02:00
57bf2c2fb7 added new Project ueberwachungssystem 2023-05-11 15:31:47 +02:00
5c0263198c added new Project ueberwachungssystem 2023-05-11 15:25:28 +02:00
dda3d5693a Initial commit Project Version 0 2023-05-11 15:08:50 +02:00