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
11 months ago
Tobias Wolz
4381ae78f8
Commit before cleaning project for merge (minor changes)
11 months ago
Miguel Siebenhaar
c198292fbf
Merge remote-tracking branch 'origin/master' into Kommunikationcopie
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
# app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java
# app/src/main/res/layout/activity_main.xml
11 months ago
81c3542654
Removed unnecessary packages
11 months ago
Miguel Siebenhaar
35d52088aa
merge Kommunikationcopie Version 1.7 UDP Socket
11 months ago
Tobias Wolz
81e04e370a
Commit before cleaning project for merge
11 months ago
d33ab299ab
Added reportViolation()
11 months ago
Miguel Siebenhaar
ee61f7042b
Kommunikation Version 1.6 UDP Socket
11 months ago
Miguel Siebenhaar
ab54b6d96a
Kommunikation Version 1.5 UDP Socket
11 months ago
Miguel Siebenhaar
a85fb1f5ca
Kommunikation Version 1.5 UDP Socket
11 months ago
Bastian Kohler
f8f1fd23fb
Merge branch 'bk_video'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
11 months ago
Miguel Siebenhaar
e007ad1744
Kommunikation Version 1.4 UDP Socket
11 months ago
Miguel Siebenhaar
292c3457fa
Kommunikation Version 1.4 UDP Socket
11 months ago
Miguel Siebenhaar
79c7c16d21
Kommunikation Version 1.4 UDP Socket
11 months ago
Bastian Kohler
e01e23eccd
Refactor
11 months ago
Bastian Kohler
a493bafb79
Refactor
11 months ago
Bastian Kohler
aed079377f
Refactor
11 months ago
Bastian Kohler
bff6abbd29
Removed Permission Handling from Video Detector, Added PermissionHandler.java class
11 months ago
Bastian Kohler
5d31f0bb46
Adapted Parameters
11 months ago
Bastian Kohler
ea0e88ed89
Refactor in DetectorService class
11 months ago
Bastian Kohler
7dee124378
Refactor in DetectorService class
11 months ago
Bastian Kohler
0ee1446cbc
Merge branch 'bk_video_service' into bk_video
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
11 months ago
Bastian Kohler
bc5227ba4f
Refactor of DetectorService
11 months ago
Bastian Kohler
4185cb5200
Proper display of Toasts in Audio Recorder
11 months ago
Bastian Kohler
0a3600d0d6
Refactor
11 months ago
Bastian Kohler
9b2d57ad37
Refactor
11 months ago
Bastian Kohler
847e90f5ac
Fixed Bug in VideoDetector
11 months ago
Bastian Kohler
ab41217f0e
Added DetectionService
11 months ago
Miguel Siebenhaar
0782bbdd04
merge Kommunikation Version 1.3 UDP Socket
11 months ago
Bastian Kohler
e088b0afa3
Working Recorder and Video Detector
11 months ago
Bastian Kohler
493fa8ca83
Fixed Grey Stripes and Rotation Problems
11 months ago
Bastian Kohler
6954d38143
Moved OpenCV Helper to its own Java File
11 months ago
8a5d720685
Changed to a (hopefully) working version of the Accelerometer
11 months ago
Bastian Kohler
057c7fc139
Added Audio Recorder
11 months ago
Bastian Kohler
29c193b716
Removed Preview Use Case, Audio still not working
11 months ago
90aea5b1bc
Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue
11 months ago
Bastian Kohler
76442888f7
Working Video Detector + Recorder WIP: Use Case logic
11 months ago
8a357e0d26
Fixed errors after merge with origin:lm
11 months ago
83268c763b
Merge remote-tracking branch 'origin/lm' into lm
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java
11 months ago
3d02d8d4c0
Added
11 months ago
cafe763c4a
Removed unnecessary code parts
11 months ago
2cff334056
Added detection report
11 months ago
Bastian Kohler
d32e0a11f5
Fixed bug in Detector and VideoDetector
11 months 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)
11 months ago
Oliver Kleinecke
746eec18ba
removed Fragment classes from MainActivity
11 months ago
Oliver Kleinecke
44e056b5fe
Merge branch 'ko'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
11 months ago
Oliver Kleinecke
df1fefef5f
added Toggle Button to start Cam Detection
11 months ago
Miguel Siebenhaar
df9b28c830
merge Kommunikation Version 1.2 UDP Socket
11 months ago
Miguel Siebenhaar
6ec0b175e4
merge Kommunikation Version 1.2 UDP Socket
11 months ago
Miguel Siebenhaar
e89a5d11a1
Kommunikation Version 1.2 UDP Socket
11 months ago
Leon Market
