siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
139 Commits 20 Branches 0 Tags 8.8 MiB
61cad34931
Commit Graph

139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miguel Siebenhaar
61cad34931 Version 4 working 2023-06-21 17:56:30 +02:00
Miguel Siebenhaar
e54322e3e2 Version 3 working 2023-06-21 16:41:20 +02:00
Miguel Siebenhaar
edcf555b5b Version 2.1 working 2023-06-21 16:34:17 +02:00
Miguel Siebenhaar
e571373fbb Version 2. working 2023-06-21 15:28:57 +02:00
Miguel Siebenhaar
8e002107b5 Version 1. working 2023-06-21 15:06:57 +02:00
Bastian Kohler
d17f455ae1 Added toMessage() to DetectionReport 2023-06-21 13:05:56 +02:00
Bastian Kohler
3b88a140cc Removed DetectorService methods and added public classes 2023-06-21 10:49:18 +02:00
Bastian Kohler
c730eec9f9 Working DetectorService with all Detectors and Recorders 2023-06-21 10:24:45 +02:00
Bastian Kohler
1aea88d08f Fixed another bug with calculating pixels changed 2023-06-21 10:02:58 +02:00
Bastian Kohler
43eac872ed Bug Fixes on VideoDetector 2023-06-21 09:50:14 +02:00
Bastian Kohler
39295f9780 Changed Format in Detection Report 2023-06-21 09:49:45 +02:00
Bastian Kohler
54ba3b4862 Sensors working together in main 2023-06-21 00:26:33 +02:00
Bastian Kohler
2087edd3e6 Reset main 2023-06-20 23:29:43 +02:00
Bastian Kohler
4222ebef83 Fixed error 2023-06-20 23:24:05 +02:00
kleineckeol72024
061646a7d6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
 2023-06-20 23:05:14 +02:00
Miguel Siebenhaar
6f78836c4d Merge remote-tracking branch 'origin/master' 2023-06-20 22:34:42 +02:00
Miguel Siebenhaar
b667e70fef Kommunikationcopie Version 1.8 UDP Socket 2023-06-20 22:30:30 +02:00
Tobias Wolz
272daf9fae Adjustment to fit master 2023-06-20 22:25:20 +02:00
Tobias Wolz
55ae95e661 Merge of MicrophoneDetector 2023-06-20 21:58:09 +02:00
Tobias Wolz
8e47934beb Merge branch 'tw' into master 
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
#	gradle.properties
 2023-06-20 21:42:25 +02:00
Tobias Wolz
c60a14b6ac Clean project for merge 2023-06-20 21:37:17 +02:00
Leon Market
b9c66f7533 Updated detection report constructor in Accelerometer 2023-06-20 21:23:57 +02:00
Leon Market
7e1143880e Merge branch 'lm' 
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java
#	app/src/main/java/com/example/ueberwachungssystem/Detection/Detector.java
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
 2023-06-20 21:20:04 +02:00
Tobias Wolz
4381ae78f8 Commit before cleaning project for merge (minor changes) 2023-06-20 21:16:18 +02:00
Miguel Siebenhaar
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
Leon Market
81c3542654 Removed unnecessary packages 2023-06-20 21:13:08 +02:00
Miguel Siebenhaar
35d52088aa merge Kommunikationcopie Version 1.7 UDP Socket 2023-06-20 21:06:51 +02:00
Tobias Wolz
81e04e370a Commit before cleaning project for merge 2023-06-20 21:04:33 +02:00
Leon Market
d33ab299ab Added reportViolation() 2023-06-20 20:59:18 +02:00
Miguel Siebenhaar
ee61f7042b Kommunikation Version 1.6 UDP Socket 2023-06-20 20:50:18 +02:00
Miguel Siebenhaar
ab54b6d96a Kommunikation Version 1.5 UDP Socket 2023-06-20 20:47:53 +02:00
Miguel Siebenhaar
a85fb1f5ca Kommunikation Version 1.5 UDP Socket 2023-06-20 20:33:46 +02:00
Bastian Kohler
f8f1fd23fb Merge branch 'bk_video' 
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
 2023-06-20 15:34:24 +02:00
Miguel Siebenhaar
e007ad1744 Kommunikation Version 1.4 UDP Socket 2023-06-20 15:22:27 +02:00
Miguel Siebenhaar
292c3457fa Kommunikation Version 1.4 UDP Socket 2023-06-20 15:22:10 +02:00
Miguel Siebenhaar
79c7c16d21 Kommunikation Version 1.4 UDP Socket 2023-06-20 15:19:29 +02:00
Bastian Kohler
e01e23eccd Refactor 2023-06-20 14:29:10 +02:00
Bastian Kohler
a493bafb79 Refactor 2023-06-20 11:16:26 +02:00
Bastian Kohler
aed079377f Refactor 2023-06-20 11:07:57 +02:00
Bastian Kohler
bff6abbd29 Removed Permission Handling from Video Detector, Added PermissionHandler.java class 2023-06-20 11:00:26 +02:00
Bastian Kohler
5d31f0bb46 Adapted Parameters 2023-06-19 15:47:40 +02:00
Bastian Kohler
ea0e88ed89 Refactor in DetectorService class 2023-06-19 14:51:04 +02:00
Bastian Kohler
7dee124378 Refactor in DetectorService class 2023-06-19 14:41:41 +02:00
Bastian Kohler
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
Bastian Kohler
bc5227ba4f Refactor of DetectorService 2023-06-19 14:37:49 +02:00
Bastian Kohler
4185cb5200 Proper display of Toasts in Audio Recorder 2023-06-19 14:34:07 +02:00
Bastian Kohler
0a3600d0d6 Refactor 2023-06-19 14:27:04 +02:00
Bastian Kohler
9b2d57ad37 Refactor 2023-06-19 13:35:02 +02:00
Bastian Kohler
847e90f5ac Fixed Bug in VideoDetector 2023-06-19 13:17:17 +02:00
Bastian Kohler
ab41217f0e Added DetectionService 2023-06-19 13:13:23 +02:00