|
|
44e056b5fe
|
Merge branch 'ko'
# Conflicts:
# app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
|
2023-06-15 17:06:56 +02:00 |
|
|
|
df1fefef5f
|
added Toggle Button to start Cam Detection
|
2023-06-15 16:59:17 +02:00 |
|
|
|
df9b28c830
|
merge Kommunikation Version 1.2 UDP Socket
|
2023-06-15 16:56:59 +02:00 |
|
|
|
6ec0b175e4
|
merge Kommunikation Version 1.2 UDP Socket
|
2023-06-15 16:56:21 +02:00 |
|
|
|
5bcd465ecc
|
Merge branch 'master' into ko
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/res/layout/activity_main.xml
# gradle/wrapper/gradle-wrapper.properties
|
2023-06-15 16:20:40 +02:00 |
|
|
|
a6fdf3f774
|
added landscape xml file
|
2023-06-15 16:12:30 +02:00 |
|
|
|
b46db4cdfc
|
reworked Button Positions
|
2023-06-15 16:04:50 +02:00 |
|
|
|
74eb3e0d98
|
Added Toggle Buttons for Detection Mode
Added Scrollview for alarm
|
2023-06-12 20:23:42 +02:00 |
|
|
|
5f7e2a43f2
|
added new Project ueberwachungssystem
|
2023-06-12 19:04:22 +02:00 |
|
|
|
07f60f974b
|
added new Project ueberwachungssystem
|
2023-06-12 14:15:39 +02:00 |
|
|
|
11dbcd0362
|
Merge branch 'bk_video' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master
|
2023-06-02 15:51:55 +00:00 |
|
|
|
047d45f1cb
|
Added comments to VideoDetector class
|
2023-06-02 17:48:41 +02:00 |
|
|
|
95919a6602
|
preparing branch for merge
|
2023-06-02 14:56:57 +02:00 |
|
|
|
19d1bfe1e3
|
Refactor
|
2023-05-29 10:43:51 +02:00 |
|
|
|
e9da712882
|
Merge remote-tracking branch 'origin/bk_video' into bk_video
|
2023-05-28 22:30:58 +02:00 |
|
|
|
804c5aba36
|
Removed old Luminosity detection
|
2023-05-28 22:30:22 +02:00 |
|
|
|
c5577b125f
|
Changed VideoDetector.java to detect based on changed pixel count instead of average luminosity
|
2023-05-28 22:30:22 +02:00 |
|
|
|
6100d17bd2
|
Refactored in Main
|
2023-05-28 22:30:22 +02:00 |
|
|
|
74a291bdd6
|
Removed olf Luminosity detection
|
2023-05-28 22:28:23 +02:00 |
|
|
|
ba6765b1fb
|
Changed VideoDetector.java to detect based on changed pixel count instead of average luminosity
|
2023-05-28 22:20:56 +02:00 |
|
|
|
9fce3be6a8
|
Refactored some stuff in Main
|
2023-05-28 22:19:30 +02:00 |
|
|
|
9892fc35bc
|
Refactor of Detector.java
|
2023-05-28 22:19:05 +02:00 |
|
|
|
62a528d33b
|
Implemented VideoDetector as a child class of abstract class Detector
|
2023-05-28 21:16:17 +02:00 |
|
|
|
37617dbd54
|
Fixed a bug in Detector.java
|
2023-05-25 10:54:08 +02:00 |
|
|
|
569bd43163
|
Adjusted some values in xml and video detector for showcase
|
2023-05-25 10:20:11 +02:00 |
|
|
|
fdb0036ea6
|
Added comments to abstract class "Detector"
|
2023-05-25 10:19:21 +02:00 |
|
|
|
f9797f2dca
|
Added Abstract class Detector
|
2023-05-24 23:51:49 +02:00 |
|
|
|
ba75c58a23
|
Refactor
|
2023-05-24 22:16:54 +02:00 |
|
|
|
3d799ae461
|
Rebuild Demo in Main Activity
|
2023-05-18 15:05:09 +02:00 |
|
|
|
2501662737
|
Fixed a bug in the video decoder
|
2023-05-18 12:02:18 +02:00 |
|
|
|
d04d166e14
|
Added log function to detection report
|
2023-05-18 12:01:45 +02:00 |
|
|
|
1576719d10
|
Added onDetectionListener to VideoDecoder
|
2023-05-16 22:35:50 +02:00 |
|
|
|
362af75b9a
|
Added DetectionReportCalss
|
2023-05-16 22:34:32 +02:00 |
|
|
|
bef5d03494
|
Added functions for checking luminosity violation
|
2023-05-16 19:15:57 +02:00 |
|
|
|
80ebf77eb6
|
Removed empty Text File
|
2023-05-16 17:48:33 +02:00 |
|
|
|
c4ed247a05
|
added Functions to VideoDetector:
startDetection(), stopDetection(), isRunning()
|
2023-05-16 17:42:10 +02:00 |
|
|
|
323786859e
|
added Video Decoder Class
|
2023-05-12 18:45:13 +02:00 |
|
|
|
354bf937b2
|
added camerax libraries to build.gradle
|
2023-05-12 09:37:58 +02:00 |
|
|
|
39bb37f5c3
|
removed VideoDetection.java
|
2023-05-11 21:46:15 +02:00 |
|
|
|
b198dc2e06
|
small refactor
|
2023-05-11 21:33:40 +02:00 |
|
BepsiKohler
|
d83cd3dc32
|
Added camera access permission
|
2023-05-11 20:58:01 +02:00 |
|
|
|
57bf2c2fb7
|
added new Project ueberwachungssystem
|
2023-05-11 15:31:47 +02:00 |
|
|
|
065acefeb9
|
Merge branch 'ms' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master
|
2023-05-11 13:29:40 +00:00 |
|
|
|
5c0263198c
|
added new Project ueberwachungssystem
|
2023-05-11 15:25:28 +02:00 |
|
|
|
dda3d5693a
|
Initial commit Project Version 0
|
2023-05-11 15:08:50 +02:00 |
|
|
|
353f352dd1
|
Dateien hochladen nach „“
How to git good
|
2023-05-11 13:01:31 +00:00 |
|
|
|
a4e8086fbb
|
Merge branch 'bk' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master
|
2023-05-11 12:46:10 +00:00 |
|
|
|
5c608debc6
|
test
|
2023-05-11 14:43:58 +02:00 |
|
|
|
7793dbb9e2
|
added assignment and gitignore
|
2023-05-11 14:39:27 +02:00 |
|
|
|
2e38a1392e
|
Initial commit
|
2023-05-11 12:13:36 +00:00 |
|
