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
1 year ago
Tobias Wolz
c60a14b6ac
Clean project for merge
1 year ago
b9c66f7533
Updated detection report constructor in Accelerometer
1 year ago
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
1 year ago
Tobias Wolz
4381ae78f8
Commit before cleaning project for merge (minor changes)
1 year ago
81c3542654
Removed unnecessary packages
1 year ago
Tobias Wolz
81e04e370a
Commit before cleaning project for merge
1 year ago
d33ab299ab
Added reportViolation()
1 year ago
Bastian Kohler
f8f1fd23fb
Merge branch 'bk_video'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
1 year ago
Bastian Kohler
e01e23eccd
Refactor
1 year ago
Bastian Kohler
a493bafb79
Refactor
1 year ago
Bastian Kohler
aed079377f
Refactor
1 year ago
Bastian Kohler
bff6abbd29
Removed Permission Handling from Video Detector, Added PermissionHandler.java class
1 year ago
Bastian Kohler
5d31f0bb46
Adapted Parameters
1 year ago
Bastian Kohler
ea0e88ed89
Refactor in DetectorService class
1 year ago
Bastian Kohler
7dee124378
Refactor in DetectorService class
1 year ago
Bastian Kohler
0ee1446cbc
Merge branch 'bk_video_service' into bk_video
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
1 year ago
Bastian Kohler
bc5227ba4f
Refactor of DetectorService
1 year ago
Bastian Kohler
4185cb5200
Proper display of Toasts in Audio Recorder
1 year ago
Bastian Kohler
0a3600d0d6
Refactor
1 year ago
Bastian Kohler
9b2d57ad37
Refactor
1 year ago
Bastian Kohler
847e90f5ac
Fixed Bug in VideoDetector
1 year ago
Bastian Kohler
ab41217f0e
Added DetectionService
1 year ago
Bastian Kohler
e088b0afa3
Working Recorder and Video Detector
1 year ago
Bastian Kohler
493fa8ca83
Fixed Grey Stripes and Rotation Problems
1 year ago
Bastian Kohler
6954d38143
Moved OpenCV Helper to its own Java File
1 year ago
8a5d720685
Changed to a (hopefully) working version of the Accelerometer
1 year ago
Bastian Kohler
057c7fc139
Added Audio Recorder
1 year ago
Bastian Kohler
29c193b716
Removed Preview Use Case, Audio still not working
1 year ago
90aea5b1bc
Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue
1 year ago
Bastian Kohler
76442888f7
Working Video Detector + Recorder WIP: Use Case logic
1 year ago
8a357e0d26
Fixed errors after merge with origin:lm
1 year ago
83268c763b
Merge remote-tracking branch 'origin/lm' into lm
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java
1 year ago
3d02d8d4c0
Added
1 year ago
cafe763c4a
Removed unnecessary code parts
1 year ago
2cff334056
Added detection report
1 year ago
Bastian Kohler
d32e0a11f5
Fixed bug in Detector and VideoDetector
1 year ago
Tobias Wolz
b94a1d98b7
Working detection with calibration and dB signals. FFT also implemented, but does not work properly at the moment. (Added Complex class, FFT class and imported jjoe64 Graphview (in gradle and gradle.properties) for visualising FFT results)
1 year ago
Miguel Siebenhaar
df9b28c830
merge Kommunikation Version 1.2 UDP Socket
1 year ago
Miguel Siebenhaar
6ec0b175e4
merge Kommunikation Version 1.2 UDP Socket
1 year ago
6c4905d0e7
Added constructors for activity and textView in ThreadDemo
1 year ago
Bastian Kohler
fb8bdcd895
Fixed up Video detector
1 year ago
402b73e4bd
Removed calibration code and added method checkAlarm
1 year ago
9e5b669986
Added Accelerometer as Runnable Class and ThreadDemo as example
1 year ago
8275d8bd5a
Added
1 year ago
Bastian Kohler
7ef0df48dd
Refactored Detector
1 year ago
Bastian Kohler
50b579705e
Detector based on OpenCV working
1 year ago
Bastian Kohler
8551abfc5d
Changde Detector class
1 year ago
Bastian Kohler
bbd333426d
unfinished changes in Detector
1 year ago
Bastian Kohler
e98ae10267
refactor
1 year ago
Leon Market
