|
|
6f78836c4d
|
Merge remote-tracking branch 'origin/master'
|
2023-06-20 22:34:42 +02:00 |
|
|
|
b667e70fef
|
Kommunikationcopie Version 1.8 UDP Socket
|
2023-06-20 22:30:30 +02:00 |
|
|
|
272daf9fae
|
Adjustment to fit master
|
2023-06-20 22:25:20 +02:00 |
|
|
|
55ae95e661
|
Merge of MicrophoneDetector
|
2023-06-20 21:58:09 +02:00 |
|
|
|
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
|
2023-06-20 21:42:25 +02:00 |
|
|
|
c60a14b6ac
|
Clean project for merge
|
2023-06-20 21:37:17 +02:00 |
|
Leon Market
|
b9c66f7533
|
Updated detection report constructor in Accelerometer
|
2023-06-20 21:23:57 +02:00 |
|
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
|
2023-06-20 21:20:04 +02:00 |
|
|
|
4381ae78f8
|
Commit before cleaning project for merge (minor changes)
|
2023-06-20 21:16:18 +02:00 |
|
|
|
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
|
2023-06-20 21:13:26 +02:00 |
|
Leon Market
|
81c3542654
|
Removed unnecessary packages
|
2023-06-20 21:13:08 +02:00 |
|
|
|
35d52088aa
|
merge Kommunikationcopie Version 1.7 UDP Socket
|
2023-06-20 21:06:51 +02:00 |
|
|
|
81e04e370a
|
Commit before cleaning project for merge
|
2023-06-20 21:04:33 +02:00 |
|
Leon Market
|
d33ab299ab
|
Added reportViolation()
|
2023-06-20 20:59:18 +02:00 |
|
|
|
ee61f7042b
|
Kommunikation Version 1.6 UDP Socket
|
2023-06-20 20:50:18 +02:00 |
|
|
|
ab54b6d96a
|
Kommunikation Version 1.5 UDP Socket
|
2023-06-20 20:47:53 +02:00 |
|
|
|
a85fb1f5ca
|
Kommunikation Version 1.5 UDP Socket
|
2023-06-20 20:33:46 +02:00 |
|
|
|
f8f1fd23fb
|
Merge branch 'bk_video'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
|
2023-06-20 15:34:24 +02:00 |
|
|
|
e007ad1744
|
Kommunikation Version 1.4 UDP Socket
|
2023-06-20 15:22:27 +02:00 |
|
|
|
292c3457fa
|
Kommunikation Version 1.4 UDP Socket
|
2023-06-20 15:22:10 +02:00 |
|
|
|
79c7c16d21
|
Kommunikation Version 1.4 UDP Socket
|
2023-06-20 15:19:29 +02:00 |
|
|
|
e01e23eccd
|
Refactor
|
2023-06-20 14:29:10 +02:00 |
|
|
|
a493bafb79
|
Refactor
|
2023-06-20 11:16:26 +02:00 |
|
|
|
aed079377f
|
Refactor
|
2023-06-20 11:07:57 +02:00 |
|
|
|
bff6abbd29
|
Removed Permission Handling from Video Detector, Added PermissionHandler.java class
|
2023-06-20 11:00:26 +02:00 |
|
|
|
5d31f0bb46
|
Adapted Parameters
|
2023-06-19 15:47:40 +02:00 |
|
|
|
ea0e88ed89
|
Refactor in DetectorService class
|
2023-06-19 14:51:04 +02:00 |
|
|
|
7dee124378
|
Refactor in DetectorService class
|
2023-06-19 14:41:41 +02:00 |
|
|
|
0ee1446cbc
|
Merge branch 'bk_video_service' into bk_video
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
|
2023-06-19 14:40:06 +02:00 |
|
|
|
bc5227ba4f
|
Refactor of DetectorService
|
2023-06-19 14:37:49 +02:00 |
|
|
|
4185cb5200
|
Proper display of Toasts in Audio Recorder
|
2023-06-19 14:34:07 +02:00 |
|
|
|
0a3600d0d6
|
Refactor
|
2023-06-19 14:27:04 +02:00 |
|
|
|
9b2d57ad37
|
Refactor
|
2023-06-19 13:35:02 +02:00 |
|
|
|
847e90f5ac
|
Fixed Bug in VideoDetector
|
2023-06-19 13:17:17 +02:00 |
|
|
|
ab41217f0e
|
Added DetectionService
|
2023-06-19 13:13:23 +02:00 |
|
|
|
0782bbdd04
|
merge Kommunikation Version 1.3 UDP Socket
|
2023-06-19 13:00:22 +02:00 |
|
|
|
e088b0afa3
|
Working Recorder and Video Detector
|
2023-06-18 20:17:19 +02:00 |
|
|
|
493fa8ca83
|
Fixed Grey Stripes and Rotation Problems
|
2023-06-18 18:12:03 +02:00 |
|
|
|
6954d38143
|
Moved OpenCV Helper to its own Java File
|
2023-06-18 13:43:10 +02:00 |
|
Leon Market
|
8a5d720685
|
Changed to a (hopefully) working version of the Accelerometer
|
2023-06-18 13:13:30 +02:00 |
|
|
|
057c7fc139
|
Added Audio Recorder
|
2023-06-18 13:03:38 +02:00 |
|
|
|
29c193b716
|
Removed Preview Use Case, Audio still not working
|
2023-06-18 10:55:21 +02:00 |
|
Leon Market
|
90aea5b1bc
|
Added LinkedBlockingQueue to collect data, added Thread to evaluate data from queue
|
2023-06-17 23:58:34 +02:00 |
|
|
|
76442888f7
|
Working Video Detector + Recorder WIP: Use Case logic
|
2023-06-17 19:44:08 +02:00 |
|
Leon Market
|
8a357e0d26
|
Fixed errors after merge with origin:lm
|
2023-06-17 19:20:32 +02:00 |
|
Leon Market
|
3d02d8d4c0
|
Added
|
2023-06-17 19:16:48 +02:00 |
|
Leon Market
|
cafe763c4a
|
Removed unnecessary code parts
|
2023-06-17 19:14:34 +02:00 |
|
Leon Market
|
2cff334056
|
Added detection report
|
2023-06-17 19:00:44 +02:00 |
|
|
|
d32e0a11f5
|
Fixed bug in Detector and VideoDetector
|
2023-06-17 11:20:56 +02:00 |
|
|
|
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)
|
2023-06-16 16:49:20 +02:00 |
|
