Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
559a95b1c2 | ||
|
|
9f253b655c | ||
|
|
d38e05a4b6 | ||
|
|
595d97ef57 | ||
|
|
1c360e8604 | ||
|
|
bd2927ed64 | ||
|
|
30f9c6c3f4 | ||
|
|
9e3652e275 |
No files matched your search
@@ -2,13 +2,6 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.example.greenwatch">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
@@ -16,6 +9,24 @@
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.GreenWatch">
|
||||
<activity
|
||||
android:name=".ConnectionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".VideodetectionAndAccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AudiodetectionAndAccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".VideodetectionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AudiodetectionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true">
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class AccelerometerActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivityButton;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_accelerometer);
|
||||
|
||||
backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);
|
||||
|
||||
backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,225 +0,0 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import android.graphics.SurfaceTexture;
|
||||
import android.media.MediaCodec;
|
||||
import android.media.MediaExtractor;
|
||||
import android.media.MediaFormat;
|
||||
import android.media.MediaMuxer;
|
||||
import android.media.MediaRecorder;
|
||||
import android.os.Environment;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class AlarmRecorder {
|
||||
private String videoPath;
|
||||
private String audioPath;
|
||||
private MediaFormat videoFormat;
|
||||
private MediaFormat audioFormat;
|
||||
private MediaExtractor videoExtractor;
|
||||
private MediaExtractor audioExtractor;
|
||||
private Runnable audioRecorderRunnable;
|
||||
private Runnable videoRecorderRunnable;
|
||||
private MediaRecorder videoRecorder;
|
||||
private MediaRecorder audioRecorder;
|
||||
//private SurfaceHolder previewHolder;
|
||||
private Surface surface;
|
||||
private Thread videoThread; // Video-Thread als Instanzvariable
|
||||
private Thread audioThread; // Audio-Thread als Instanzvariable
|
||||
|
||||
public AlarmRecorder(SurfaceTexture surfaceTexture) {
|
||||
audioRecorder = new MediaRecorder();
|
||||
videoRecorder = new MediaRecorder();
|
||||
videoExtractor = new MediaExtractor();
|
||||
audioExtractor = new MediaExtractor();
|
||||
this.surface = new Surface(surfaceTexture);
|
||||
}
|
||||
|
||||
public void startRecording() {
|
||||
createStoragePaths(); //Speicherort und -namen für Audio- und Video-Datei
|
||||
|
||||
audioRecorderRunnable = new AudioRecorder(audioRecorder, audioPath);
|
||||
videoRecorderRunnable = new VideoRecorder(videoRecorder, videoPath, surface);
|
||||
audioThread = new Thread(audioRecorderRunnable);
|
||||
videoThread = new Thread(videoRecorderRunnable);
|
||||
|
||||
//Threads starten
|
||||
videoThread.start();
|
||||
audioThread.start();
|
||||
}
|
||||
|
||||
public void stopRecording() {
|
||||
try {
|
||||
stopVideoRecording();
|
||||
stopAudioRecording();
|
||||
|
||||
waitTillThreadsStopped();
|
||||
File videoFile = new File(videoPath); //Speichere das aufgenommene Video
|
||||
File audioFile = new File(audioPath); //Speichere die aufgenommene Audio
|
||||
|
||||
if (videoFile.exists() && audioFile.exists()) {
|
||||
//Wenn Video- und Audioaufzeichnung gestoppt und abgespeichert sind, beginne mit dem Mergeprozess der beiden
|
||||
mergeVideoWithAudio();
|
||||
}
|
||||
} catch (RuntimeException stopException) {
|
||||
stopException.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private void createStoragePaths(){
|
||||
//Pfade zum Zwischenspeichern der aufgenommenen Audio und Video-Datei
|
||||
String externalStorageDirectory = Environment.getExternalStorageDirectory().getAbsolutePath();
|
||||
String dcimDirectory = externalStorageDirectory + "/DCIM";
|
||||
videoPath = dcimDirectory + "/video.mp4";
|
||||
audioPath = dcimDirectory + "/audio.mp3";
|
||||
}
|
||||
|
||||
private void stopVideoRecording(){
|
||||
if (videoRecorder != null) {
|
||||
videoRecorder.stop();
|
||||
videoRecorder.release();
|
||||
videoRecorder = null;
|
||||
}
|
||||
}
|
||||
|
||||
private void stopAudioRecording(){
|
||||
if (audioRecorder != null) {
|
||||
audioRecorder.stop();
|
||||
audioRecorder.release();
|
||||
audioRecorder = null;
|
||||
}
|
||||
}
|
||||
|
||||
private void waitTillThreadsStopped(){
|
||||
try {
|
||||
videoThread.join();
|
||||
audioThread.join();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private void mergeVideoWithAudio() {
|
||||
try {
|
||||
setVideoExtractorDataSource(); //extrahieren der Video Datei, die zuvor zwischengespeichert wurde
|
||||
setAudioExtractorDataSource(); //extrahieren der Audio Datei, die zuvor zwischengespeichert wurde
|
||||
|
||||
//Speicherort der später zusammengeführten Datei
|
||||
String outputFilePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath() + "/merged_video.mp4";
|
||||
//MediaMuxer zum Zusammenführen einer Audio- und einer Videodatei
|
||||
MediaMuxer muxer = new MediaMuxer(outputFilePath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
|
||||
int videoTrack = muxer.addTrack(videoFormat);
|
||||
int audioTrack = muxer.addTrack(audioFormat);
|
||||
muxer.start();
|
||||
|
||||
ByteBuffer buffer = ByteBuffer.allocate(1024 * 1024);
|
||||
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
||||
|
||||
videoExtraction(buffer, videoTrack, bufferInfo, muxer);
|
||||
audioExtraction(buffer, audioTrack, bufferInfo, muxer);
|
||||
|
||||
muxer.stop();
|
||||
muxer.release();
|
||||
|
||||
// Löschen der separaten Video- und Audio-Dateien
|
||||
deleteVideoFile();
|
||||
deleteAudioFile();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private void setVideoExtractorDataSource() {
|
||||
try {
|
||||
videoExtractor.setDataSource(videoPath);
|
||||
int videoTrackIndex = getTrackIndex(videoExtractor, "video/");
|
||||
if (videoTrackIndex < 0) {
|
||||
// Video-Track nicht gefunden
|
||||
return;
|
||||
}
|
||||
videoExtractor.selectTrack(videoTrackIndex);
|
||||
videoFormat = videoExtractor.getTrackFormat(videoTrackIndex);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private void setAudioExtractorDataSource() {
|
||||
try {
|
||||
audioExtractor.setDataSource(audioPath);
|
||||
int audioTrackIndex = getTrackIndex(audioExtractor, "audio/");
|
||||
if (audioTrackIndex < 0) {
|
||||
// Audio-Track nicht gefunden
|
||||
return;
|
||||
}
|
||||
audioExtractor.selectTrack(audioTrackIndex);
|
||||
audioFormat = audioExtractor.getTrackFormat(audioTrackIndex);
|
||||
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private int getTrackIndex(MediaExtractor extractor, String mimeType) {
|
||||
int trackCount = extractor.getTrackCount();
|
||||
for (int i = 0; i < trackCount; i++) {
|
||||
MediaFormat format = extractor.getTrackFormat(i);
|
||||
String trackMimeType = format.getString(MediaFormat.KEY_MIME);
|
||||
if (trackMimeType.startsWith(mimeType)) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private void videoExtraction(ByteBuffer buffer, int videoTrack, MediaCodec.BufferInfo bufferInfo, MediaMuxer muxer) {
|
||||
videoExtractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
|
||||
while (true) {
|
||||
int sampleSize = videoExtractor.readSampleData(buffer, 0);
|
||||
if (sampleSize < 0) {
|
||||
break;
|
||||
}
|
||||
long presentationTimeUs = videoExtractor.getSampleTime();
|
||||
bufferInfo.offset = 0;
|
||||
bufferInfo.size = sampleSize;
|
||||
bufferInfo.flags = MediaCodec.BUFFER_FLAG_KEY_FRAME;
|
||||
bufferInfo.presentationTimeUs = presentationTimeUs;
|
||||
muxer.writeSampleData(videoTrack, buffer, bufferInfo);
|
||||
videoExtractor.advance();
|
||||
}
|
||||
}
|
||||
|
||||
private void audioExtraction(ByteBuffer buffer, int audioTrack, MediaCodec.BufferInfo bufferInfo, MediaMuxer muxer) {
|
||||
audioExtractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
|
||||
while (true) {
|
||||
int sampleSize = audioExtractor.readSampleData(buffer, 0);
|
||||
if (sampleSize < 0) {
|
||||
break;
|
||||
}
|
||||
long presentationTimeUs = audioExtractor.getSampleTime();
|
||||
bufferInfo.offset = 0;
|
||||
bufferInfo.size = sampleSize;
|
||||
bufferInfo.flags = 0; // or MediaCodec.BUFFER_FLAG_KEY_FRAME
|
||||
bufferInfo.presentationTimeUs = presentationTimeUs;
|
||||
muxer.writeSampleData(audioTrack, buffer, bufferInfo);
|
||||
audioExtractor.advance();
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteVideoFile(){
|
||||
File videoFile = new File(videoPath);
|
||||
if (videoFile.exists()) {
|
||||
videoFile.delete();
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteAudioFile(){
|
||||
File audioFile = new File(audioPath);
|
||||
if (audioFile.exists()) {
|
||||
audioFile.delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class AudioRecorder implements Runnable {
|
||||
|
||||
private final MediaRecorder audioRecorder;
|
||||
private final String audioPath;
|
||||
public AudioRecorder(MediaRecorder audioRecorder, String audioPath) {
|
||||
this.audioRecorder = audioRecorder;
|
||||
this.audioPath = audioPath;
|
||||
}
|
||||
@Override
|
||||
public void run() {
|
||||
audioRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
|
||||
audioRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
|
||||
audioRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
|
||||
audioRecorder.setOutputFile(audioPath);
|
||||
|
||||
try {
|
||||
audioRecorder.prepare();
|
||||
audioRecorder.start();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class AudiodetectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivityButton;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection);
|
||||
|
||||
backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
|
||||
|
||||
backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection_and_accelerometer);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Beschleunigungssensor {
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class ConnectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_connection);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.connectionBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Kamera {
|
||||
}
|
||||
@@ -1,101 +1,92 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.SurfaceTexture;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.TextureView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
public class MainActivity extends AppCompatActivity implements TextureView.SurfaceTextureListener{
|
||||
|
||||
private boolean isRecording = false;
|
||||
private static final int REQUEST_PERMISSION = 200;
|
||||
private Button button;
|
||||
private TextureView textureView;
|
||||
private AlarmRecorder alarmRecorder;
|
||||
private Button audiodetectionButton;
|
||||
private Button videodetectionButton;
|
||||
private Button accelerometerButton;
|
||||
private Button audiodetectionAndAccelerometerButton;
|
||||
private Button videodetectionAndAccelerometerButton;
|
||||
private Button connectionButton;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
button = findViewById(R.id.button);
|
||||
textureView = findViewById(R.id.textureView);
|
||||
textureView.setSurfaceTextureListener(this);
|
||||
|
||||
button.setOnClickListener(new View.OnClickListener() {
|
||||
audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
|
||||
videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
|
||||
accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
|
||||
audiodetectionAndAccelerometerButton = (Button) findViewById(R.id.audiodetectionAndAccelerometerButton);
|
||||
videodetectionAndAccelerometerButton = (Button) findViewById(R.id.videodetectionAndAccelerometerButton);
|
||||
connectionButton = (Button) findViewById(R.id.connectionButton);
|
||||
audiodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (!isRecording) {
|
||||
if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.CAMERA)
|
||||
!= PackageManager.PERMISSION_GRANTED
|
||||
|| ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||
!= PackageManager.PERMISSION_GRANTED
|
||||
|| ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.RECORD_AUDIO)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(MainActivity.this,
|
||||
new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO},
|
||||
REQUEST_PERMISSION);
|
||||
} else {
|
||||
isRecording = true;
|
||||
alarmRecorder.startRecording();
|
||||
}
|
||||
} else {
|
||||
isRecording = false;
|
||||
alarmRecorder.stopRecording();
|
||||
}
|
||||
openAudiodetectionActivity();
|
||||
}
|
||||
});
|
||||
videodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openVideodetectionActivity();
|
||||
}
|
||||
});
|
||||
accelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openAccelerometerActivity();
|
||||
}
|
||||
});
|
||||
audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openAudiodetectionAndAccelerometerActivity();
|
||||
}
|
||||
});
|
||||
videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openVideodetectionAndAccelerometerActivity();
|
||||
}
|
||||
});
|
||||
connectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openConnectionActivity();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) {
|
||||
alarmRecorder = new AlarmRecorder(surfaceTexture);
|
||||
public void openAudiodetectionActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionActivity(){
|
||||
Intent intent = new Intent(this, VideodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAudiodetectionAndAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionAndAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openConnectionActivity(){
|
||||
Intent intent = new Intent(this, ConnectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
|
||||
// Die Größe der SurfaceTexture hat sich geändert
|
||||
// Hier können entsprechende Anpassungen vorgenommen werden
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
|
||||
// SurfaceTexture wurde zerstört
|
||||
// Hier können entsprechende Bereinigungen durchgeführt werden
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureUpdated(SurfaceTexture surface) {
|
||||
// SurfaceTexture wurde aktualisiert
|
||||
// Hier können entsprechende Aktionen ausgeführt werden, wenn gewünscht
|
||||
}
|
||||
|
||||
private SurfaceTexture getSurfaceTexture() {
|
||||
return textureView.getSurfaceTexture();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == REQUEST_PERMISSION) {
|
||||
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
// Berechtigungen wurden gewährt
|
||||
Toast.makeText(this, "Berechtigungen gewährt", Toast.LENGTH_SHORT).show();
|
||||
isRecording = true;
|
||||
alarmRecorder.startRecording();
|
||||
} else {
|
||||
// Berechtigungen wurden nicht gewährt
|
||||
Toast.makeText(this, "Berechtigungen nicht gewährt", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Mikrofon {
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class VideoRecorder implements Runnable{
|
||||
private final MediaRecorder videoRecorder;
|
||||
private final String videoPath;
|
||||
//private SurfaceHolder previewHolder;
|
||||
private Surface surface;
|
||||
|
||||
|
||||
public VideoRecorder(MediaRecorder videoRecorder, String videoPath, Surface surface) {
|
||||
this.videoRecorder = videoRecorder;
|
||||
this.videoPath = videoPath;
|
||||
this.surface = surface;
|
||||
}
|
||||
@Override
|
||||
public void run() {
|
||||
videoRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
|
||||
videoRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
|
||||
videoRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
|
||||
videoRecorder.setOutputFile(videoPath);
|
||||
videoRecorder.setOrientationHint(90);
|
||||
videoRecorder.setPreviewDisplay(surface);
|
||||
|
||||
try {
|
||||
videoRecorder.prepare();
|
||||
videoRecorder.start();
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class VideodetectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class VideodetectionAndAccelerometerActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection_and_accelerometer);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.example.greenwatch.mvc;
|
||||
|
||||
|
||||
public class Device {
|
||||
|
||||
private String sensor;
|
||||
private Boolean isActive;
|
||||
|
||||
public Device(String Sensor, Boolean Status) {
|
||||
this.sensor = Sensor;
|
||||
this.isActive = Status;
|
||||
}
|
||||
|
||||
public void setSensor(String Sensor) {
|
||||
this.sensor = Sensor;
|
||||
}
|
||||
|
||||
public String getSensor() {
|
||||
return sensor;
|
||||
}
|
||||
|
||||
public void setIsActive(Boolean Status) {
|
||||
this.isActive = Status;
|
||||
}
|
||||
|
||||
public Boolean getIsActive() {
|
||||
return isActive;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.example.greenwatch.mvc;
|
||||
|
||||
public class DeviceController {
|
||||
|
||||
private DeviceModel deviceModel;
|
||||
private DeviceView deviceView;
|
||||
|
||||
public DeviceController(DeviceView view) {
|
||||
this.deviceModel = DeviceModel.getInstance();
|
||||
this.deviceView = view;
|
||||
}
|
||||
|
||||
public void createDevice(String Sensor, Boolean Status) {
|
||||
Device device = new Device(Sensor, Status);
|
||||
deviceModel.addDevice(device);
|
||||
// todo: Inform view and sender about changes
|
||||
}
|
||||
public void setDeviceSensor(String UUID, String Sensor) {
|
||||
deviceModel.setDeviceSensor(UUID, Sensor);
|
||||
}
|
||||
|
||||
public String getDeviceSensor(String UUID) {
|
||||
return deviceModel.getDeviceSensor(UUID);
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String UUID, Boolean Status) {
|
||||
deviceModel.setDeviceStatus(UUID, Status);
|
||||
}
|
||||
|
||||
public Boolean getDeviceStatus(String UUID) {
|
||||
return deviceModel.getDeviceStatus(UUID);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.example.greenwatch.mvc;
|
||||
|
||||
import java.util.Vector;
|
||||
|
||||
public class DeviceModel {
|
||||
private static DeviceModel itemModelInstance;
|
||||
// todo: should be a hashmap with UUID Keys
|
||||
private Vector<Device> connectetDevicesList;
|
||||
|
||||
private DeviceModel() {
|
||||
connectetDevicesList = new Vector<Device>();
|
||||
}
|
||||
|
||||
public static synchronized DeviceModel getInstance() {
|
||||
if (itemModelInstance == null){
|
||||
itemModelInstance = new DeviceModel();
|
||||
}
|
||||
return itemModelInstance;
|
||||
}
|
||||
|
||||
public void addDevice(Device device) {
|
||||
// todo: Check if divece already exist
|
||||
connectetDevicesList.add(device);
|
||||
}
|
||||
|
||||
public Vector<Device> getConnectetDevicesList() {
|
||||
return connectetDevicesList;
|
||||
}
|
||||
|
||||
public void setDeviceSensor(String UUID, String Sensor) {
|
||||
// todo: iterate through HashMap and find Divece for UUID
|
||||
}
|
||||
|
||||
public String getDeviceSensor(String UUID) {
|
||||
// todo: iterate through HashMap and find Divece for UUID
|
||||
return "hasToBeDone";
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String UUID, Boolean Status) {
|
||||
// todo: iterate through HashMap and find Divece for UUID
|
||||
}
|
||||
|
||||
public Boolean getDeviceStatus(String UUID) {
|
||||
// todo: iterate through HashMap and find Divece for UUID
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.example.greenwatch.mvc;
|
||||
|
||||
import java.util.Vector;
|
||||
|
||||
public class DeviceView {
|
||||
|
||||
public void updateView(Vector<Device> deviceVector) {
|
||||
// todo: what should be displayed
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/accelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Audiodetection Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectorBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionAndAccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Audiodetection + Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionAndAccelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".ConnectionActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvConnectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Connection Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/connectionBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,31 +1,75 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<TextureView
|
||||
android:id="@+id/textureView"
|
||||
android:layout_width="1sp"
|
||||
android:layout_height="1sp"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/button"
|
||||
app:layout_constraintVertical_bias="0.0" />
|
||||
<TextView
|
||||
android:id="@+id/tvStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Hello World!"
|
||||
android:layout_weight="1">
|
||||
</TextView>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="1">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="339dp"
|
||||
android:text="Record Video"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
<Button
|
||||
android:id="@+id/audiodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection">
|
||||
</Button>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<Button
|
||||
android:id="@+id/videodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Videodetection">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/accelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionAndAccelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection + Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionAndAccelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Videodetection + Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/connectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Connect to Devices">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Videodetection Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectorBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionAndAccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Videodetection + Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
Reference in new issue
Block a user