Compare commits
1 Commits
master
...
Benutzerob
| Author | SHA1 | Date | |
|---|---|---|---|
| 870b94e6b1 |
@ -3,14 +3,8 @@
|
||||
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.CAMERA"/>
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
|
||||
|
||||
<uses-feature android:name="android.hardware.camera"/>
|
||||
|
||||
|
||||
@ -11,7 +11,6 @@ import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
@ -28,25 +27,20 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
||||
|
||||
private SensorManager accelerometerManager;
|
||||
private Sensor accelerometerSensor;
|
||||
private SurfaceView surfaceView;
|
||||
private TextView accelerometerStatusMessage;
|
||||
private TextView accelerometerDataTV;
|
||||
private TextView tvAccelerometerdeviceListRecyclerView;
|
||||
private TextView tvAccelerometeralarmHistoryListRecyclerView;
|
||||
private TextView accelerometerWarningTV;
|
||||
private Button backToMainActivityButton;
|
||||
private AccelerometerViewModel mAccelerometerViewModel;
|
||||
private Permission permission = new Permission();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_accelerometer);
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAccelerometer);
|
||||
accelerometerStatusMessage = (TextView) findViewById(R.id.tvAccelerometerStatusmessage);
|
||||
accelerometerDataTV = (TextView) findViewById(R.id.tvAccelerometerData);
|
||||
tvAccelerometerdeviceListRecyclerView = (TextView) findViewById(R.id.tvAccelerometerdeviceListRecyclerView);
|
||||
tvAccelerometeralarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAccelerometeralarmHistoryListRecyclerView);
|
||||
accelerometerWarningTV = (TextView) findViewById(R.id.tvAccelerometerWarning);
|
||||
backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
@ -71,7 +65,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
||||
});
|
||||
|
||||
mAccelerometerViewModel = new ViewModelProvider(this).get(AccelerometerViewModel.class);
|
||||
mAccelerometerViewModel.init(surfaceView.getHolder());
|
||||
mAccelerometerViewModel.init();
|
||||
mAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -90,26 +84,9 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
|
||||
Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAccelerometerViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
}
|
||||
else {
|
||||
permission.alarmRechteAnfordern(AccelerometerActivity.this);
|
||||
if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
|
||||
Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAccelerometerViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
}
|
||||
else {
|
||||
Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAccelerometerViewModel.stopAlarmRecording(AccelerometerActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
mAccelerometerViewModel.stopAlarmRecording(AccelerometerActivity.this);
|
||||
Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
@ -119,10 +96,10 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAccelerometerViewModel.getAccelerometerSensorMeanValue());
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
|
||||
}
|
||||
else {
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0.0f);
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -6,8 +6,9 @@ import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
@ -16,17 +17,14 @@ import android.widget.Toast;
|
||||
import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
|
||||
import com.example.greenwatch.adapters.DeviceListAdapter;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.viewmodels.AccelerometerViewModel;
|
||||
import com.example.greenwatch.viewmodels.MicrofonViewModel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AudiodetectionActivity extends AppCompatActivity {
|
||||
private TextView microfonStatusMessage;
|
||||
private TextView tvAAudiodetectionAlarmHistoryListRecyclerView;
|
||||
private TextView tvAudiodetectionDeviceListRecyclerView;
|
||||
private Button backToMainActivityButton;
|
||||
private SurfaceView surfaceView;
|
||||
private Permission permission = new Permission();
|
||||
private MicrofonViewModel mMicrofonViewModel;
|
||||
|
||||
@Override
|
||||
@ -34,10 +32,7 @@ public class AudiodetectionActivity extends AppCompatActivity {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection);
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAudio);
|
||||
microfonStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionStatusmessage);
|
||||
tvAAudiodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAlarmHistoryListRecyclerView);
|
||||
tvAudiodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionDeviceListRecyclerView);
|
||||
backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
@ -62,7 +57,7 @@ public class AudiodetectionActivity extends AppCompatActivity {
|
||||
});
|
||||
|
||||
mMicrofonViewModel = new ViewModelProvider(this).get(MicrofonViewModel.class);
|
||||
mMicrofonViewModel.init(surfaceView.getHolder());
|
||||
mMicrofonViewModel.init();
|
||||
mMicrofonViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -81,25 +76,10 @@ public class AudiodetectionActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
|
||||
Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMicrofonViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
} else {
|
||||
permission.alarmRechteAnfordern(AudiodetectionActivity.this);
|
||||
if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
|
||||
Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMicrofonViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
} else {
|
||||
Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMicrofonViewModel.stopAlarmRecording(AudiodetectionActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMicrofonViewModel.stopAlarmRecording(AudiodetectionActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -108,16 +88,23 @@ public class AudiodetectionActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Audio", mMicrofonViewModel.getAmplitudeInDB());
|
||||
mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
|
||||
microfonStatusMessage.setText("dB value - detected = " + (int) mMicrofonViewModel.getAmplitudeInDB() + " dB");
|
||||
}
|
||||
else {
|
||||
mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Audio", 0.0f);
|
||||
mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
|
||||
if((int) mMicrofonViewModel.getAmplitudeInDB() > 0){
|
||||
microfonStatusMessage.setText("dB value - no longer detected = " + (int) mMicrofonViewModel.getAmplitudeInDB()+ " dB");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
@ -11,7 +11,6 @@ import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
@ -21,30 +20,23 @@ import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
|
||||
import com.example.greenwatch.adapters.DeviceListAdapter;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.viewmodels.AudiodetectionAndAccelerometerViewModel;
|
||||
import com.example.greenwatch.viewmodels.VideodetectionAndAccelerometerViewModel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
|
||||
private SensorManager accelerometerManager;
|
||||
private Sensor accelerometerSensor;
|
||||
private SurfaceView surfaceView;
|
||||
private TextView audiodetectionAndAccelerometerStatusMessage;
|
||||
private TextView tvAudiodetectionAndAccelerometerDeviceListRecyclerView;
|
||||
private TextView tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView;
|
||||
private AudiodetectionAndAccelerometerViewModel mAudiodetectionAndAccelerometerViewModel;
|
||||
private Button backToMainActivity;
|
||||
|
||||
private Permission permission = new Permission();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection_and_accelerometer);
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewAudiodetectionAndAccelerometer);
|
||||
audiodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerStatusmessage);
|
||||
tvAudiodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerDeviceListRecyclerView);
|
||||
tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView);
|
||||
backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
@ -69,7 +61,7 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
});
|
||||
|
||||
mAudiodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(AudiodetectionAndAccelerometerViewModel.class);
|
||||
mAudiodetectionAndAccelerometerViewModel.init(surfaceView.getHolder());
|
||||
mAudiodetectionAndAccelerometerViewModel.init();
|
||||
mAudiodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -88,25 +80,10 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAudiodetectionAndAccelerometerViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
} else {
|
||||
permission.alarmRechteAnfordern(AudiodetectionAndAccelerometerActivity.this);
|
||||
if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAudiodetectionAndAccelerometerViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
} else {
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAudiodetectionAndAccelerometerViewModel.stopAlarmRecording(AudiodetectionAndAccelerometerActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mAudiodetectionAndAccelerometerViewModel.stopAlarmRecording(AudiodetectionAndAccelerometerActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -117,18 +94,18 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
if (aBoolean) {
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedTrue", Toast.LENGTH_LONG).show();
|
||||
if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAudiodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
|
||||
}
|
||||
else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
|
||||
}
|
||||
else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "AudioAndAccelerometer", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedFalse", Toast.LENGTH_LONG).show();
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0.0f);
|
||||
mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0);
|
||||
}
|
||||
|
||||
}
|
||||
@ -181,9 +158,6 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
@Override
|
||||
protected void onPause() {
|
||||
super.onPause();
|
||||
if (isFinishing()){
|
||||
mAudiodetectionAndAccelerometerViewModel.recalibrationMicrofonSensor();
|
||||
}
|
||||
mAudiodetectionAndAccelerometerViewModel.stopMicrofonSensor();
|
||||
if (accelerometerSensor != null) {
|
||||
accelerometerManager.unregisterListener(this, accelerometerSensor);
|
||||
|
||||
@ -6,14 +6,10 @@ import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
|
||||
@ -30,31 +26,20 @@ public class MainActivity extends AppCompatActivity {
|
||||
private Button accelerometerButton;
|
||||
private Button audiodetectionAndAccelerometerButton;
|
||||
private Button videodetectionAndAccelerometerButton;
|
||||
private TextView tvMainActivityDeviceListRecyclerView;
|
||||
private TextView tvMainActivityAlarmHistoryListRecyclerView;
|
||||
private SurfaceView surfaceView;
|
||||
private Button connectionButton;
|
||||
private MainActivityViewModel mMainActivityViewModel;
|
||||
private Permission permission = new Permission();
|
||||
|
||||
private Activity activity = new Activity();
|
||||
private Context context;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
activity = MainActivity.this;
|
||||
context = MainActivity.this;
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewMainActivity);
|
||||
tvMainActivityDeviceListRecyclerView = (TextView) findViewById(R.id.tvMainActivityDeviceListRecyclerView);
|
||||
tvMainActivityAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvMainActivityAlarmHistoryListRecyclerView);
|
||||
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);
|
||||
|
||||
RecyclerView deviceListRecyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
deviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
@ -70,11 +55,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
final AlarmHistoryListAdapter alarmHistoryListAdapter = new AlarmHistoryListAdapter();
|
||||
alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
|
||||
|
||||
permission.startRechtePruefen(this, this);
|
||||
|
||||
mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
|
||||
mMainActivityViewModel.init(surfaceView.getHolder());
|
||||
|
||||
mMainActivityViewModel.init();
|
||||
mMainActivityViewModel.accessRequestCamera(this);
|
||||
mMainActivityViewModel.accessRequestMicrofon(this);
|
||||
mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -93,21 +77,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(context, activity)){
|
||||
Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMainActivityViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
} else {
|
||||
permission.alarmRechteAnfordern(activity);
|
||||
if(permission.alarmRechtePruefen(context, activity)){
|
||||
Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMainActivityViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
} else {
|
||||
Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mMainActivityViewModel.stopAlarmRecording(MainActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
@ -118,23 +88,22 @@ public class MainActivity extends AppCompatActivity {
|
||||
audiodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
if (permission.microRechtePruefen(context, activity)) {
|
||||
if (mMainActivityViewModel.isMicrofonAccessAllowed(MainActivity.this)) {
|
||||
openAudiodetectionActivity();
|
||||
}
|
||||
else {
|
||||
permission.microRechteAnfordern(activity);
|
||||
mMainActivityViewModel.accessRequestMicrofon(MainActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
videodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (permission.kameraRechtePruefen(context, activity)) {
|
||||
if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
|
||||
openVideodetectionActivity();
|
||||
}
|
||||
else {
|
||||
permission.kameraRechteAnfordern(activity);
|
||||
mMainActivityViewModel.accessRequestCamera(MainActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -148,61 +117,51 @@ public class MainActivity extends AppCompatActivity {
|
||||
audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (permission.microRechtePruefen(context, activity)) {
|
||||
if (mMainActivityViewModel.isMicrofonAccessAllowed(MainActivity.this)) {
|
||||
openAudiodetectionAndAccelerometerActivity();
|
||||
}
|
||||
else {
|
||||
permission.microRechteAnfordern(activity);
|
||||
mMainActivityViewModel.accessRequestMicrofon(MainActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (permission.kameraRechtePruefen(context, activity)) {
|
||||
openVideodetectionAndAccelerometerActivity();
|
||||
}
|
||||
else {
|
||||
permission.kameraRechteAnfordern(activity);
|
||||
}
|
||||
openVideodetectionAndAccelerometerActivity();
|
||||
}
|
||||
});
|
||||
connectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openConnectionActivity();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "No Sensor selected", 0.0f);
|
||||
}
|
||||
|
||||
public void openAudiodetectionActivity() {
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "Audio", 0.0f);
|
||||
public void openAudiodetectionActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionActivity() {
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "Video", 0.0f);
|
||||
public void openVideodetectionActivity(){
|
||||
Intent intent = new Intent(this, VideodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAccelerometerActivity() {
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "Accelerometer", 0.0f);
|
||||
public void openAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAudiodetectionAndAccelerometerActivity() {
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0.0f);
|
||||
public void openAudiodetectionAndAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionAndAccelerometerActivity() {
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0.0f);
|
||||
public void openVideodetectionAndAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPause() {
|
||||
super.onPause();
|
||||
public void openConnectionActivity(){
|
||||
//Intent intent = new Intent(this, ConnectionActivity.class);
|
||||
//startActivity(intent);
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", true, "Audio", 10);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,128 +0,0 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import static android.Manifest.permission.CAMERA;
|
||||
import static android.Manifest.permission.RECORD_AUDIO;
|
||||
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
|
||||
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
|
||||
|
||||
import static androidx.core.app.ActivityCompat.requestPermissions;
|
||||
import static androidx.core.content.ContextCompat.checkSelfPermission;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
||||
|
||||
|
||||
public class Permission {
|
||||
private static final int PERMISSION_REQUEST_MICRO = 1;
|
||||
private static final int PERMISSION_REQUEST_CAMERA = 2;
|
||||
private static final int PERMISSION_REQUEST_ALARM = 1234;
|
||||
private static final int PERMISSION_REQUEST_START = 1235;
|
||||
|
||||
public void startRechtePruefen(Context context, Activity activity){
|
||||
boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
|
||||
|
||||
Log.d("Kamera Rechte", String.valueOf(rechtKamera));
|
||||
Log.d("Audio Rechte", String.valueOf(rechtAudio));
|
||||
Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
|
||||
Log.d("Lese Rechte", String.valueOf(rechtLesen));
|
||||
|
||||
if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
|
||||
Log.d("Rechte", "erteilt");
|
||||
} else {
|
||||
startRechteAnfordern(activity);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean kameraRechtePruefen(Context context, Activity activity){
|
||||
boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
|
||||
Log.d("Kamera Rechte", String.valueOf(rechtKamera));
|
||||
|
||||
if(rechtKamera){
|
||||
Log.d("Kamerarechte", "erteilt");
|
||||
return true;
|
||||
} else {
|
||||
kameraRechteAnfordern(activity);
|
||||
if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED){
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean microRechtePruefen(Context context, Activity activity){
|
||||
boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
|
||||
Log.d("Audio Rechte", String.valueOf(rechtAudio));
|
||||
|
||||
if(rechtAudio){
|
||||
Log.d("Rechte", "erteilt");
|
||||
return true;
|
||||
} else {
|
||||
microRechteAnfordern(activity);
|
||||
if(checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED){
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean alarmRechtePruefen(Context context, Activity activity){
|
||||
boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
|
||||
boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
|
||||
|
||||
Log.d("Kamera Rechte", String.valueOf(rechtKamera));
|
||||
Log.d("Audio Rechte", String.valueOf(rechtAudio));
|
||||
Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
|
||||
Log.d("Lese Rechte", String.valueOf(rechtLesen));
|
||||
|
||||
if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
|
||||
Log.d("Rechte", "erteilt");
|
||||
return true;
|
||||
} else {
|
||||
alarmRechteAnfordern(activity);
|
||||
if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED
|
||||
&& checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
|
||||
&& checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
|
||||
&& checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED){
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void startRechteAnfordern(Activity activity){
|
||||
ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_START);
|
||||
}
|
||||
|
||||
public void kameraRechteAnfordern(Activity activity){
|
||||
ActivityCompat.requestPermissions(activity, new String[]{CAMERA}, PERMISSION_REQUEST_CAMERA);
|
||||
}
|
||||
|
||||
public void microRechteAnfordern(Activity activity){
|
||||
ActivityCompat.requestPermissions(activity, new String[]{RECORD_AUDIO}, PERMISSION_REQUEST_MICRO);
|
||||
}
|
||||
|
||||
public void alarmRechteAnfordern(Activity activity){
|
||||
ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_ALARM);
|
||||
}
|
||||
|
||||
}
|
||||
@ -9,15 +9,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
|
||||
import com.example.greenwatch.adapters.DeviceListAdapter;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.viewmodels.AccelerometerViewModel;
|
||||
import com.example.greenwatch.viewmodels.VideodetectionViewModel;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
@ -27,20 +26,13 @@ import java.util.concurrent.ExecutionException;
|
||||
public class VideodetectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
private SurfaceView surfaceView;
|
||||
private TextView tvVideodetectionDeviceListRecyclerView;
|
||||
private TextView tvVideodetectionAlarmHistoryListRecyclerView;
|
||||
private VideodetectionViewModel mVideoDetectionViewModel;
|
||||
private Permission permission = new Permission();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection);
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewVideodetection);
|
||||
tvVideodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionDeviceListRecyclerView);
|
||||
tvVideodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAlarmHistoryListRecyclerView);
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
@ -65,7 +57,7 @@ public class VideodetectionActivity extends AppCompatActivity {
|
||||
});
|
||||
|
||||
mVideoDetectionViewModel = new ViewModelProvider(this).get(VideodetectionViewModel.class);
|
||||
mVideoDetectionViewModel.init(surfaceView.getHolder());
|
||||
mVideoDetectionViewModel.init();
|
||||
mVideoDetectionViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -84,21 +76,7 @@ public class VideodetectionActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
|
||||
Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideoDetectionViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
} else {
|
||||
permission.alarmRechteAnfordern(VideodetectionActivity.this);
|
||||
if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
|
||||
Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideoDetectionViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
} else {
|
||||
Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideoDetectionViewModel.stopAlarmRecording(VideodetectionActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
@ -110,10 +88,10 @@ public class VideodetectionActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
|
||||
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 10);
|
||||
}
|
||||
else {
|
||||
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0.0f);
|
||||
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -13,7 +13,6 @@ import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
@ -33,25 +32,20 @@ import java.util.concurrent.ExecutionException;
|
||||
public class VideodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
|
||||
private SensorManager accelerometerManager;
|
||||
private Sensor accelerometerSensor;
|
||||
private SurfaceView surfaceView;
|
||||
private TextView videodetectionAndAccelerometerStatusMessage;
|
||||
private TextView videodetectionAndAccelerometerDataTV;
|
||||
private TextView tvVideodetectionAndAccelerometerDeviceListRecyclerView;
|
||||
private TextView tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView;
|
||||
private TextView videodetectionAndAccelerometerWarningTV;
|
||||
private Button backToMainActivity;
|
||||
private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
|
||||
private Permission permission = new Permission();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection_and_accelerometer);
|
||||
|
||||
surfaceView = (SurfaceView) findViewById(R.id.surfaceViewVideodetectionAndAccelerometer);
|
||||
videodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerStatusmessage);
|
||||
videodetectionAndAccelerometerDataTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerData);
|
||||
tvVideodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerDeviceListRecyclerView);
|
||||
tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView);
|
||||
videodetectionAndAccelerometerWarningTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerWarning);
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
@ -76,7 +70,7 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
});
|
||||
|
||||
mVideodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(VideodetectionAndAccelerometerViewModel.class);
|
||||
mVideodetectionAndAccelerometerViewModel.init(surfaceView.getHolder());
|
||||
mVideodetectionAndAccelerometerViewModel.init();
|
||||
mVideodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
@ -95,25 +89,10 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
|
||||
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideodetectionAndAccelerometerViewModel.startAlarmRecording();
|
||||
//todo AlarmHandling einfügen
|
||||
} else {
|
||||
permission.alarmRechteAnfordern(VideodetectionAndAccelerometerActivity.this);
|
||||
if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
|
||||
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideodetectionAndAccelerometerViewModel.startAlarmRecording();
|
||||
//todo Alarmhandling einfügen
|
||||
} else {
|
||||
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideodetectionAndAccelerometerViewModel.stopAlarmRecording(VideodetectionAndAccelerometerActivity.this);
|
||||
}
|
||||
}
|
||||
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||
mVideodetectionAndAccelerometerViewModel.stopAlarmRecording(VideodetectionAndAccelerometerActivity.this);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -123,17 +102,17 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
|
||||
}
|
||||
else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
|
||||
}
|
||||
else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "VideoAndAccelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
|
||||
}
|
||||
}
|
||||
else {
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0.0f);
|
||||
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -1,256 +0,0 @@
|
||||
package com.example.greenwatch.alarmrecorder;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
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.SurfaceHolder;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.MainActivity;
|
||||
import com.example.greenwatch.alarmrecorder.runnables.AudioRecorder;
|
||||
import com.example.greenwatch.alarmrecorder.runnables.VideoRecorder;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
import com.example.greenwatch.sensors.CameraSensor;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class AlarmRecorder {
|
||||
private static AlarmRecorder alarmRecorderInstance;
|
||||
private boolean isRecording;
|
||||
private String videoPath;
|
||||
private String audioPath;
|
||||
private MediaFormat videoFormat;
|
||||
private MediaFormat audioFormat;
|
||||
private MediaExtractor videoExtractor;
|
||||
private MediaExtractor audioExtractor;
|
||||
private AudioRecorder audioRecorderRunnable;
|
||||
private VideoRecorder videoRecorderRunnable;
|
||||
private SurfaceHolder previewHolder;
|
||||
private MediaRecorder videoRecorder;
|
||||
//private MediaRecorder audioRecorder;
|
||||
private Thread videoThread; // Video-Thread als Instanzvariable
|
||||
private Thread audioThread; // Audio-Thread als Instanzvariable
|
||||
|
||||
private AlarmRecorder() {
|
||||
//audioRecorder = new MediaRecorder();
|
||||
//videoRecorder = new MediaRecorder();
|
||||
videoExtractor = new MediaExtractor();
|
||||
audioExtractor = new MediaExtractor();
|
||||
audioRecorderRunnable = new AudioRecorder();
|
||||
videoRecorderRunnable = new VideoRecorder();
|
||||
}
|
||||
|
||||
public static synchronized AlarmRecorder getInstance() {
|
||||
if (alarmRecorderInstance == null){
|
||||
alarmRecorderInstance = new AlarmRecorder();
|
||||
}
|
||||
return alarmRecorderInstance;
|
||||
}
|
||||
|
||||
public void setPreviewHolder(SurfaceHolder previewHolder) {
|
||||
this.previewHolder = previewHolder;
|
||||
}
|
||||
|
||||
public void startRecording() {
|
||||
createStoragePaths(); //Speicherort und -namen für Audio- und Video-Datei
|
||||
|
||||
setAudioPath(audioPath);
|
||||
setVideoPath(videoPath);
|
||||
setVideoRecorderPreviewHolder(previewHolder);
|
||||
|
||||
//audioThread = new Thread(audioRecorderRunnable);
|
||||
videoThread = new Thread(videoRecorderRunnable);
|
||||
|
||||
//Threads starten
|
||||
videoThread.start();
|
||||
//audioThread.start();
|
||||
}
|
||||
|
||||
public void stopRecording(Context context) {
|
||||
try {
|
||||
//stopAudioRecording();
|
||||
stopVideoRecording();
|
||||
|
||||
Toast.makeText(context, "Video- und Audioaufzeichnung beendet", Toast.LENGTH_SHORT).show();
|
||||
|
||||
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();
|
||||
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();
|
||||
}
|
||||
} 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 setVideoPath(String videoPath) {
|
||||
videoRecorderRunnable.setVideoPath(videoPath);
|
||||
}
|
||||
|
||||
private void setVideoRecorderPreviewHolder(SurfaceHolder previewHolder) {
|
||||
videoRecorderRunnable.setPreviewHolder(previewHolder);
|
||||
}
|
||||
private void stopVideoRecording(){
|
||||
videoRecorderRunnable.stopVideoRecording();
|
||||
}
|
||||
|
||||
private void setAudioPath(String audioPath) {
|
||||
audioRecorderRunnable.setAudioPath(audioPath);
|
||||
}
|
||||
|
||||
private void stopAudioRecording(){
|
||||
audioRecorderRunnable.stopAudioRecording();
|
||||
}
|
||||
|
||||
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,47 +0,0 @@
|
||||
package com.example.greenwatch.alarmrecorder.runnables;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
import android.view.SurfaceHolder;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.MainActivity;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class AudioRecorder implements Runnable {
|
||||
|
||||
private MediaRecorder audioRecorder;
|
||||
private String audioPath;
|
||||
public AudioRecorder() {
|
||||
audioRecorder = new MediaRecorder();
|
||||
}
|
||||
|
||||
public void setAudioPath(String audioPath) {
|
||||
this.audioPath = audioPath;
|
||||
}
|
||||
|
||||
public void stopAudioRecording(){
|
||||
if (audioRecorder != null) {
|
||||
audioRecorder.stop();
|
||||
audioRecorder.reset();
|
||||
audioRecorder.release();
|
||||
audioRecorder = null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
audioRecorder = new MediaRecorder();
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
package com.example.greenwatch.alarmrecorder.runnables;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import com.example.greenwatch.viewmodels.ViewModelInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class VideoRecorder implements Runnable{
|
||||
private MediaRecorder videoRecorder;
|
||||
private String videoPath;
|
||||
private SurfaceHolder previewHolder;
|
||||
|
||||
public VideoRecorder() {
|
||||
videoRecorder = new MediaRecorder();
|
||||
}
|
||||
|
||||
public void setPreviewHolder(SurfaceHolder previewHolder) {
|
||||
this.previewHolder = previewHolder;
|
||||
}
|
||||
|
||||
public void setVideoPath(String audioPath) {
|
||||
this.videoPath = audioPath;
|
||||
}
|
||||
|
||||
public void stopVideoRecording(){
|
||||
if (videoRecorder != null) {
|
||||
videoRecorder.stop();
|
||||
videoRecorder.reset();
|
||||
videoRecorder.release();
|
||||
videoRecorder = null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
videoRecorder = new MediaRecorder();
|
||||
videoRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
|
||||
videoRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
|
||||
videoRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
|
||||
videoRecorder.setOutputFile(videoPath);
|
||||
videoRecorder.setOrientationHint(90);
|
||||
videoRecorder.setPreviewDisplay(previewHolder.getSurface());
|
||||
|
||||
try {
|
||||
videoRecorder.prepare();
|
||||
videoRecorder.start();
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -17,7 +17,7 @@ public class WiFiCommunication {
|
||||
private final InetAddress address;
|
||||
private final DatagramSocket socket;
|
||||
private final int port;
|
||||
private volatile String rxString;
|
||||
private String rxString;
|
||||
private String sendMessage;
|
||||
//private String sendMsg = "default";
|
||||
private boolean isNewMessage;
|
||||
@ -48,9 +48,7 @@ public class WiFiCommunication {
|
||||
}
|
||||
|
||||
public void setDeviceRepository(DeviceRepository deviceRepository) {
|
||||
if (mDeviceRepository == null) {
|
||||
this.mDeviceRepository = deviceRepository;
|
||||
}
|
||||
this.mDeviceRepository = deviceRepository;
|
||||
}
|
||||
|
||||
public void setNewMessage(String newMessage, boolean isNewMessage){
|
||||
@ -90,7 +88,8 @@ public class WiFiCommunication {
|
||||
if(isNewMessage)
|
||||
{
|
||||
isNewMessage = false;
|
||||
String txString = sendMessage;
|
||||
//todo: adapt send String
|
||||
String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
|
||||
byte[] txBuffer = txString.getBytes();
|
||||
|
||||
DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);
|
||||
|
||||
@ -7,9 +7,9 @@ public class Device {
|
||||
private String deviceID;
|
||||
private boolean sensorStatus;
|
||||
private String sensorType;
|
||||
private float sensorMassage;
|
||||
private int sensorMassage;
|
||||
|
||||
public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
this.timeStamp = timeStamp;
|
||||
this.deviceID = deviceID;
|
||||
this.sensorStatus = sensorStatus;
|
||||
@ -47,11 +47,11 @@ public class Device {
|
||||
return sensorStatus;
|
||||
}
|
||||
|
||||
public void setSensorMassage(float sensorMassage) {
|
||||
public void setSensorMassage(int sensorMassage) {
|
||||
this.sensorMassage = sensorMassage;
|
||||
}
|
||||
|
||||
public float getSensorMassage() {
|
||||
public int getSensorMassage() {
|
||||
return sensorMassage;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
package com.example.greenwatch.repositories;
|
||||
|
||||
|
||||
import android.os.Looper;
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.example.greenwatch.models.Device;
|
||||
@ -44,10 +42,7 @@ public class DeviceRepository {
|
||||
}
|
||||
|
||||
public void setWiFiCommunication(WiFiCommunication wiFiCommunication) {
|
||||
if (mWiFiCommunication == null) {
|
||||
this.mWiFiCommunication = wiFiCommunication;
|
||||
}
|
||||
|
||||
this.mWiFiCommunication = wiFiCommunication;
|
||||
}
|
||||
|
||||
public MutableLiveData<List<Device>> getConnectedDeviceList() {
|
||||
@ -65,7 +60,7 @@ public class DeviceRepository {
|
||||
return startAlarmRecording;
|
||||
}
|
||||
|
||||
public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage){
|
||||
public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
|
||||
Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
||||
if (sensorStatus) {
|
||||
setAlarmHistoryDeviceList(newDevice);
|
||||
@ -81,22 +76,21 @@ public class DeviceRepository {
|
||||
|
||||
public void getNewReceivedMessage(String newMessage) {
|
||||
String[] messageString = messageStringSplitter(newMessage);
|
||||
if(messageString[0].equals("1") && messageString.length == 7) {
|
||||
String timeStamp = messageString[1];
|
||||
String deviceID = messageString[3];
|
||||
boolean sensorStatus = convertRecievedSensorStatus(messageString[4]);
|
||||
String sensorType = messageString[5];
|
||||
float sensorMassage = Float.valueOf(messageString[6]);
|
||||
String timeStamp = messageString[0];
|
||||
String deviceID = messageString[1];
|
||||
boolean sensorStatus = convertSensorStatus(messageString[2]);
|
||||
String sensorType = messageString[3];
|
||||
int sensorMassage = Integer.valueOf(messageString[4]);
|
||||
|
||||
if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
|
||||
return;
|
||||
}
|
||||
if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!connectedDevicesList.containsKey(deviceID)) {
|
||||
createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
||||
} else {
|
||||
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
if(!connectedDevicesList.containsKey(deviceID)) {
|
||||
createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
else {
|
||||
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
}
|
||||
|
||||
@ -104,26 +98,18 @@ public class DeviceRepository {
|
||||
StringBuilder message = new StringBuilder();
|
||||
Device device = connectedDevicesList.get(deviceID);
|
||||
if(device != null) {
|
||||
message.append("1")
|
||||
.append(delimiter)
|
||||
.append(device.getTimeStamp())
|
||||
.append(delimiter)
|
||||
.append("Gruppe3")
|
||||
message.append(device.getTimeStamp())
|
||||
.append(delimiter)
|
||||
.append(device.getDeviceID())
|
||||
.append(delimiter)
|
||||
.append(convertSendSensorStatus(device.getSensorStatus()))
|
||||
.append(device.getSensorStatus())
|
||||
.append(delimiter)
|
||||
.append(device.getSensorType())
|
||||
.append(delimiter)
|
||||
.append(device.getSensorMassage());
|
||||
}
|
||||
else {
|
||||
message.append("1")
|
||||
.append(delimiter)
|
||||
.append("")
|
||||
.append(delimiter)
|
||||
.append("Gruppe3")
|
||||
message.append("")
|
||||
.append(delimiter)
|
||||
.append("")
|
||||
.append(delimiter)
|
||||
@ -140,7 +126,7 @@ public class DeviceRepository {
|
||||
return localDeviceUUID;
|
||||
}
|
||||
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
@ -248,7 +234,7 @@ public class DeviceRepository {
|
||||
return "";
|
||||
}
|
||||
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
@ -258,7 +244,7 @@ public class DeviceRepository {
|
||||
}
|
||||
}
|
||||
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
@ -275,12 +261,7 @@ public class DeviceRepository {
|
||||
|
||||
private void setMutableLiveDataDeviceList() {
|
||||
List<Device> list = new ArrayList<>(connectedDevicesList.values());
|
||||
if (Looper.myLooper() == Looper.getMainLooper()){
|
||||
deviceList.setValue(list);
|
||||
}
|
||||
else {
|
||||
deviceList.postValue(list);
|
||||
}
|
||||
deviceList.setValue(list);
|
||||
}
|
||||
|
||||
private void setMutableLiveDataAlarmHistoryList() {
|
||||
@ -317,19 +298,10 @@ public class DeviceRepository {
|
||||
return message.split(delimiter);
|
||||
}
|
||||
|
||||
private boolean convertRecievedSensorStatus(String status) {
|
||||
private boolean convertSensorStatus(String status) {
|
||||
return status.equals(sensorStatusKey);
|
||||
}
|
||||
|
||||
private String convertSendSensorStatus(boolean status) {
|
||||
if (status){
|
||||
return "An";
|
||||
}
|
||||
else {
|
||||
return "Aus";
|
||||
}
|
||||
}
|
||||
|
||||
private void setAlarmHistoryDeviceList(Device device) {
|
||||
if (alarmHistoryDeviceList.size() == maxAlarmHistoryListSize) {
|
||||
alarmHistoryDeviceList.remove(alarmHistoryDeviceList.size() -1);
|
||||
|
||||
@ -82,8 +82,4 @@ public class AccelerometerSensor {
|
||||
mAccelerometerAlarmDetected.setValue(false);
|
||||
}
|
||||
}
|
||||
|
||||
public float getAccelerometerSensorMeanValue() {
|
||||
return meanValue;
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,6 +97,7 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
|
||||
for(int i = 0; i < anzahlIterationen; i++){
|
||||
int z = recorder.read(puffer, 0, puffer.length);
|
||||
Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z);
|
||||
System.out.println("Kalibrierung" + kalibrierung.getDB());
|
||||
sum += kalibrierung.getDB();
|
||||
}
|
||||
return sum/anzahlIterationen;
|
||||
|
||||
@ -1,18 +1,9 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
@ -25,20 +16,16 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||
private AccelerometerSensor mAccelerometerSensor;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
public void init() {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mAccelerometerSensor == null) {
|
||||
mAccelerometerSensor = AccelerometerSensor.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
@ -51,7 +38,6 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
if (mAccelerometerAlarmDetected == null) {
|
||||
mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
}
|
||||
|
||||
public void addValueToGesamtBE(float newValue) {
|
||||
@ -70,10 +56,6 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
mAccelerometerSensor.checkAlarmCondition();
|
||||
}
|
||||
|
||||
public float getAccelerometerSensorMeanValue() {
|
||||
return mAccelerometerSensor.getAccelerometerSensorMeanValue();
|
||||
}
|
||||
|
||||
public LiveData<Boolean> getAccelerometerAlarmDetected() {
|
||||
return mAccelerometerAlarmDetected;
|
||||
}
|
||||
@ -94,7 +76,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -139,12 +121,12 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -157,19 +139,4 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
@ -25,14 +21,41 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||
private AccelerometerSensor mAccelerometerSensor;
|
||||
private MicrofonSensor mMicrofonSensor;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private boolean microfonAlarmDetected;
|
||||
private boolean accelerometerAlarmDetected;
|
||||
private boolean microfondetectionAndAccelerometerAlarmDetected;
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mAccelerometerSensor == null) {
|
||||
mAccelerometerSensor = AccelerometerSensor.getInstance();
|
||||
}
|
||||
if (mMicrofonSensor == null) {
|
||||
mMicrofonSensor = MicrofonSensor.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mAccelerometerAlarmDetected == null) {
|
||||
mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
if (mMicrofonAlarmDetected == null) {
|
||||
mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
microfondetectionAndAccelerometerAlarmDetected = false;
|
||||
accelerometerAlarmDetected = false;
|
||||
microfonAlarmDetected = false;
|
||||
registerAlarmObserver();
|
||||
}
|
||||
|
||||
public void addValueToGesamtBE(float newValue) {
|
||||
@ -51,10 +74,6 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
mAccelerometerSensor.checkAlarmCondition();
|
||||
}
|
||||
|
||||
public float getAccelerometerSensorMeanValue() {
|
||||
return mAccelerometerSensor.getAccelerometerSensorMeanValue();
|
||||
}
|
||||
|
||||
public LiveData<Boolean> getAudiodetectionAndAccelerometerAlarmDetected() {
|
||||
setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
|
||||
return mAudiodetectionAndAccelerometerAlarmDetected;
|
||||
@ -125,42 +144,6 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
mAccelerometerAlarmDetected.removeObserver(observer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mAccelerometerSensor == null) {
|
||||
mAccelerometerSensor = AccelerometerSensor.getInstance();
|
||||
}
|
||||
if (mMicrofonSensor == null) {
|
||||
mMicrofonSensor = MicrofonSensor.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mAccelerometerAlarmDetected == null) {
|
||||
mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
if (mMicrofonAlarmDetected == null) {
|
||||
mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
microfondetectionAndAccelerometerAlarmDetected = false;
|
||||
accelerometerAlarmDetected = false;
|
||||
microfonAlarmDetected = false;
|
||||
registerAlarmObserver();
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||
return mDeviceList;
|
||||
@ -177,7 +160,7 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -222,12 +205,12 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -240,19 +223,4 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,6 @@ import android.Manifest;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
@ -12,11 +11,9 @@ import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.communication.WiFiCommunication;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -26,36 +23,40 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private WiFiCommunication mWiFiCommunication;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
private static final int RIGHTS_REQUEST_CAMERA = 10;
|
||||
private static final int RIGHTS_REQUEST_CAMERA_MICROFON = 1;
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
public void init() {
|
||||
WiFiCommunication mWiFiCommunication;
|
||||
if(mDeviceList != null) {
|
||||
return;
|
||||
}
|
||||
if (mWiFiCommunication == null) {
|
||||
mWiFiCommunication = WiFiCommunication.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
mWiFiCommunication.setDeviceRepository(mDeviceRepository);
|
||||
//todo: check if WiFi instanz can be hold only by the repository
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
mWiFiCommunication = WiFiCommunication.getInstance();
|
||||
mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
|
||||
mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0.0f);
|
||||
mDeviceRepository.setDeviceID(mDeviceRepository.getLocalDeviceUUID(), WiFiCommunication.getLocalIpAddress());
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
mWiFiCommunication = null;
|
||||
mWiFiCommunication.setDeviceRepository(mDeviceRepository);
|
||||
mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
|
||||
public boolean isMicrofonAccessAllowed(Context context) {
|
||||
return ContextCompat.checkSelfPermission(context, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
|
||||
}
|
||||
|
||||
public void accessRequestMicrofon(Activity activity) {
|
||||
ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.RECORD_AUDIO}, RIGHTS_REQUEST_CAMERA_MICROFON);
|
||||
}
|
||||
|
||||
public boolean isCameraAccessAllowed(Context context) {
|
||||
return ContextCompat.checkSelfPermission(context, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
|
||||
}
|
||||
|
||||
public void accessRequestCamera(Activity activity) {
|
||||
ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.CAMERA}, RIGHTS_REQUEST_CAMERA);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -74,7 +75,7 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -119,12 +120,12 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -135,21 +136,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
||||
|
||||
@Override
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
import com.example.greenwatch.sensors.MicrofonSensor;
|
||||
|
||||
import java.util.List;
|
||||
@ -22,7 +17,28 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
|
||||
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||
private MicrofonSensor mMicrofonSensor;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mMicrofonSensor == null) {
|
||||
mMicrofonSensor = MicrofonSensor.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mMicrofonAlarmDetected == null) {
|
||||
mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
}
|
||||
|
||||
public void startMicrofonSensor() {
|
||||
mMicrofonSensor.start();
|
||||
@ -44,32 +60,6 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
|
||||
return mMicrofonAlarmDetected;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mMicrofonSensor == null) {
|
||||
mMicrofonSensor = MicrofonSensor.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mMicrofonAlarmDetected == null) {
|
||||
mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||
return mDeviceList;
|
||||
@ -86,7 +76,7 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -131,12 +121,12 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -149,19 +139,4 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
@ -10,7 +9,6 @@ import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||
@ -28,11 +26,42 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
private AccelerometerSensor mAccelerometerSensor;
|
||||
private CameraSensor mCameraSensor;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
private boolean videoAlarmDetected;
|
||||
private boolean accelerometerAlarmDetected;
|
||||
private boolean videodetectionAndAccelerometerAlarmDetected;
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mAccelerometerSensor == null) {
|
||||
mAccelerometerSensor = AccelerometerSensor.getInstance();
|
||||
}
|
||||
if (mCameraSensor == null) {
|
||||
mCameraSensor = CameraSensor.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mAccelerometerAlarmDetected == null) {
|
||||
mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
if (mVideoAlarmDetected == null) {
|
||||
mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
|
||||
}
|
||||
videodetectionAndAccelerometerAlarmDetected = false;
|
||||
videoAlarmDetected = false;
|
||||
accelerometerAlarmDetected = false;
|
||||
registerAlarmObserver();
|
||||
}
|
||||
|
||||
public void addValueToGesamtBE(float newValue) {
|
||||
mAccelerometerSensor.addValueToGesamtBE(newValue);
|
||||
}
|
||||
@ -49,10 +78,6 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
mAccelerometerSensor.checkAlarmCondition();
|
||||
}
|
||||
|
||||
public float getAccelerometerSensorMeanValue() {
|
||||
return mAccelerometerSensor.getAccelerometerSensorMeanValue();
|
||||
}
|
||||
|
||||
public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
|
||||
mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
|
||||
}
|
||||
@ -111,42 +136,6 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
mAccelerometerAlarmDetected.removeObserver(observer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mAccelerometerSensor == null) {
|
||||
mAccelerometerSensor = AccelerometerSensor.getInstance();
|
||||
}
|
||||
if (mCameraSensor == null) {
|
||||
mCameraSensor = CameraSensor.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
if (mAlarmHistoryList == null) {
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
if (mStartAlarmRecording == null) {
|
||||
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||
}
|
||||
if (mAccelerometerAlarmDetected == null) {
|
||||
mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
|
||||
}
|
||||
if (mVideoAlarmDetected == null) {
|
||||
mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
|
||||
}
|
||||
videodetectionAndAccelerometerAlarmDetected = false;
|
||||
videoAlarmDetected = false;
|
||||
accelerometerAlarmDetected = false;
|
||||
registerAlarmObserver();
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||
return mDeviceList;
|
||||
@ -163,7 +152,7 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -208,12 +197,12 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -226,19 +215,4 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
@ -9,7 +8,6 @@ import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.alarmrecorder.AlarmRecorder;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
import com.example.greenwatch.sensors.CameraSensor;
|
||||
@ -23,7 +21,6 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private AlarmRecorder mAlarmRecorder;
|
||||
private CameraSensor mCameraSensor;
|
||||
|
||||
|
||||
@ -32,16 +29,13 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(SurfaceHolder previewHolder) {
|
||||
public void init() {
|
||||
if (mDeviceRepository == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
}
|
||||
if (mCameraSensor == null) {
|
||||
mCameraSensor = CameraSensor.getInstance();
|
||||
}
|
||||
if (mAlarmRecorder == null) {
|
||||
mAlarmRecorder = AlarmRecorder.getInstance();
|
||||
}
|
||||
if (mDeviceList == null) {
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
}
|
||||
@ -54,7 +48,6 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
if (mVideoAlarmDetected == null) {
|
||||
mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
|
||||
}
|
||||
setAlarmRecordingPreviewHolder(previewHolder);
|
||||
}
|
||||
|
||||
public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
|
||||
@ -81,7 +74,7 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@ -126,12 +119,12 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, float sensorMessage) {
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSensorMassage(String deviceID) {
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@ -144,19 +137,4 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startAlarmRecording() {
|
||||
mAlarmRecorder.startRecording();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopAlarmRecording(Context context) {
|
||||
mAlarmRecorder.stopRecording(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder) {
|
||||
mAlarmRecorder.setPreviewHolder(previewHolder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
|
||||
import com.example.greenwatch.models.Device;
|
||||
@ -10,11 +7,11 @@ import com.example.greenwatch.models.Device;
|
||||
import java.util.List;
|
||||
|
||||
public interface ViewModelInterface {
|
||||
void init(SurfaceHolder previewHolder);
|
||||
void init();
|
||||
LiveData<List<Device>> getConnectedDeviceList();
|
||||
LiveData<List<Device>> getAlarmHistoryList();
|
||||
LiveData<Boolean> getStartAlarmRecording();
|
||||
void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage);
|
||||
void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
|
||||
void setTimeStamp(String deviceID, String timeStamp);
|
||||
String getTimeStamp(String deviceID);
|
||||
void setDeviceID(String deviceID, String newDeviceID);
|
||||
@ -23,11 +20,8 @@ public interface ViewModelInterface {
|
||||
boolean getSensorStatus(String deviceID);
|
||||
void setSensorType(String deviceID, String sensorType);
|
||||
String getSensorType(String deviceID);
|
||||
void setSensorMassage(String deviceID, float sensorMessage);
|
||||
float getSensorMassage(String deviceID);
|
||||
void setSensorMassage(String deviceID, int sensorMessage);
|
||||
int getSensorMassage(String deviceID);
|
||||
String getLocalDeviceUUID();
|
||||
String getSystemTimeStamp();
|
||||
void startAlarmRecording();
|
||||
void stopAlarmRecording(Context context);
|
||||
void setAlarmRecordingPreviewHolder(SurfaceHolder previewHolder);
|
||||
}
|
||||
|
||||
@ -8,19 +8,11 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".AccelerometerActivity">
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewAccelerometer"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
android:visibility="visible">
|
||||
</SurfaceView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Accelerometer Activity">
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
@ -30,6 +22,13 @@
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerWarning"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/accelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
@ -42,14 +41,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerdeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -58,14 +49,6 @@
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometeralarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -8,25 +8,10 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionActivity">
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewAudio"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
android:visibility="visible">
|
||||
</SurfaceView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Audiodetection Activity">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionData"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
@ -42,14 +27,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionDeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -58,14 +35,6 @@
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAlarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -8,19 +8,11 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionAndAccelerometerActivity">
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewAudiodetectionAndAccelerometer"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
android:visibility="visible">
|
||||
</SurfaceView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Audiodetection+Accelerometer Activity">
|
||||
android:text="Audiodetection + Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
@ -35,14 +27,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAndAccelerometerDeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -51,14 +35,6 @@
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -5,33 +5,9 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dp"
|
||||
android:padding="10dp"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvMainActivityDeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="3"
|
||||
tools:listitem="@layout/device_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvMainActivityAlarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -40,11 +16,13 @@
|
||||
tools:listitem="@layout/alarm_history_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewMainActivity"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp">
|
||||
</SurfaceView>
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="3"
|
||||
tools:listitem="@layout/device_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -52,78 +30,53 @@
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="3">
|
||||
|
||||
<LinearLayout
|
||||
<Button
|
||||
android:id="@+id/audiodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1">
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="2dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="Videodetection">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
<Button
|
||||
android:id="@+id/videodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1">
|
||||
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_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="Accelerometer">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
<Button
|
||||
android:id="@+id/accelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_weight="1">
|
||||
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_marginEnd="2dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection + 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_marginStart="2dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:text="Videodetection + 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>
|
||||
|
||||
</LinearLayout>
|
||||
<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>
|
||||
|
||||
|
||||
@ -8,18 +8,10 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionActivity">
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewVideodetection"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
android:visibility="visible">
|
||||
</SurfaceView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Videodetection Activity">
|
||||
</TextView>
|
||||
|
||||
@ -35,14 +27,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionDeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -51,14 +35,6 @@
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionAlarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -8,19 +8,11 @@
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionAndAccelerometerActivity">
|
||||
|
||||
<SurfaceView
|
||||
android:id="@+id/surfaceViewVideodetectionAndAccelerometer"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
android:visibility="visible">
|
||||
</SurfaceView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvvideodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Videodetection+Accelerometer Activity">
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
@ -30,6 +22,13 @@
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvvideodetectionAndAccelerometerWarning"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
@ -42,14 +41,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionAndAccelerometerDeviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Registered Devices">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
@ -58,14 +49,6 @@
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:text="Alarm History List">
|
||||
</TextView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -4,5 +4,5 @@
|
||||
<string name="sensor_status_placeholder">Sensorstatus: %s</string>
|
||||
<string name="deviceID_placeholder">Sensor-ID: %s</string>
|
||||
<string name="sensor_time_stamp_placeholder">Timestamp: %s</string>
|
||||
<string name="sensor_message_placeholder">Sensormessage: %f</string>
|
||||
<string name="sensor_message_placeholder">Sensormessage: %d</string>
|
||||
</resources>
|
||||
Loading…
x
Reference in New Issue
Block a user