73 Commits

Author SHA1 Message Date
b667e70fef Kommunikationcopie Version 1.8 UDP Socket 2023-06-20 22:30:30 +02:00
c198292fbf Merge remote-tracking branch 'origin/master' into Kommunikationcopie
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java
#	app/src/main/res/layout/activity_main.xml
2023-06-20 21:13:26 +02:00
35d52088aa merge Kommunikationcopie Version 1.7 UDP Socket 2023-06-20 21:06:51 +02:00
ee61f7042b Kommunikation Version 1.6 UDP Socket 2023-06-20 20:50:18 +02:00
ab54b6d96a Kommunikation Version 1.5 UDP Socket 2023-06-20 20:47:53 +02:00
a85fb1f5ca Kommunikation Version 1.5 UDP Socket 2023-06-20 20:33:46 +02:00
f8f1fd23fb Merge branch 'bk_video'
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
2023-06-20 15:34:24 +02:00
e007ad1744 Kommunikation Version 1.4 UDP Socket 2023-06-20 15:22:27 +02:00
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
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
76442888f7 Working Video Detector + Recorder WIP: Use Case logic 2023-06-17 19:44:08 +02:00
d32e0a11f5 Fixed bug in Detector and VideoDetector 2023-06-17 11:20:56 +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
b246ad8624 Kommunikation Version 1.1 UDP Socket 2023-06-15 15:09:19 +02:00
fb8bdcd895 Fixed up Video detector 2023-06-15 12:40:54 +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
e98ae10267 refactor 2023-06-12 19:03:52 +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