bauseweinfr74630/mMDT5_GreenWatch
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Benutzeroberflaeche #2

Manually merged
Tinzch67102 merged 36 commits from Benutzeroberflaeche into master 2023-06-23 16:21:00 +00:00
Conversation 0 Commits 36 Files Changed 39 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1f90952d2 - Show all commits

8
app/src/main/java/com/example/greenwatch/alarmrecorder/AlarmRecorder.java
View File

@ -65,17 +65,17 @@ public class AlarmRecorder {
setVideoPath(videoPath);
setVideoRecorderPreviewHolder(previewHolder);
audioThread = new Thread(audioRecorderRunnable);
//audioThread = new Thread(audioRecorderRunnable);
videoThread = new Thread(videoRecorderRunnable);
//Threads starten
videoThread.start();
audioThread.start();
//audioThread.start();
}
public void stopRecording(Context context) {
try {
stopAudioRecording();
//stopAudioRecording();
stopVideoRecording();
Toast.makeText(context, "Video- und Audioaufzeichnung beendet", Toast.LENGTH_SHORT).show();
@ -86,7 +86,7 @@ public class AlarmRecorder {
if (videoFile.exists() && audioFile.exists()) {
//Wenn Video- und Audioaufzeichnung gestoppt und abgespeichert sind, beginne mit dem Mergeprozess der beiden
mergeVideoWithAudio();
// mergeVideoWithAudio();
Toast.makeText(context, "Video und Audio erfolgreich zusammengeführt", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(context, "Dateien wurden nicht gefunden!", Toast.LENGTH_SHORT).show();

3
app/src/main/java/com/example/greenwatch/alarmrecorder/runnables/AudioRecorder.java
View File

@ -10,9 +10,10 @@ import java.io.IOException;
public class AudioRecorder implements Runnable {
private MediaRecorder audioRecorder = null;
private MediaRecorder audioRecorder;
private String audioPath;
public AudioRecorder() {
audioRecorder = new MediaRecorder();
}
public void setAudioPath(String audioPath) {

2
app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java
View File

@ -55,7 +55,7 @@ public class WiFiCommunication {
}
public void setRecievedSting(String rxString) {
this.rxString = rxString;
mDeviceRepository.getNewReceivedMessage(this.rxString);
//mDeviceRepository.getNewReceivedMessage(this.rxString);
}
public void setNewMessage(String newMessage, boolean isNewMessage){