siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
167 Commits 20 Branches 0 Tags
master
Commit Graph
84 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kohlerba68671 65a36707eb Removed Logger and Fragment2.java 2023-06-23 17:22:36 +02:00
kohlerba68671 35e2226787 Removed some unnecessary files 2023-06-23 17:01:22 +02:00
kohlerba68671 681a2f0230 Changed detection overtime from 10 seconds to 5 seconds 2023-06-23 16:27:22 +02:00
kohlerba68671 0c808f1daa chnaged start dely to 2 seconds 2023-06-23 16:21:04 +02:00
kohlerba68671 2c9b2523a4 Changed some stuff on the videolist layout 2023-06-22 08:46:11 +02:00
kohlerba68671 bd8371d96d Recording working but only on camera detection 2023-06-22 00:29:16 +02:00
kohlerba68671 b976e9ae32 Refactor 2023-06-21 23:04:35 +02:00
kohlerba68671 0082602bea VideoView Fragment and pop up working 2023-06-21 22:57:33 +02:00
kohlerba68671 4b720c3a33 Refactor 2023-06-21 22:02:10 +02:00
kohlerba68671 5df6b32fc3 Added Messages to fragment alarm 2023-06-21 20:00:25 +02:00
kohlerba68671 1eba8e0f7c Merge branch 'bk_service' 2023-06-21 13:12:43 +02:00
kohlerba68671 d17f455ae1 Added toMessage() to DetectionReport 2023-06-21 13:05:56 +02:00
kohlerba68671 3b88a140cc Removed DetectorService methods and added public classes 2023-06-21 10:49:18 +02:00
kohlerba68671 c730eec9f9 Working DetectorService with all Detectors and Recorders 2023-06-21 10:24:45 +02:00
kohlerba68671 1aea88d08f Fixed another bug with calculating pixels changed 2023-06-21 10:02:58 +02:00
kohlerba68671 43eac872ed Bug Fixes on VideoDetector 2023-06-21 09:50:14 +02:00
kohlerba68671 39295f9780 Changed Format in Detection Report 2023-06-21 09:49:45 +02:00
kohlerba68671 54ba3b4862 Sensors working together in main 2023-06-21 00:26:33 +02:00
kohlerba68671 2087edd3e6 Reset main 2023-06-20 23:29:43 +02:00
kohlerba68671 4222ebef83 Fixed error 2023-06-20 23:24:05 +02:00
kohlerba68671 f8f1fd23fb Merge branch 'bk_video' 
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
 2023-06-20 15:34:24 +02:00
