 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 |
|
Miguel Siebenhaar
|
35d52088aa
|
merge Kommunikationcopie Version 1.7 UDP Socket
|
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 |
|
Bastian Kohler
|
057c7fc139
|
Added Audio Recorder
|
1 year ago |
|
Bastian Kohler
|
29c193b716
|
Removed Preview Use Case, Audio still not working
|
1 year ago |
|
Bastian Kohler
|
76442888f7
|
Working Video Detector + Recorder WIP: Use Case logic
|
1 year ago |
|
Bastian Kohler
|
d32e0a11f5
|
Fixed bug in Detector and VideoDetector
|
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 |
|
Miguel Siebenhaar
|
e89a5d11a1
|
Kommunikation Version 1.2 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
b246ad8624
|
Kommunikation Version 1.1 UDP Socket
|
1 year ago |
|
Bastian Kohler
|
fb8bdcd895
|
Fixed up Video detector
|
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 |
|
Bastian Kohler
|
7d29ed1ca9
|
Rebuild to use openCV. Alarm not yet implemented
|
1 year ago |
|
Bastian Kohler
|
f98079d431
|
Readded main and main xml
|
1 year ago |
|
Miguel Siebenhaar
|
192f88ede5
|
Kommunikation Version 1 UDP Socket
|
1 year ago |
|
Miguel Siebenhaar
|
3c1366bd10
|
Kommunikation Version 1 UDP Socket
|
1 year ago |
|
Bastian Kohler
|
11dbcd0362
|
Merge branch 'bk_video' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master
|
1 year ago |
|
Bastian Kohler
|
047d45f1cb
|
Added comments to VideoDetector class
|
1 year ago |
|
Bastian Kohler
|
95919a6602
|
preparing branch for merge
|
1 year ago |
|
Bastian Kohler
|
19d1bfe1e3
|
Refactor
|
1 year ago |
|
Bastian Kohler
|
e9da712882
|
Merge remote-tracking branch 'origin/bk_video' into bk_video
|
1 year ago |
