 Oliver Kleinecke
|
4a1c554a09
|
- 'removed' files added to project
|
11 months ago |
|
Oliver Kleinecke
|
eb1629a700
|
removed Fragment classes from MainActivity
- work in Progress
|
11 months ago |
|
Oliver Kleinecke
|
b97c494427
|
Merge branch 'master' into prepareMaster
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java
# app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
# app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java
# app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java
# 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 |
|
Oliver Kleinecke
|
6a251fbb27
|
removed Fragment classes from MainActivity
- removed fragments
- removed unnecessary classes
- removed unnecessary code
|
11 months ago |
|
Oliver Kleinecke
|
076db89147
|
removed Fragment classes from MainActivity
- changed buttons, added fragments
|
11 months ago |
 Miguel Siebenhaar
|
5007623acc
|
Version 4.1 with new PopUpClass
|
11 months ago |
|
Miguel Siebenhaar
|
3d9e6b7a3e
|
Merge branch 'ms_service_copie'
|
11 months ago |
|
Miguel Siebenhaar
|
61cad34931
|
Version 4 working
|
11 months ago |
|
Miguel Siebenhaar
|
e54322e3e2
|
Version 3 working
|
11 months ago |
|
Miguel Siebenhaar
|
edcf555b5b
|
Version 2.1 working
|
11 months ago |
|
Miguel Siebenhaar
|
e571373fbb
|
Version 2. working
|
11 months ago |
|
Miguel Siebenhaar
|
8e002107b5
|
Version 1. working
|
11 months ago |
 Bastian Kohler
|
1eba8e0f7c
|
Merge branch 'bk_service'
|
11 months ago |
|
Bastian Kohler
|
d17f455ae1
|
Added toMessage() to DetectionReport
|
11 months ago |
 Tobias Wolz
|
94970885cf
|
Changed time to lay phone down to startDelay = 20000, threadSleeptime = 10 and Log.d Report in case of detection for readability ´reasons
|
11 months ago |
|
Bastian Kohler
|
3b88a140cc
|
Removed DetectorService methods and added public classes
|
11 months ago |
|
Bastian Kohler
|
c730eec9f9
|
Working DetectorService with all Detectors and Recorders
|
11 months ago |
|
Bastian Kohler
|
1aea88d08f
|
Fixed another bug with calculating pixels changed
|
11 months ago |
|
Bastian Kohler
|
43eac872ed
|
Bug Fixes on VideoDetector
|
11 months ago |
|
Bastian Kohler
|
39295f9780
|
Changed Format in Detection Report
|
11 months ago |
|
Bastian Kohler
|
54ba3b4862
|
Sensors working together in main
|
11 months ago |
|
Bastian Kohler
|
2087edd3e6
|
Reset main
|
11 months ago |
|
Bastian Kohler
|
4222ebef83
|
Fixed error
|
11 months ago |
|
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
|
11 months ago |
|
Miguel Siebenhaar
|
6f78836c4d
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
Miguel Siebenhaar
|
b667e70fef
|
Kommunikationcopie Version 1.8 UDP Socket
|
11 months ago |
|
Tobias Wolz
|
272daf9fae
|
Adjustment to fit master
|
11 months ago |
|
Tobias Wolz
|
55ae95e661
|
Merge of MicrophoneDetector
|
11 months 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
|
11 months ago |
|
Tobias Wolz
|
c60a14b6ac
|
Clean project for merge
|
11 months ago |
 Leon Market
|
b9c66f7533
|
Updated detection report constructor in Accelerometer
|
11 months 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
|
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 |
|
Leon Market
|
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 |
|
Leon Market
|
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 |
