Commit Graph

  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * |
  • | *
  • * |
  • | *
  • | *
  • * |
  • * |
  • * |
  • |/
  • | *
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • | |/
  • * |
  • * |
  • | *
  • | *
  • | |\
  • | | *
  • | | *
  • | | *
  • | | *
  • | | *
  • | | | *
  • | | | *
  • | | | *
  • | | | |\
  • | | |_|/
  • | |/| |
  • | | | *
  • | * | |
  • | |\ \ \
  • | | |/ /
  • | | * |
  • | * | |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | | * |
  • | |/ /
  • | * |
  • |/ /
  • | *
  • * |
  • |\ \
  • | | *
  • | |/
  • | *
  • | |\
  • | * |
  • | | *
  • | | *
  • | | *
  • | | |\
  • | | | *
  • | | * |
  • | | * |
  • | | |\ \
  • | | | | *
  • | * | | |
  • | |\ \ \ \
  • | | |/ / /
  • | | | * |
  • | * | | |
  • | | | | *
  • | | | * |
  • | * | | |
  • | * | | |
  • | * | | |
  • | | * | |
  • | | |\ \ \
  • | * | | | |
  • | * | | | |
  • | * | | | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | |\ \ \
  • | | | | * | |
  • | | | * | | |
  • | | | | * | |
  • | | | * | | |
  • | | | * | | |
  • | | | | * | |
  • | | | |/ / /
  • | * | | | |
  • | | | * | |
  • | | | * | |
  • | | | * | |
  • | | | | * |
  • | | | * | |
  • | | | | | | *
  • | | | | | | *
  • | | | | | | *
  • | | | | | | |\
  • | | | | |_|/ /
  • | | | |/| | /
  • | | | | | |/
  • | | | * | |
  • | | | | * |
  • | | | * | |
  • | | | | * |
  • | | | | * |
  • | | | | |\ \
  • | | | | * | |
  • 65a3670 (HEAD -> master) Removed Logger and Fragment2.java by Bastian Kohler 2023-06-23 17:22:36 +0200
  • 35e2226 Removed some unnecessary files by Bastian Kohler 2023-06-23 17:01:22 +0200
  • 681a2f0 Changed detection overtime from 10 seconds to 5 seconds by Bastian Kohler 2023-06-23 16:27:22 +0200
  • 0c808f1 chnaged start dely to 2 seconds by Bastian Kohler 2023-06-23 16:21:04 +0200
  • 5b52dfc (ms_master_backup_22_06) Version 5.2 working with Fragment 3 by Miguel Siebenhaar 2023-06-22 14:59:05 +0200
  • 02cbb14 Merge remote-tracking branch 'origin/ms_master_copie' by Miguel Siebenhaar 2023-06-22 12:11:02 +0200
  • 2c9b252 (bk_master_copy) Changed some stuff on the videolist layout by Bastian Kohler 2023-06-22 08:46:11 +0200
  • 741b46e (ms_master_copie) Version 5.1 working with Fragment 3 by Miguel Siebenhaar 2023-06-22 00:33:35 +0200
  • bd8371d Recording working but only on camera detection by Bastian Kohler 2023-06-22 00:29:16 +0200
  • b900ec2 Version 5 working with Fragment 3 by Miguel Siebenhaar 2023-06-21 23:56:25 +0200
  • 404091d Version 4.2 with num for counter Detections by Miguel Siebenhaar 2023-06-21 23:40:05 +0200
  • b976e9a Refactor by Bastian Kohler 2023-06-21 23:04:35 +0200
  • 0082602 VideoView Fragment and pop up working by Bastian Kohler 2023-06-21 22:57:33 +0200
  • 4b720c3 Refactor by Bastian Kohler 2023-06-21 22:02:10 +0200
  • ff12f98 (ms_service_copie) Version 4.2 with num for counter Detections by Miguel Siebenhaar 2023-06-21 21:53:33 +0200
  • 7e4e885 - added fragment3 by kleineckeol72024 2023-06-21 20:18:32 +0200
  • 5df6b32 Added Messages to fragment alarm by Bastian Kohler 2023-06-21 20:00:25 +0200
  • 3407614 - added text to alarm fragment by kleineckeol72024 2023-06-21 19:41:45 +0200
  • 0948d7f - added audio and motion detection again by kleineckeol72024 2023-06-21 19:36:20 +0200
  • c8b947b - added video detection again by kleineckeol72024 2023-06-21 19:30:34 +0200
  • 4a1c554 (prepareMaster) - 'removed' files added to project by kleineckeol72024 2023-06-21 19:20:39 +0200
  • eb1629a removed Fragment classes from MainActivity - work in Progress by kleineckeol72024 2023-06-21 19:01:48 +0200
  • b97c494 Merge branch 'master' into prepareMaster by kleineckeol72024 2023-06-21 18:43:55 +0200
  • 6a251fb removed Fragment classes from MainActivity - removed fragments - removed unnecessary classes - removed unnecessary code by kleineckeol72024 2023-06-21 18:33:01 +0200
  • 076db89 (koLayoutTest) removed Fragment classes from MainActivity - changed buttons, added fragments by kleineckeol72024 2023-06-21 18:21:52 +0200
  • 5007623 Version 4.1 with new PopUpClass by Miguel Siebenhaar 2023-06-21 18:11:14 +0200
  • 3d9e6b7 Merge branch 'ms_service_copie' by Miguel Siebenhaar 2023-06-21 17:57:01 +0200
  • 61cad34 Version 4 working by Miguel Siebenhaar 2023-06-21 17:56:30 +0200
  • e54322e Version 3 working by Miguel Siebenhaar 2023-06-21 16:41:20 +0200
  • edcf555 Version 2.1 working by Miguel Siebenhaar 2023-06-21 16:34:17 +0200
  • e571373 Version 2. working by Miguel Siebenhaar 2023-06-21 15:28:57 +0200
  • 8e00210 Version 1. working by Miguel Siebenhaar 2023-06-21 15:06:57 +0200
  • be1e52a (copie2, copie) Kopie Master Version 1.3 UDP Socket merged with sensor, mit Fehler by Miguel Siebenhaar 2023-06-21 14:27:53 +0200
  • 5b04261 Kopie Master Version 1.2 UDP Socket merged with sensor by Miguel Siebenhaar 2023-06-21 13:55:36 +0200
  • 5a0aab0 Merge branch 'master' into copie by Miguel Siebenhaar 2023-06-21 13:29:54 +0200
  • 5f1f127 Kopie Master Version 1.2 UDP Socket merged with sensor by Miguel Siebenhaar 2023-06-21 13:17:47 +0200
  • 1eba8e0 Merge branch 'bk_service' by Bastian Kohler 2023-06-21 13:12:43 +0200
  • d17f455 (bk_video_service, bk_service) Added toMessage() to DetectionReport by Bastian Kohler 2023-06-21 13:05:56 +0200
  • 9497088 Changed time to lay phone down to startDelay = 20000, threadSleeptime = 10 and Log.d Report in case of detection for readability ´reasons by Tobias Wolz 2023-06-21 13:04:52 +0200
  • 3b88a14 Removed DetectorService methods and added public classes by Bastian Kohler 2023-06-21 10:49:18 +0200
  • c730eec Working DetectorService with all Detectors and Recorders by Bastian Kohler 2023-06-21 10:24:45 +0200
  • 1aea88d Fixed another bug with calculating pixels changed by Bastian Kohler 2023-06-21 10:02:58 +0200
  • 43eac87 Bug Fixes on VideoDetector by Bastian Kohler 2023-06-21 09:50:14 +0200
  • 39295f9 Changed Format in Detection Report by Bastian Kohler 2023-06-21 09:49:45 +0200
  • 54ba3b4 Sensors working together in main by Bastian Kohler 2023-06-21 00:26:33 +0200
  • 2087edd Reset main by Bastian Kohler 2023-06-20 23:29:43 +0200
  • 4222ebe Fixed error by Bastian Kohler 2023-06-20 23:24:05 +0200
  • 3570822 Kopie Master Version 1.1 UDP Socket merged with sensor by Miguel Siebenhaar 2023-06-20 23:16:20 +0200
  • 061646a Merge remote-tracking branch 'origin/master' by kleineckeol72024 2023-06-20 23:05:14 +0200
  • 415af15 Kopie Matser Version 1 UDP Socket by Miguel Siebenhaar 2023-06-20 23:02:05 +0200
  • 6f78836 Merge remote-tracking branch 'origin/master' by Miguel Siebenhaar 2023-06-20 22:34:42 +0200
  • b667e70 (Kommunikationcopie) Kommunikationcopie Version 1.8 UDP Socket by Miguel Siebenhaar 2023-06-20 22:30:30 +0200
  • 272daf9 Adjustment to fit master by Tobias Wolz 2023-06-20 22:25:20 +0200
  • 55ae95e Merge of MicrophoneDetector by Tobias Wolz 2023-06-20 21:58:09 +0200
  • 8e47934 Merge branch 'tw' into master by Tobias Wolz 2023-06-20 21:42:25 +0200
  • c60a14b (tw) Clean project for merge by Tobias Wolz 2023-06-20 21:37:17 +0200
  • b9c66f7 Updated detection report constructor in Accelerometer by Leon Market 2023-06-20 21:23:57 +0200
  • 7e11438 Merge branch 'lm' by Leon Market 2023-06-20 21:20:04 +0200
  • 4381ae7 Commit before cleaning project for merge (minor changes) by Tobias Wolz 2023-06-20 21:16:18 +0200
  • c198292 Merge remote-tracking branch 'origin/master' into Kommunikationcopie by Miguel Siebenhaar 2023-06-20 21:13:26 +0200
  • 81c3542 (lm) Removed unnecessary packages by Leon Market 2023-06-20 21:13:08 +0200
  • 35d5208 merge Kommunikationcopie Version 1.7 UDP Socket by Miguel Siebenhaar 2023-06-20 21:06:51 +0200
  • 81e04e3 Commit before cleaning project for merge by Tobias Wolz 2023-06-20 21:04:33 +0200
  • d33ab29 Added reportViolation() by Leon Market 2023-06-20 20:59:18 +0200
  • ee61f70 (Kommunikation) Kommunikation Version 1.6 UDP Socket by Miguel Siebenhaar 2023-06-20 20:50:18 +0200
  • ab54b6d Kommunikation Version 1.5 UDP Socket by Miguel Siebenhaar 2023-06-20 20:46:27 +0200
  • a85fb1f Kommunikation Version 1.5 UDP Socket by Miguel Siebenhaar 2023-06-20 20:33:46 +0200
  • f8f1fd2 Merge branch 'bk_video' by Bastian Kohler 2023-06-20 15:34:24 +0200
  • e007ad1 Kommunikation Version 1.4 UDP Socket by Miguel Siebenhaar 2023-06-20 15:22:27 +0200
  • 292c345 Kommunikation Version 1.4 UDP Socket by Miguel Siebenhaar 2023-06-20 15:22:10 +0200
  • 79c7c16 Kommunikation Version 1.4 UDP Socket by Miguel Siebenhaar 2023-06-20 15:19:29 +0200
  • e01e23e (bk_video) Refactor by Bastian Kohler 2023-06-20 14:29:10 +0200
  • a493baf Refactor by Bastian Kohler 2023-06-20 11:16:26 +0200
  • aed0793 Refactor by Bastian Kohler 2023-06-20 11:07:57 +0200
  • bff6abb Removed Permission Handling from Video Detector, Added PermissionHandler.java class by Bastian Kohler 2023-06-20 11:00:26 +0200
  • 5d31f0b Adapted Parameters by Bastian Kohler 2023-06-19 15:47:40 +0200
  • ea0e88e Refactor in DetectorService class by Bastian Kohler 2023-06-19 14:51:04 +0200
  • 7dee124 Refactor in DetectorService class by Bastian Kohler 2023-06-19 14:41:41 +0200
  • 0ee1446 Merge branch 'bk_video_service' into bk_video by Bastian Kohler 2023-06-19 14:40:06 +0200
  • bc5227b Refactor of DetectorService by Bastian Kohler 2023-06-19 14:37:49 +0200
  • 4185cb5 Proper display of Toasts in Audio Recorder by Bastian Kohler 2023-06-19 14:34:07 +0200
  • 0a3600d Refactor by Bastian Kohler 2023-06-19 14:27:04 +0200
  • 9b2d57a Refactor by Bastian Kohler 2023-06-19 13:35:02 +0200
  • 847e90f Fixed Bug in VideoDetector by Bastian Kohler 2023-06-19 13:17:17 +0200
  • ab41217 Added DetectionService by Bastian Kohler 2023-06-19 13:13:23 +0200
  • 0782bbd merge Kommunikation Version 1.3 UDP Socket by Miguel Siebenhaar 2023-06-19 13:00:22 +0200
  • e088b0a Working Recorder and Video Detector by Bastian Kohler 2023-06-18 20:17:19 +0200
  • 493fa8c Fixed Grey Stripes and Rotation Problems by Bastian Kohler 2023-06-18 18:12:03 +0200
  • 6954d38 Moved OpenCV Helper to its own Java File by Bastian Kohler 2023-06-18 13:43:10 +0200
  • 8a5d720 Changed to a (hopefully) working version of the Accelerometer by Leon Market 2023-06-18 13:13:30 +0200
  • 057c7fc Added Audio Recorder by Bastian Kohler 2023-06-18 13:03:38 +0200
  • 10e5cb3 (bk_video_test) Added Audio Recorder. Its working by Bastian Kohler 2023-06-18 12:57:50 +0200
  • f329fab Microphone Detector and Video Detector and Recorder working simultaniously by Bastian Kohler 2023-06-18 11:50:19 +0200
  • 4baf3db Merge branch 'tw' into bk_video_test by Bastian Kohler 2023-06-18 11:02:20 +0200
  • 29c193b Removed Preview Use Case, Audio still not working by Bastian Kohler 2023-06-18 10:55:21 +0200
  • 90aea5b Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue by Leon Market 2023-06-17 23:58:34 +0200
  • 7644288 Working Video Detector + Recorder WIP: Use Case logic by Bastian Kohler 2023-06-17 19:44:08 +0200
  • 8a357e0 Fixed errors after merge with origin:lm by Leon Market 2023-06-17 19:20:32 +0200
  • 83268c7 Merge remote-tracking branch 'origin/lm' into lm by Leon Market 2023-06-17 19:17:11 +0200
  • 3d02d8d Added by Leon Market 2023-06-14 22:11:38 +0200