 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 |
|
|
Leon Market
|
81c3542654
|
Removed unnecessary packages
|
2023-06-20 21:13:08 +02:00 |
|
|
Leon Market
|
d33ab299ab
|
Added reportViolation()
|
2023-06-20 20:59:18 +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 |
|
|
Leon Market
|
8a5d720685
|
Changed to a (hopefully) working version of the Accelerometer
|
2023-06-18 13:13:30 +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 |
|
|
Leon Market
|
90aea5b1bc
|
Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue
|
2023-06-17 23:58:34 +02:00 |
|
|
kohlerba68671
|
76442888f7
|
Working Video Detector + Recorder WIP: Use Case logic
|
2023-06-17 19:44:08 +02:00 |
|
|
Leon Market
|
8a357e0d26
|
Fixed errors after merge with origin:lm
|
2023-06-17 19:20:32 +02:00 |
|
|
Leon Market
|
3d02d8d4c0
|
Added
|
2023-06-17 19:16:48 +02:00 |
|
|
Leon Market
|
cafe763c4a
|
Removed unnecessary code parts
|
2023-06-17 19:14:34 +02:00 |
|
|
Leon Market
|
2cff334056
|
Added detection report
|
2023-06-17 19:00:44 +02:00 |
|
|
kohlerba68671
|
d32e0a11f5
|
Fixed bug in Detector and VideoDetector
|
2023-06-17 11:20:56 +02:00 |
|
 siebenhaarmi76624
|
df9b28c830
|
merge Kommunikation Version 1.2 UDP Socket
|
2023-06-15 16:56:59 +02:00 |
|
|
siebenhaarmi76624
|
6ec0b175e4
|
merge Kommunikation Version 1.2 UDP Socket
|
2023-06-15 16:56:21 +02:00 |
|
|
Leon Market
|
6c4905d0e7
|
Added constructors for activity and textView in ThreadDemo
|
2023-06-15 14:27:25 +02:00 |
|
|
kohlerba68671
|
fb8bdcd895
|
Fixed up Video detector
|
2023-06-15 12:40:54 +02:00 |
|
|
Leon Market
|
402b73e4bd
|
Removed calibration code and added method checkAlarm
|
2023-06-14 22:28:05 +02:00 |
|
|
Leon Market
|
9e5b669986
|
Added Accelerometer as Runnable Class and ThreadDemo as example
|
2023-06-14 22:25:54 +02:00 |
|
|
Leon Market
|
8275d8bd5a
|
Added
|
2023-06-14 22:11:17 +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
|
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
|
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 |
|