MDT5_1_Ueberwachungssystem_G1

siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

Fork 0

Commit Graph

Select branches

Hide Pull Requests

Kommunikation

Kommunikationcopie

bk_master_copy

bk_recording

bk_service

bk_video

bk_video_service

bk_video_test

copie

copie2

ko

koLayoutTest

lm

master

ms

ms_master_backup_22_06

ms_master_copie

ms_service_copie

prepareMaster

tw

#1

#2

#3

#4

65a36707eb Removed Logger and Fragment2.java master Bastian Kohler 2023-06-23 17:22:36 +02:00
35e2226787 Removed some unnecessary files Bastian Kohler 2023-06-23 17:01:22 +02:00
681a2f0230 Changed detection overtime from 10 seconds to 5 seconds Bastian Kohler 2023-06-23 16:27:22 +02:00
0c808f1daa chnaged start dely to 2 seconds Bastian Kohler 2023-06-23 16:21:04 +02:00
5b52dfc6e5 Version 5.2 working with Fragment 3 ms_master_backup_22_06 Miguel Siebenhaar 2023-06-22 14:59:05 +02:00
02cbb14f3c Merge remote-tracking branch 'origin/ms_master_copie' Miguel Siebenhaar 2023-06-22 12:11:02 +02:00
2c9b2523a4 Changed some stuff on the videolist layout bk_master_copy Bastian Kohler 2023-06-22 08:46:11 +02:00
741b46e713 Version 5.1 working with Fragment 3 ms_master_copie Miguel Siebenhaar 2023-06-22 00:33:35 +02:00
bd8371d96d Recording working but only on camera detection Bastian Kohler 2023-06-22 00:29:16 +02:00
b900ec2e04 Version 5 working with Fragment 3 Miguel Siebenhaar 2023-06-21 23:56:25 +02:00
404091db15 Version 4.2 with num for counter Detections Miguel Siebenhaar 2023-06-21 23:40:05 +02:00
b976e9ae32 Refactor Bastian Kohler 2023-06-21 23:04:35 +02:00
0082602bea VideoView Fragment and pop up working Bastian Kohler 2023-06-21 22:57:33 +02:00
4b720c3a33 Refactor Bastian Kohler 2023-06-21 22:02:10 +02:00
ff12f986c7 Version 4.2 with num for counter Detections ms_service_copie Miguel Siebenhaar 2023-06-21 21:53:33 +02:00
7e4e885fe0 - added fragment3 kleineckeol72024 2023-06-21 20:18:32 +02:00
5df6b32fc3 Added Messages to fragment alarm Bastian Kohler 2023-06-21 20:00:25 +02:00
34076149df - added text to alarm fragment kleineckeol72024 2023-06-21 19:41:45 +02:00
0948d7f44f - added audio and motion detection again kleineckeol72024 2023-06-21 19:36:20 +02:00
c8b947bb57 - added video detection again kleineckeol72024 2023-06-21 19:30:34 +02:00
4a1c554a09 - 'removed' files added to project prepareMaster kleineckeol72024 2023-06-21 19:20:39 +02:00
eb1629a700 removed Fragment classes from MainActivity - work in Progress kleineckeol72024 2023-06-21 19:01:48 +02:00
b97c494427 Merge branch 'master' into prepareMaster kleineckeol72024 2023-06-21 18:43:55 +02:00
6a251fbb27 removed Fragment classes from MainActivity - removed fragments - removed unnecessary classes - removed unnecessary code kleineckeol72024 2023-06-21 18:33:01 +02:00
076db89147 removed Fragment classes from MainActivity - changed buttons, added fragments koLayoutTest kleineckeol72024 2023-06-21 18:21:52 +02:00
5007623acc Version 4.1 with new PopUpClass Miguel Siebenhaar 2023-06-21 18:11:14 +02:00
3d9e6b7a3e Merge branch 'ms_service_copie' Miguel Siebenhaar 2023-06-21 17:57:01 +02:00
61cad34931 Version 4 working Miguel Siebenhaar 2023-06-21 17:56:30 +02:00
e54322e3e2 Version 3 working Miguel Siebenhaar 2023-06-21 16:41:20 +02:00
edcf555b5b Version 2.1 working Miguel Siebenhaar 2023-06-21 16:34:17 +02:00
e571373fbb Version 2. working Miguel Siebenhaar 2023-06-21 15:28:57 +02:00
8e002107b5 Version 1. working Miguel Siebenhaar 2023-06-21 15:06:57 +02:00
be1e52a9b0 Kopie Master Version 1.3 UDP Socket merged with sensor, mit Fehler copie2 copie Miguel Siebenhaar 2023-06-21 14:27:53 +02:00
5b042611a5 Kopie Master Version 1.2 UDP Socket merged with sensor Miguel Siebenhaar 2023-06-21 13:55:36 +02:00
5a0aab0176 Merge branch 'master' into copie Miguel Siebenhaar 2023-06-21 13:29:54 +02:00
5f1f127e62 Kopie Master Version 1.2 UDP Socket merged with sensor Miguel Siebenhaar 2023-06-21 13:17:47 +02:00
1eba8e0f7c Merge branch 'bk_service' Bastian Kohler 2023-06-21 13:12:43 +02:00
d17f455ae1 Added toMessage() to DetectionReport bk_video_service bk_service Bastian Kohler 2023-06-21 13:05:56 +02:00
94970885cf Changed time to lay phone down to startDelay = 20000, threadSleeptime = 10 and Log.d Report in case of detection for readability ´reasons Tobias Wolz 2023-06-21 13:04:52 +02:00
3b88a140cc Removed DetectorService methods and added public classes Bastian Kohler 2023-06-21 10:49:18 +02:00
c730eec9f9 Working DetectorService with all Detectors and Recorders Bastian Kohler 2023-06-21 10:24:45 +02:00
1aea88d08f Fixed another bug with calculating pixels changed Bastian Kohler 2023-06-21 10:02:58 +02:00
43eac872ed Bug Fixes on VideoDetector Bastian Kohler 2023-06-21 09:50:14 +02:00
39295f9780 Changed Format in Detection Report Bastian Kohler 2023-06-21 09:49:45 +02:00
54ba3b4862 Sensors working together in main Bastian Kohler 2023-06-21 00:26:33 +02:00
2087edd3e6 Reset main Bastian Kohler 2023-06-20 23:29:43 +02:00
4222ebef83 Fixed error Bastian Kohler 2023-06-20 23:24:05 +02:00
35708220f8 Kopie Master Version 1.1 UDP Socket merged with sensor Miguel Siebenhaar 2023-06-20 23:16:20 +02:00
061646a7d6 Merge remote-tracking branch 'origin/master' kleineckeol72024 2023-06-20 23:05:14 +02:00
415af15cb7 Kopie Matser Version 1 UDP Socket Miguel Siebenhaar 2023-06-20 23:02:05 +02:00
6f78836c4d Merge remote-tracking branch 'origin/master' Miguel Siebenhaar 2023-06-20 22:34:42 +02:00
b667e70fef Kommunikationcopie Version 1.8 UDP Socket Kommunikationcopie Miguel Siebenhaar 2023-06-20 22:30:30 +02:00
272daf9fae Adjustment to fit master Tobias Wolz 2023-06-20 22:25:20 +02:00
55ae95e661 Merge of MicrophoneDetector Tobias Wolz 2023-06-20 21:58:09 +02:00
8e47934beb Merge branch 'tw' into master Tobias Wolz 2023-06-20 21:42:25 +02:00
c60a14b6ac Clean project for merge tw Tobias Wolz 2023-06-20 21:37:17 +02:00
b9c66f7533 Updated detection report constructor in Accelerometer Leon Market 2023-06-20 21:23:57 +02:00
7e1143880e Merge branch 'lm' Leon Market 2023-06-20 21:20:04 +02:00
4381ae78f8 Commit before cleaning project for merge (minor changes) Tobias Wolz 2023-06-20 21:16:18 +02:00
c198292fbf Merge remote-tracking branch 'origin/master' into Kommunikationcopie Miguel Siebenhaar 2023-06-20 21:13:26 +02:00
81c3542654 Removed unnecessary packages lm Leon Market 2023-06-20 21:13:08 +02:00
35d52088aa merge Kommunikationcopie Version 1.7 UDP Socket Miguel Siebenhaar 2023-06-20 21:06:51 +02:00
81e04e370a Commit before cleaning project for merge Tobias Wolz 2023-06-20 21:04:33 +02:00
d33ab299ab Added reportViolation() Leon Market 2023-06-20 20:59:18 +02:00
ee61f7042b Kommunikation Version 1.6 UDP Socket Kommunikation Miguel Siebenhaar 2023-06-20 20:50:18 +02:00
ab54b6d96a Kommunikation Version 1.5 UDP Socket Miguel Siebenhaar 2023-06-20 20:46:27 +02:00
a85fb1f5ca Kommunikation Version 1.5 UDP Socket Miguel Siebenhaar 2023-06-20 20:33:46 +02:00
f8f1fd23fb Merge branch 'bk_video' Bastian Kohler 2023-06-20 15:34:24 +02:00
e007ad1744 Kommunikation Version 1.4 UDP Socket Miguel Siebenhaar 2023-06-20 15:22:27 +02:00
292c3457fa Kommunikation Version 1.4 UDP Socket Miguel Siebenhaar 2023-06-20 15:22:10 +02:00
79c7c16d21 Kommunikation Version 1.4 UDP Socket Miguel Siebenhaar 2023-06-20 15:19:29 +02:00
e01e23eccd Refactor bk_video Bastian Kohler 2023-06-20 14:29:10 +02:00
a493bafb79 Refactor Bastian Kohler 2023-06-20 11:16:26 +02:00
aed079377f Refactor Bastian Kohler 2023-06-20 11:07:57 +02:00
bff6abbd29 Removed Permission Handling from Video Detector, Added PermissionHandler.java class Bastian Kohler 2023-06-20 11:00:26 +02:00
5d31f0bb46 Adapted Parameters Bastian Kohler 2023-06-19 15:47:40 +02:00
ea0e88ed89 Refactor in DetectorService class Bastian Kohler 2023-06-19 14:51:04 +02:00
7dee124378 Refactor in DetectorService class Bastian Kohler 2023-06-19 14:41:41 +02:00
0ee1446cbc Merge branch 'bk_video_service' into bk_video Bastian Kohler 2023-06-19 14:40:06 +02:00
bc5227ba4f Refactor of DetectorService Bastian Kohler 2023-06-19 14:37:49 +02:00
4185cb5200 Proper display of Toasts in Audio Recorder Bastian Kohler 2023-06-19 14:34:07 +02:00
0a3600d0d6 Refactor Bastian Kohler 2023-06-19 14:27:04 +02:00
9b2d57ad37 Refactor Bastian Kohler 2023-06-19 13:35:02 +02:00
847e90f5ac Fixed Bug in VideoDetector Bastian Kohler 2023-06-19 13:17:17 +02:00
ab41217f0e Added DetectionService Bastian Kohler 2023-06-19 13:13:23 +02:00
0782bbdd04 merge Kommunikation Version 1.3 UDP Socket Miguel Siebenhaar 2023-06-19 13:00:22 +02:00
e088b0afa3 Working Recorder and Video Detector Bastian Kohler 2023-06-18 20:17:19 +02:00
493fa8ca83 Fixed Grey Stripes and Rotation Problems Bastian Kohler 2023-06-18 18:12:03 +02:00
6954d38143 Moved OpenCV Helper to its own Java File Bastian Kohler 2023-06-18 13:43:10 +02:00
8a5d720685 Changed to a (hopefully) working version of the Accelerometer Leon Market 2023-06-18 13:13:30 +02:00
057c7fc139 Added Audio Recorder Bastian Kohler 2023-06-18 13:03:38 +02:00
10e5cb3e61 Added Audio Recorder. Its working bk_video_test Bastian Kohler 2023-06-18 12:57:50 +02:00
f329fab62d Microphone Detector and Video Detector and Recorder working simultaniously Bastian Kohler 2023-06-18 11:50:19 +02:00
4baf3db1bb Merge branch 'tw' into bk_video_test Bastian Kohler 2023-06-18 11:02:20 +02:00
29c193b716 Removed Preview Use Case, Audio still not working Bastian Kohler 2023-06-18 10:55:21 +02:00
90aea5b1bc Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue Leon Market 2023-06-17 23:58:34 +02:00
76442888f7 Working Video Detector + Recorder WIP: Use Case logic Bastian Kohler 2023-06-17 19:44:08 +02:00
8a357e0d26 Fixed errors after merge with origin:lm Leon Market 2023-06-17 19:20:32 +02:00
83268c763b Merge remote-tracking branch 'origin/lm' into lm Leon Market 2023-06-17 19:17:11 +02:00
3d02d8d4c0 Added Leon Market 2023-06-14 22:11:38 +02:00

Commit Graph Select branches Hide Pull Requests Kommunikation Kommunikationcopie bk_master_copy bk_recording bk_service bk_video bk_video_service bk_video_test copie copie2 ko koLayoutTest lm master ms ms_master_backup_22_06 ms_master_copie ms_service_copie prepareMaster tw #1 #2 #3 #4 Mono Color