kohlerba68671 e01e23eccd Refactor 2023-06-20 14:29:10 +02:00
kohlerba68671 a493bafb79 Refactor 2023-06-20 11:16:26 +02:00
kohlerba68671 aed079377f Refactor 2023-06-20 11:07:57 +02:00
kohlerba68671 bff6abbd29 Removed Permission Handling from Video Detector, Added PermissionHandler.java class 2023-06-20 11:00:26 +02:00
kohlerba68671 5d31f0bb46 Adapted Parameters 2023-06-19 15:47:40 +02:00
kohlerba68671 ea0e88ed89 Refactor in DetectorService class 2023-06-19 14:51:04 +02:00
kohlerba68671 7dee124378 Refactor in DetectorService class 2023-06-19 14:41:41 +02:00
kohlerba68671 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
kohlerba68671 bc5227ba4f Refactor of DetectorService 2023-06-19 14:37:49 +02:00
kohlerba68671 4185cb5200 Proper display of Toasts in Audio Recorder 2023-06-19 14:34:07 +02:00
kohlerba68671 0a3600d0d6 Refactor 2023-06-19 14:27:04 +02:00
kohlerba68671 9b2d57ad37 Refactor 2023-06-19 13:35:02 +02:00
kohlerba68671 847e90f5ac Fixed Bug in VideoDetector 2023-06-19 13:17:17 +02:00
kohlerba68671 ab41217f0e Added DetectionService 2023-06-19 13:13:23 +02:00
kohlerba68671 e088b0afa3 Working Recorder and Video Detector 2023-06-18 20:17:19 +02:00
kohlerba68671 493fa8ca83 Fixed Grey Stripes and Rotation Problems 2023-06-18 18:12:03 +02:00
kohlerba68671 6954d38143 Moved OpenCV Helper to its own Java File 2023-06-18 13:43:10 +02:00
kohlerba68671 057c7fc139 Added Audio Recorder 2023-06-18 13:03:38 +02:00
kohlerba68671 29c193b716 Removed Preview Use Case, Audio still not working 2023-06-18 10:55:21 +02:00
kohlerba68671 76442888f7 Working Video Detector + Recorder WIP: Use Case logic 2023-06-17 19:44:08 +02:00
kohlerba68671 d32e0a11f5 Fixed bug in Detector and VideoDetector 2023-06-17 11:20:56 +02:00
kohlerba68671 fb8bdcd895 Fixed up Video detector 2023-06-15 12:40:54 +02:00
kohlerba68671 7ef0df48dd Refactored Detector 2023-06-14 20:14:06 +02:00
kohlerba68671 50b579705e Detector based on OpenCV working 2023-06-14 19:43:18 +02:00
kohlerba68671 8551abfc5d Changde Detector class 2023-06-14 16:38:33 +02:00
kohlerba68671 bbd333426d unfinished changes in Detector 2023-06-13 20:55:30 +02:00
kohlerba68671 e98ae10267 refactor 2023-06-12 19:03:52 +02:00
kohlerba68671 7d29ed1ca9 Rebuild to use openCV. Alarm not yet implemented 2023-06-09 20:56:14 +02:00
kohlerba68671 f98079d431 Readded main and main xml 2023-06-09 09:09:50 +02:00
kohlerba68671 11dbcd0362 Merge branch 'bk_video' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master 2023-06-02 15:51:55 +00:00
kohlerba68671 047d45f1cb Added comments to VideoDetector class 2023-06-02 17:48:41 +02:00
kohlerba68671 95919a6602 preparing branch for merge 2023-06-02 14:56:57 +02:00
kohlerba68671 19d1bfe1e3 Refactor 2023-05-29 10:43:51 +02:00
kohlerba68671 e9da712882 Merge remote-tracking branch 'origin/bk_video' into bk_video 2023-05-28 22:30:58 +02:00
kohlerba68671 804c5aba36 Removed old Luminosity detection 2023-05-28 22:30:22 +02:00
kohlerba68671 c5577b125f Changed VideoDetector.java to detect based on changed pixel count instead of average luminosity 2023-05-28 22:30:22 +02:00
kohlerba68671 6100d17bd2 Refactored in Main 2023-05-28 22:30:22 +02:00
kohlerba68671 74a291bdd6 Removed olf Luminosity detection 2023-05-28 22:28:23 +02:00
kohlerba68671 ba6765b1fb Changed VideoDetector.java to detect based on changed pixel count instead of average luminosity 2023-05-28 22:20:56 +02:00
kohlerba68671 9fce3be6a8 Refactored some stuff in Main 2023-05-28 22:19:30 +02:00
kohlerba68671 9892fc35bc Refactor of Detector.java 2023-05-28 22:19:05 +02:00
kohlerba68671 62a528d33b Implemented VideoDetector as a child class of abstract class Detector 2023-05-28 21:16:17 +02:00
kohlerba68671 37617dbd54 Fixed a bug in Detector.java 2023-05-25 10:54:08 +02:00
kohlerba68671 569bd43163 Adjusted some values in xml and video detector for showcase 2023-05-25 10:20:11 +02:00
kohlerba68671 fdb0036ea6 Added comments to abstract class "Detector" 2023-05-25 10:19:21 +02:00
kohlerba68671 f9797f2dca Added Abstract class Detector 2023-05-24 23:51:49 +02:00
kohlerba68671 ba75c58a23 Refactor 2023-05-24 22:16:54 +02:00
kohlerba68671 3d799ae461 Rebuild Demo in Main Activity 2023-05-18 15:05:09 +02:00
kohlerba68671 2501662737 Fixed a bug in the video decoder 2023-05-18 12:02:18 +02:00
kohlerba68671 d04d166e14 Added log function to detection report 2023-05-18 12:01:45 +02:00
kohlerba68671 1576719d10 Added onDetectionListener to VideoDecoder 2023-05-16 22:35:50 +02:00
kohlerba68671 362af75b9a Added DetectionReportCalss 2023-05-16 22:34:32 +02:00
kohlerba68671 bef5d03494 Added functions for checking luminosity violation 2023-05-16 19:15:57 +02:00
kohlerba68671 80ebf77eb6 Removed empty Text File 2023-05-16 17:48:33 +02:00
kohlerba68671 c4ed247a05 added Functions to VideoDetector: 
startDetection(), stopDetection(), isRunning()
 2023-05-16 17:42:10 +02:00
kohlerba68671 323786859e added Video Decoder Class 2023-05-12 18:45:13 +02:00
kohlerba68671 354bf937b2 added camerax libraries to build.gradle 2023-05-12 09:37:58 +02:00
kohlerba68671 39bb37f5c3 removed VideoDetection.java 2023-05-11 21:46:15 +02:00
kohlerba68671 b198dc2e06 small refactor 2023-05-11 21:33:40 +02:00
kohlerba68671 065acefeb9 Merge branch 'ms' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master 2023-05-11 13:29:40 +00:00
kohlerba68671 a4e8086fbb Merge branch 'bk' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master 2023-05-11 12:46:10 +00:00
kohlerba68671 5c608debc6 test 2023-05-11 14:43:58 +02:00
kohlerba68671 7793dbb9e2 added assignment and gitignore 2023-05-11 14:39:27 +02:00