 Oliver Kleinecke
|
061646a7d6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
# app/src/main/res/layout/activity_main.xml
|
1 year ago |
 Miguel Siebenhaar
|
6f78836c4d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Miguel Siebenhaar
|
b667e70fef
|
Kommunikationcopie Version 1.8 UDP Socket
|
1 year ago |
 Tobias Wolz
|
272daf9fae
|
Adjustment to fit master
|
1 year ago |
|
Tobias Wolz
|
55ae95e661
|
Merge of MicrophoneDetector
|
1 year ago |
|
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 |
 Leon Market
|
b9c66f7533
|
Updated detection report constructor in Accelerometer
|
1 year ago |
|
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
|
1 year ago |
|
Tobias Wolz
|
4381ae78f8
|
Commit before cleaning project for merge (minor changes)
|
1 year 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
|
1 year ago |
|
Leon Market
|
81c3542654
|
Removed unnecessary packages
|
1 year ago |
|
Miguel Siebenhaar
|
35d52088aa
|
merge Kommunikationcopie Version 1.7 UDP Socket
|
1 year ago |
|
Tobias Wolz
|
81e04e370a
|
Commit before cleaning project for merge
|
1 year ago |
|
Leon Market
|
d33ab299ab
|
Added reportViolation()
|
1 year ago |
|
Miguel Siebenhaar
|
ee61f7042b
|
Kommunikation Version 1.6 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
ab54b6d96a
|
Kommunikation Version 1.5 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
a85fb1f5ca
|
Kommunikation Version 1.5 UDP Socket
|
1 year ago |
 Bastian Kohler
|
f8f1fd23fb
|
Merge branch 'bk_video'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
|
1 year ago |
|
Miguel Siebenhaar
|
e007ad1744
|
Kommunikation Version 1.4 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
292c3457fa
|
Kommunikation Version 1.4 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
79c7c16d21
|
Kommunikation Version 1.4 UDP Socket
|
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 |
|
Miguel Siebenhaar
|
0782bbdd04
|
merge Kommunikation Version 1.3 UDP Socket
|
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 |
|
Leon Market
|
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 |
|
Leon Market
|
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 |
|
Leon Market
|
8a357e0d26
|
Fixed errors after merge with origin:lm
|
1 year ago |
|
Leon Market
|
83268c763b
|
Merge remote-tracking branch 'origin/lm' into lm
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/Beschleunigungssensor.java
|
1 year ago |
|
Leon Market
|
3d02d8d4c0
|
Added
|
1 year ago |
|
Leon Market
|
cafe763c4a
|
Removed unnecessary code parts
|
1 year ago |
|
Leon Market
|
2cff334056
|
Added detection report
|
1 year ago |
