Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7cd6a4027 | ||
|
|
317bef2b59 | ||
|
|
032ab2788d | ||
|
|
792c650400 | ||
|
|
d21c22cd02 | ||
|
|
a054b2a068 | ||
|
|
db74988f3d | ||
|
|
ccdff78a4a | ||
|
|
373ca2d106 | ||
|
|
28c98ba766 | ||
|
|
559a95b1c2 | ||
|
|
9f253b655c | ||
|
|
d38e05a4b6 | ||
|
|
595d97ef57 | ||
|
|
1c360e8604 | ||
|
|
bd2927ed64 | ||
|
|
30f9c6c3f4 | ||
|
|
9e3652e275 |
@@ -16,6 +16,21 @@
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.GreenWatch">
|
||||
<activity
|
||||
android:name=".VideodetectionAndAccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AudiodetectionAndAccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".VideodetectionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AudiodetectionActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".AccelerometerActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true">
|
||||
|
||||
@@ -0,0 +1,147 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.hardware.Sensor;
|
||||
import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import android.os.Bundle;
|
||||
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 java.util.List;
|
||||
|
||||
public class AccelerometerActivity extends AppCompatActivity implements SensorEventListener {
|
||||
|
||||
private SensorManager accelerometerManager;
|
||||
private Sensor accelerometerSensor;
|
||||
private TextView accelerometerStatusMessage;
|
||||
private TextView accelerometerDataTV;
|
||||
private TextView accelerometerWarningTV;
|
||||
private Button backToMainActivityButton;
|
||||
private AccelerometerViewModel mAccelerometerViewModel;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_accelerometer);
|
||||
|
||||
accelerometerStatusMessage = (TextView) findViewById(R.id.tvAccelerometerStatusmessage);
|
||||
accelerometerDataTV = (TextView) findViewById(R.id.tvAccelerometerData);
|
||||
accelerometerWarningTV = (TextView) findViewById(R.id.tvAccelerometerWarning);
|
||||
backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);
|
||||
|
||||
RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
recyclerView.setHasFixedSize(true);
|
||||
|
||||
final DeviceListAdapter deviceListAdapter = new DeviceListAdapter();
|
||||
recyclerView.setAdapter(deviceListAdapter);
|
||||
|
||||
RecyclerView alarmHistoryListRecyclerView = findViewById(R.id.alarmHistoryListRecyclerView);
|
||||
alarmHistoryListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
alarmHistoryListRecyclerView.setHasFixedSize(true);
|
||||
|
||||
final AlarmHistoryListAdapter alarmHistoryListAdapter = new AlarmHistoryListAdapter();
|
||||
alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
|
||||
|
||||
backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
|
||||
mAccelerometerViewModel = new ViewModelProvider(this).get(AccelerometerViewModel.class);
|
||||
mAccelerometerViewModel.init();
|
||||
mAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
deviceListAdapter.setDevices(devices);
|
||||
Toast.makeText(AccelerometerActivity.this, "onChanged", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
});
|
||||
|
||||
mAccelerometerViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
alarmHistoryListAdapter.setAlarmHistoryList(devices);
|
||||
}
|
||||
});
|
||||
|
||||
mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
|
||||
@Override
|
||||
public void onChanged(Boolean aBoolean) {
|
||||
if (aBoolean) {
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
|
||||
}
|
||||
else {
|
||||
mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
accelerometerManager = (SensorManager) getSystemService(SENSOR_SERVICE);
|
||||
if (accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
|
||||
accelerometerSensor = null;
|
||||
Toast.makeText(AccelerometerActivity.this, "No accelerometer sensor available", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
else {
|
||||
accelerometerSensor = accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).get(0);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSensorChanged(SensorEvent event) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("x=")
|
||||
.append(event.values[0])
|
||||
.append("\ny=")
|
||||
.append(event.values[1])
|
||||
.append("\nz=")
|
||||
.append(event.values[2]);
|
||||
accelerometerDataTV.setText(sb.toString());
|
||||
mAccelerometerViewModel.addValueToGesamtBE(event.values[0] + event.values[1] + event.values[2]);
|
||||
mAccelerometerViewModel.meanValueCalculation();
|
||||
mAccelerometerViewModel.calibrateAccelerometerSensor();
|
||||
mAccelerometerViewModel.checkAlarmCondition();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAccuracyChanged(Sensor sensor, int accuracy) {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
if (accelerometerSensor != null) {
|
||||
if (accelerometerManager.registerListener(this, accelerometerSensor, SensorManager.SENSOR_DELAY_GAME)) {
|
||||
Toast.makeText(AccelerometerActivity.this, "We registered to the sensor", Toast.LENGTH_LONG).show();
|
||||
} else {
|
||||
Toast.makeText(AccelerometerActivity.this, "Registration did not work", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPause() {
|
||||
super.onPause();
|
||||
if (accelerometerSensor != null) {
|
||||
accelerometerManager.unregisterListener(this, accelerometerSensor);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class AudiodetectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivityButton;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection);
|
||||
|
||||
backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
|
||||
|
||||
backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_audiodetection_and_accelerometer);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Beschleunigungssensor {
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Kamera {
|
||||
}
|
||||
@@ -1,101 +1,147 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import android.Manifest;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.SurfaceTexture;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.lifecycle.Observer;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.TextureView;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
|
||||
import com.example.greenwatch.adapters.DeviceListAdapter;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.viewmodels.MainActivityViewModel;
|
||||
|
||||
public class MainActivity extends AppCompatActivity implements TextureView.SurfaceTextureListener{
|
||||
import java.util.List;
|
||||
|
||||
private boolean isRecording = false;
|
||||
private static final int REQUEST_PERMISSION = 200;
|
||||
private Button button;
|
||||
private TextureView textureView;
|
||||
private AlarmRecorder alarmRecorder;
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
private Button audiodetectionButton;
|
||||
private Button videodetectionButton;
|
||||
private Button accelerometerButton;
|
||||
private Button audiodetectionAndAccelerometerButton;
|
||||
private Button videodetectionAndAccelerometerButton;
|
||||
private Button connectionButton;
|
||||
private MainActivityViewModel mMainActivityViewModel;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
button = findViewById(R.id.button);
|
||||
textureView = findViewById(R.id.textureView);
|
||||
textureView.setSurfaceTextureListener(this);
|
||||
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);
|
||||
|
||||
button.setOnClickListener(new View.OnClickListener() {
|
||||
RecyclerView deviceListRecyclerView = findViewById(R.id.deviceListRecyclerView);
|
||||
deviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
deviceListRecyclerView.setHasFixedSize(true);
|
||||
|
||||
final DeviceListAdapter deviceListAdapter = new DeviceListAdapter();
|
||||
deviceListRecyclerView.setAdapter(deviceListAdapter);
|
||||
|
||||
RecyclerView alarmHistoryListRecyclerView = findViewById(R.id.alarmHistoryListRecyclerView);
|
||||
alarmHistoryListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
alarmHistoryListRecyclerView.setHasFixedSize(true);
|
||||
|
||||
final AlarmHistoryListAdapter alarmHistoryListAdapter = new AlarmHistoryListAdapter();
|
||||
alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
|
||||
|
||||
mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
|
||||
mMainActivityViewModel.init();
|
||||
mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
deviceListAdapter.setDevices(devices);
|
||||
Toast.makeText(MainActivity.this, "onChanged", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
});
|
||||
|
||||
mMainActivityViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
|
||||
@Override
|
||||
public void onChanged(List<Device> devices) {
|
||||
alarmHistoryListAdapter.setAlarmHistoryList(devices);
|
||||
}
|
||||
});
|
||||
|
||||
audiodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (!isRecording) {
|
||||
if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.CAMERA)
|
||||
!= PackageManager.PERMISSION_GRANTED
|
||||
|| ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||
!= PackageManager.PERMISSION_GRANTED
|
||||
|| ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.RECORD_AUDIO)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(MainActivity.this,
|
||||
new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO},
|
||||
REQUEST_PERMISSION);
|
||||
} else {
|
||||
isRecording = true;
|
||||
alarmRecorder.startRecording();
|
||||
}
|
||||
} else {
|
||||
isRecording = false;
|
||||
alarmRecorder.stopRecording();
|
||||
}
|
||||
//openAudiodetectionActivity();
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", false, "Audio", 10);
|
||||
}
|
||||
});
|
||||
videodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
//openVideodetectionActivity();
|
||||
mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Video");
|
||||
mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "12:50");
|
||||
mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "12345");
|
||||
}
|
||||
});
|
||||
accelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openAccelerometerActivity();
|
||||
mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Accelerometer");
|
||||
}
|
||||
});
|
||||
audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
//openAudiodetectionAndAccelerometerActivity();
|
||||
mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "AudiodetectionAndAccelerometer");
|
||||
mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "00:00");
|
||||
mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "6789");
|
||||
}
|
||||
});
|
||||
videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openVideodetectionAndAccelerometerActivity();
|
||||
}
|
||||
});
|
||||
connectionButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
openConnectionActivity();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) {
|
||||
alarmRecorder = new AlarmRecorder(surfaceTexture);
|
||||
public void openAudiodetectionActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionActivity(){
|
||||
Intent intent = new Intent(this, VideodetectionActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openAudiodetectionAndAccelerometerActivity(){
|
||||
Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
public void openVideodetectionAndAccelerometerActivity(){
|
||||
//Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
|
||||
//startActivity(intent);
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "24:00", false, "Video", 0);
|
||||
}
|
||||
public void openConnectionActivity(){
|
||||
//Intent intent = new Intent(this, ConnectionActivity.class);
|
||||
//startActivity(intent);
|
||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", true, "Audio", 10);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
|
||||
// Die Größe der SurfaceTexture hat sich geändert
|
||||
// Hier können entsprechende Anpassungen vorgenommen werden
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
|
||||
// SurfaceTexture wurde zerstört
|
||||
// Hier können entsprechende Bereinigungen durchgeführt werden
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSurfaceTextureUpdated(SurfaceTexture surface) {
|
||||
// SurfaceTexture wurde aktualisiert
|
||||
// Hier können entsprechende Aktionen ausgeführt werden, wenn gewünscht
|
||||
}
|
||||
|
||||
private SurfaceTexture getSurfaceTexture() {
|
||||
return textureView.getSurfaceTexture();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == REQUEST_PERMISSION) {
|
||||
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
// Berechtigungen wurden gewährt
|
||||
Toast.makeText(this, "Berechtigungen gewährt", Toast.LENGTH_SHORT).show();
|
||||
isRecording = true;
|
||||
alarmRecorder.startRecording();
|
||||
} else {
|
||||
// Berechtigungen wurden nicht gewährt
|
||||
Toast.makeText(this, "Berechtigungen nicht gewährt", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
public class Mikrofon {
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class VideodetectionActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.greenwatch;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
public class VideodetectionAndAccelerometerActivity extends AppCompatActivity {
|
||||
|
||||
private Button backToMainActivity;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_videodetection_and_accelerometer);
|
||||
|
||||
backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
|
||||
|
||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.example.greenwatch.adapters;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.example.greenwatch.R;
|
||||
import com.example.greenwatch.models.Device;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class AlarmHistoryListAdapter extends RecyclerView.Adapter<AlarmHistoryListAdapter.AlarmHistoryListHolder> {
|
||||
private List<Device> alarmHistoryList = new ArrayList<>();
|
||||
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public AlarmHistoryListHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View itemView = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.alarm_history_item, parent, false);
|
||||
return new AlarmHistoryListHolder(itemView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull AlarmHistoryListHolder holder, int position) {
|
||||
Device currentDevice = alarmHistoryList.get(position);
|
||||
holder.textViewSensorType.setText(holder.itemView.getContext().getString(R.string.sensor_type_placeholder, currentDevice.getSensorType()));
|
||||
holder.textViewDeviceID.setText(holder.itemView.getContext().getString(R.string.deviceID_placeholder, currentDevice.getDeviceID()));
|
||||
holder.textViewTimeStamp.setText(holder.itemView.getContext().getString(R.string.sensor_time_stamp_placeholder, currentDevice.getTimeStamp()));
|
||||
holder.textViewSensorMessage.setText(holder.itemView.getContext().getString(R.string.sensor_message_placeholder, currentDevice.getSensorMassage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return alarmHistoryList.size();
|
||||
}
|
||||
|
||||
public void setAlarmHistoryList(List<Device> alarmHistoryList) {
|
||||
this.alarmHistoryList = alarmHistoryList;
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
class AlarmHistoryListHolder extends RecyclerView.ViewHolder {
|
||||
private TextView textViewSensorType;
|
||||
private TextView textViewDeviceID;
|
||||
private TextView textViewTimeStamp;
|
||||
private TextView textViewSensorMessage;
|
||||
|
||||
public AlarmHistoryListHolder(View itemView) {
|
||||
super(itemView);
|
||||
textViewSensorType = (TextView) itemView.findViewById(R.id.tvAlarmHistoryDeviceSensorType);
|
||||
textViewDeviceID = (TextView) itemView.findViewById(R.id.tvAlarmHistoryDeviceID);
|
||||
textViewTimeStamp = (TextView) itemView.findViewById(R.id.tvAlarmHistoryDeviceTimeStamp);
|
||||
textViewSensorMessage = (TextView) itemView.findViewById(R.id.tvAlarmHistoryDeviceSensorMassage);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package com.example.greenwatch.adapters;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.example.greenwatch.R;
|
||||
import com.example.greenwatch.models.Device;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
public class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.DeviceListHolder> {
|
||||
private List<Device> devices = new ArrayList<>();
|
||||
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public DeviceListHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View itemView = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.device_item, parent, false);
|
||||
return new DeviceListHolder(itemView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull DeviceListHolder holder, int position) {
|
||||
Device currentDevice = devices.get(position);
|
||||
holder.textViewSensorType.setText(holder.itemView.getContext().getString(R.string.sensor_type_placeholder, currentDevice.getSensorType()));
|
||||
holder.textViewDeviceID.setText(holder.itemView.getContext().getString(R.string.deviceID_placeholder, currentDevice.getDeviceID()));
|
||||
holder.textViewTimeStamp.setText(holder.itemView.getContext().getString(R.string.sensor_time_stamp_placeholder, currentDevice.getTimeStamp()));
|
||||
holder.textViewSensorMessage.setText(holder.itemView.getContext().getString(R.string.sensor_message_placeholder, currentDevice.getSensorMassage()));
|
||||
holder.setDeviceSensorStatus(currentDevice);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return devices.size();
|
||||
}
|
||||
|
||||
public void setDevices(List<Device> devices) {
|
||||
this.devices = devices;
|
||||
Collections.sort(this.devices, new Comparator<Device>() {
|
||||
|
||||
@Override
|
||||
public int compare(Device device1, Device device2) {
|
||||
if (device1.getSensorStatus() && !device2.getSensorStatus()) {
|
||||
return -1;
|
||||
} else if (!device1.getSensorStatus() && device2.getSensorStatus()) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
});
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
class DeviceListHolder extends RecyclerView.ViewHolder {
|
||||
private TextView textViewSensorType;
|
||||
private TextView textViewSensorStatus;
|
||||
private TextView textViewDeviceID;
|
||||
private TextView textViewTimeStamp;
|
||||
private TextView textViewSensorMessage;
|
||||
|
||||
public DeviceListHolder(View itemView) {
|
||||
super(itemView);
|
||||
textViewSensorType = (TextView) itemView.findViewById(R.id.tvDeviceSensorType);
|
||||
textViewSensorStatus = (TextView) itemView.findViewById(R.id.tvDeviceSensorStatus);
|
||||
textViewDeviceID = (TextView) itemView.findViewById(R.id.tvDeviceID);
|
||||
textViewTimeStamp = (TextView) itemView.findViewById(R.id.tvDeviceTimeStamp);
|
||||
textViewSensorMessage = (TextView) itemView.findViewById(R.id.tvDeviceSensorMassage);
|
||||
}
|
||||
|
||||
public void setDeviceSensorStatus(Device device) {
|
||||
if (device.getSensorStatus()) {
|
||||
textViewSensorStatus.setText(itemView.getContext().getString(R.string.sensor_status_placeholder, "AN"));
|
||||
itemView.setBackgroundColor(Color.RED);
|
||||
}
|
||||
else {
|
||||
textViewSensorStatus.setText(itemView.getContext().getString(R.string.sensor_status_placeholder, "AUS"));
|
||||
itemView.setBackgroundColor(Color.WHITE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+32
-11
@@ -1,20 +1,24 @@
|
||||
package com.example.greenwatch;
|
||||
package com.example.greenwatch.alarmrecorder;
|
||||
|
||||
import android.graphics.SurfaceTexture;
|
||||
import android.media.MediaCodec;
|
||||
import android.media.MediaExtractor;
|
||||
import android.media.MediaFormat;
|
||||
import android.media.MediaMuxer;
|
||||
import android.media.MediaRecorder;
|
||||
import android.os.Environment;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceHolder;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.MainActivity;
|
||||
import com.example.greenwatch.alarmrecorder.runnables.AudioRecorder;
|
||||
import com.example.greenwatch.alarmrecorder.runnables.VideoRecorder;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class AlarmRecorder {
|
||||
|
||||
private boolean isRecording;
|
||||
private String videoPath;
|
||||
private String audioPath;
|
||||
private MediaFormat videoFormat;
|
||||
@@ -25,24 +29,22 @@ public class AlarmRecorder {
|
||||
private Runnable videoRecorderRunnable;
|
||||
private MediaRecorder videoRecorder;
|
||||
private MediaRecorder audioRecorder;
|
||||
//private SurfaceHolder previewHolder;
|
||||
private Surface surface;
|
||||
private Thread videoThread; // Video-Thread als Instanzvariable
|
||||
private Thread audioThread; // Audio-Thread als Instanzvariable
|
||||
|
||||
public AlarmRecorder(SurfaceTexture surfaceTexture) {
|
||||
public AlarmRecorder() {
|
||||
audioRecorder = new MediaRecorder();
|
||||
videoRecorder = new MediaRecorder();
|
||||
videoExtractor = new MediaExtractor();
|
||||
audioExtractor = new MediaExtractor();
|
||||
this.surface = new Surface(surfaceTexture);
|
||||
}
|
||||
|
||||
public void startRecording() {
|
||||
|
||||
private void startRecording() {
|
||||
createStoragePaths(); //Speicherort und -namen für Audio- und Video-Datei
|
||||
|
||||
audioRecorderRunnable = new AudioRecorder(audioRecorder, audioPath);
|
||||
videoRecorderRunnable = new VideoRecorder(videoRecorder, videoPath, surface);
|
||||
videoRecorderRunnable = new VideoRecorder(videoRecorder, videoPath);
|
||||
audioThread = new Thread(audioRecorderRunnable);
|
||||
videoThread = new Thread(videoRecorderRunnable);
|
||||
|
||||
@@ -51,11 +53,19 @@ public class AlarmRecorder {
|
||||
audioThread.start();
|
||||
}
|
||||
|
||||
public void stopRecording() {
|
||||
private void stopRecording() {
|
||||
isRecording = false;
|
||||
try {
|
||||
stopVideoRecording();
|
||||
stopAudioRecording();
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast.makeText(MainActivity.this, "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
|
||||
@@ -63,6 +73,8 @@ public class AlarmRecorder {
|
||||
if (videoFile.exists() && audioFile.exists()) {
|
||||
//Wenn Video- und Audioaufzeichnung gestoppt und abgespeichert sind, beginne mit dem Mergeprozess der beiden
|
||||
mergeVideoWithAudio();
|
||||
} else {
|
||||
Toast.makeText(MainActivity.this, "Dateien wurden nicht gefunden!", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
} catch (RuntimeException stopException) {
|
||||
stopException.printStackTrace();
|
||||
@@ -71,6 +83,7 @@ public class AlarmRecorder {
|
||||
|
||||
private void createStoragePaths(){
|
||||
//Pfade zum Zwischenspeichern der aufgenommenen Audio und Video-Datei
|
||||
isRecording = true;
|
||||
String externalStorageDirectory = Environment.getExternalStorageDirectory().getAbsolutePath();
|
||||
String dcimDirectory = externalStorageDirectory + "/DCIM";
|
||||
videoPath = dcimDirectory + "/video.mp4";
|
||||
@@ -124,6 +137,13 @@ public class AlarmRecorder {
|
||||
muxer.stop();
|
||||
muxer.release();
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast.makeText(MainActivity.this, "Video und Audio erfolgreich zusammengeführt", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
|
||||
// Löschen der separaten Video- und Audio-Dateien
|
||||
deleteVideoFile();
|
||||
deleteAudioFile();
|
||||
@@ -209,6 +229,7 @@ public class AlarmRecorder {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void deleteVideoFile(){
|
||||
File videoFile = new File(videoPath);
|
||||
if (videoFile.exists()) {
|
||||
+4
-1
@@ -1,6 +1,9 @@
|
||||
package com.example.greenwatch;
|
||||
package com.example.greenwatch.alarmrecorder.runnables;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.greenwatch.MainActivity;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
+6
-10
@@ -1,22 +1,18 @@
|
||||
package com.example.greenwatch;
|
||||
package com.example.greenwatch.alarmrecorder.runnables;
|
||||
|
||||
import android.media.MediaRecorder;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
import com.example.greenwatch.viewmodels.ViewModelInterface;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class VideoRecorder implements Runnable{
|
||||
private final MediaRecorder videoRecorder;
|
||||
private final String videoPath;
|
||||
//private SurfaceHolder previewHolder;
|
||||
private Surface surface;
|
||||
|
||||
|
||||
public VideoRecorder(MediaRecorder videoRecorder, String videoPath, Surface surface) {
|
||||
public VideoRecorder(MediaRecorder videoRecorder, String videoPath) {
|
||||
this.videoRecorder = videoRecorder;
|
||||
this.videoPath = videoPath;
|
||||
this.surface = surface;
|
||||
}
|
||||
@Override
|
||||
public void run() {
|
||||
@@ -25,7 +21,8 @@ public class VideoRecorder implements Runnable{
|
||||
videoRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
|
||||
videoRecorder.setOutputFile(videoPath);
|
||||
videoRecorder.setOrientationHint(90);
|
||||
videoRecorder.setPreviewDisplay(surface);
|
||||
//todo find solution for videoView
|
||||
videoRecorder.setPreviewDisplay(videoView.getHolder().getSurface());
|
||||
|
||||
try {
|
||||
videoRecorder.prepare();
|
||||
@@ -36,4 +33,3 @@ public class VideoRecorder implements Runnable{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
package com.example.greenwatch.communication;
|
||||
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.DatagramPacket;
|
||||
import java.net.DatagramSocket;
|
||||
import java.net.Inet4Address;
|
||||
import java.net.InetAddress;
|
||||
import java.net.NetworkInterface;
|
||||
import java.net.SocketException;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.Enumeration;
|
||||
|
||||
public class WiFiCommunication {
|
||||
|
||||
private final InetAddress address;
|
||||
private final DatagramSocket socket;
|
||||
private final int port;
|
||||
private String rxString;
|
||||
private String sendMessage;
|
||||
//private String sendMsg = "default";
|
||||
private boolean isNewMessage;
|
||||
volatile private boolean running;
|
||||
private static WiFiCommunication wifiCommunicationInstance;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
|
||||
private WiFiCommunication() {
|
||||
port = 1234;
|
||||
try {
|
||||
socket = new DatagramSocket(port);
|
||||
socket.setBroadcast(true);
|
||||
address = InetAddress.getByName("255.255.255.255");
|
||||
running = true;
|
||||
isNewMessage = false;
|
||||
new ReceiveThread().start();
|
||||
new SendThread().start();
|
||||
} catch (SocketException | UnknownHostException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static synchronized WiFiCommunication getInstance() {
|
||||
if (wifiCommunicationInstance == null){
|
||||
wifiCommunicationInstance = new WiFiCommunication();
|
||||
}
|
||||
return wifiCommunicationInstance;
|
||||
}
|
||||
|
||||
public void setDeviceRepository(DeviceRepository deviceRepository) {
|
||||
this.mDeviceRepository = deviceRepository;
|
||||
}
|
||||
|
||||
public void setNewMessage(String newMessage, boolean isNewMessage){
|
||||
this.sendMessage = newMessage;
|
||||
this.isNewMessage = isNewMessage;
|
||||
}
|
||||
|
||||
public static String getLocalIpAddress() {
|
||||
try {
|
||||
for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
|
||||
NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
|
||||
for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
|
||||
InetAddress inetAddress = addresses.nextElement();
|
||||
if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
|
||||
return inetAddress.getHostAddress();
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (SocketException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public void stopCommunication() {
|
||||
running = false;
|
||||
socket.close();
|
||||
}
|
||||
|
||||
private class SendThread extends Thread {
|
||||
private int tmpCnt = 0;
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
do {
|
||||
|
||||
if(isNewMessage)
|
||||
{
|
||||
isNewMessage = false;
|
||||
//todo: adapt send String
|
||||
String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
|
||||
byte[] txBuffer = txString.getBytes();
|
||||
|
||||
DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);
|
||||
|
||||
for(int i = 0; i < 20; i++) {
|
||||
socket.send(txPacket);
|
||||
}
|
||||
}
|
||||
} while (running);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class ReceiveThread extends Thread {
|
||||
private String rxString = "";
|
||||
private String previousRxString = "";
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
do {
|
||||
byte[] rxBuffer = new byte[1024];
|
||||
DatagramPacket packet = new DatagramPacket(rxBuffer, rxBuffer.length);
|
||||
socket.receive(packet);
|
||||
rxString = new String(packet.getData(), 0, packet.getLength());
|
||||
|
||||
if(!previousRxString.equals(rxString)){
|
||||
mDeviceRepository.getNewReceivedMessage(rxString);
|
||||
|
||||
}
|
||||
previousRxString = rxString;
|
||||
|
||||
} while (running);
|
||||
}
|
||||
catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.example.greenwatch.models;
|
||||
|
||||
|
||||
public class Device {
|
||||
|
||||
private String timeStamp;
|
||||
private String deviceID;
|
||||
private boolean sensorStatus;
|
||||
private String sensorType;
|
||||
private int sensorMassage;
|
||||
|
||||
public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
this.timeStamp = timeStamp;
|
||||
this.deviceID = deviceID;
|
||||
this.sensorStatus = sensorStatus;
|
||||
this.sensorType = sensorType;
|
||||
this.sensorMassage = sensorMassage;
|
||||
}
|
||||
public void setTimeStamp(String timeStamp) {
|
||||
this.timeStamp = timeStamp;
|
||||
}
|
||||
|
||||
public String getTimeStamp() {
|
||||
return timeStamp;
|
||||
}
|
||||
|
||||
public void setDeviceID(String deviceID) {
|
||||
this.deviceID = deviceID;
|
||||
}
|
||||
|
||||
public String getDeviceID() {
|
||||
return deviceID;
|
||||
}
|
||||
public void setSensorType(String sensorType) {
|
||||
this.sensorType = sensorType;
|
||||
}
|
||||
|
||||
public String getSensorType() {
|
||||
return sensorType;
|
||||
}
|
||||
|
||||
public void setSensorStatus(boolean sensorStatus) {
|
||||
this.sensorStatus = sensorStatus;
|
||||
}
|
||||
|
||||
public Boolean getSensorStatus() {
|
||||
return sensorStatus;
|
||||
}
|
||||
|
||||
public void setSensorMassage(int sensorMassage) {
|
||||
this.sensorMassage = sensorMassage;
|
||||
}
|
||||
|
||||
public int getSensorMassage() {
|
||||
return sensorMassage;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,286 @@
|
||||
package com.example.greenwatch.repositories;
|
||||
|
||||
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.communication.WiFiCommunication;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class DeviceRepository {
|
||||
|
||||
private final int maxAlarmHistoryListSize = 20;
|
||||
private final String delimiter = ", ";
|
||||
private final String SensorStatusKey = "An";
|
||||
private String localDeviceUUID;
|
||||
private static DeviceRepository deviceRepositoryInstance;
|
||||
private WiFiCommunication mWiFiCommunication;
|
||||
private MutableLiveData<List<Device>> deviceList = new MutableLiveData<>();
|
||||
private MutableLiveData<List<Device>> alarmHistoryList = new MutableLiveData<>();
|
||||
private HashMap<String, Device> connectedDevicesList = new HashMap<>();
|
||||
private HashMap<String, String> deviceIDMapper = new HashMap<>();
|
||||
private List<Device> alarmHistoryDeviceList = new ArrayList<>();
|
||||
|
||||
private DeviceRepository() {
|
||||
setLocalDeviceUUID();
|
||||
}
|
||||
|
||||
public static synchronized DeviceRepository getInstance() {
|
||||
if (deviceRepositoryInstance == null){
|
||||
deviceRepositoryInstance = new DeviceRepository();
|
||||
}
|
||||
return deviceRepositoryInstance;
|
||||
}
|
||||
|
||||
public void setWiFiCommunication(WiFiCommunication wiFiCommunication) {
|
||||
this.mWiFiCommunication = wiFiCommunication;
|
||||
}
|
||||
|
||||
public MutableLiveData<List<Device>> getConnectedDeviceList() {
|
||||
setMutableLiveDataDeviceList();
|
||||
return deviceList;
|
||||
}
|
||||
|
||||
public MutableLiveData<List<Device>> getAlarmHistoryDeviceList() {
|
||||
setMutableLiveDataAlarmHistoryList();
|
||||
return alarmHistoryList;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
addToConnectedDeviceList(newDevice.getDeviceID(), newDevice);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
|
||||
public void getNewReceivedMessage(String newMessage) {
|
||||
String[] messageString = messageStringSplitter(newMessage);
|
||||
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(!connectedDevicesList.containsKey(deviceID)) {
|
||||
createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
else {
|
||||
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
}
|
||||
|
||||
private String messageStringBuilder(String deviceID) {
|
||||
StringBuilder message = new StringBuilder();
|
||||
Device device = connectedDevicesList.get(deviceID);
|
||||
if(device != null) {
|
||||
message.append(device.getTimeStamp())
|
||||
.append(delimiter)
|
||||
.append(device.getDeviceID())
|
||||
.append(delimiter)
|
||||
.append(device.getSensorStatus())
|
||||
.append(delimiter)
|
||||
.append(device.getSensorType())
|
||||
.append(delimiter)
|
||||
.append(device.getSensorMassage());
|
||||
}
|
||||
else {
|
||||
message.append("")
|
||||
.append(delimiter)
|
||||
.append("")
|
||||
.append(delimiter)
|
||||
.append("")
|
||||
.append(delimiter)
|
||||
.append("")
|
||||
.append(delimiter)
|
||||
.append("");
|
||||
}
|
||||
return message.toString();
|
||||
}
|
||||
|
||||
public String getLocalDeviceUUID() {
|
||||
return localDeviceUUID;
|
||||
}
|
||||
|
||||
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) {
|
||||
device.setTimeStamp(timeStamp);
|
||||
device.setSensorType(sensorType);
|
||||
device.setSensorMassage(sensorMassage);
|
||||
if (!device.getSensorStatus() && sensorStatus) {
|
||||
setAlarmHistoryDeviceList(device);
|
||||
}
|
||||
device.setSensorStatus(sensorStatus);
|
||||
addToConnectedDeviceList(checkedDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
}
|
||||
|
||||
public void setTimeStamp(String deviceID, String timeStamp) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
device.setTimeStamp(timeStamp);
|
||||
addToConnectedDeviceList(checkedDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
}
|
||||
|
||||
public String getTimeStamp(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
return device.getTimeStamp();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public void setDeviceID(String deviceID, String newDeviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
device.setDeviceID(newDeviceID);
|
||||
setDeviceIDMapper(newDeviceID);
|
||||
connectedDevicesList.remove(checkedDeviceID);
|
||||
addToConnectedDeviceList(newDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
}
|
||||
|
||||
public String getDeviceID(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
return device.getDeviceID();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public void setSensorStatus(String deviceID, boolean sensorStatus) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
if (!device.getSensorStatus() && sensorStatus) {
|
||||
setAlarmHistoryDeviceList(device);
|
||||
}
|
||||
device.setSensorStatus(sensorStatus);
|
||||
addToConnectedDeviceList(checkedDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public boolean getSensorStatus(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
return device.getSensorStatus();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void setSensorType(String deviceID, String sensorType) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
device.setSensorType(sensorType);
|
||||
addToConnectedDeviceList(checkedDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
}
|
||||
|
||||
public String getSensorType(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
return device.getSensorType();
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
device.setSensorMassage(sensorMessage);
|
||||
addToConnectedDeviceList(checkedDeviceID, device);
|
||||
setMutableLiveDataDeviceList();
|
||||
}
|
||||
}
|
||||
|
||||
public int getSensorMassage(String deviceID) {
|
||||
String checkedDeviceID = checkDeviceID(deviceID);
|
||||
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||
if(device != null) {
|
||||
return device.getSensorMassage();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public String getSystemTimeStamp() {
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
|
||||
Date date = new Date(System.currentTimeMillis());
|
||||
return formatter.format(date);
|
||||
}
|
||||
|
||||
private void setMutableLiveDataDeviceList() {
|
||||
List<Device> list = new ArrayList<>(connectedDevicesList.values());
|
||||
deviceList.setValue(list);
|
||||
}
|
||||
|
||||
private void setMutableLiveDataAlarmHistoryList() {
|
||||
alarmHistoryList.setValue(alarmHistoryDeviceList);
|
||||
}
|
||||
|
||||
private void addToConnectedDeviceList(String key, Device device) {
|
||||
connectedDevicesList.put(key, device);
|
||||
if (key.equals(checkDeviceID(localDeviceUUID))) {
|
||||
mWiFiCommunication.setNewMessage(messageStringBuilder(device.getDeviceID()),true);
|
||||
}
|
||||
}
|
||||
|
||||
private String checkDeviceID(String deviceID) {
|
||||
if(!deviceIDMapper.isEmpty() && deviceID.equals(localDeviceUUID)) {
|
||||
return deviceIDMapper.get(deviceID);
|
||||
}
|
||||
return deviceID;
|
||||
}
|
||||
|
||||
private void setDeviceIDMapper(String deviceID) {
|
||||
deviceIDMapper.put(localDeviceUUID, deviceID);
|
||||
}
|
||||
|
||||
private void setLocalDeviceUUID(){
|
||||
this.localDeviceUUID = UUID.randomUUID().toString();
|
||||
}
|
||||
|
||||
private String[] messageStringSplitter(String message) {
|
||||
return message.split(delimiter);
|
||||
}
|
||||
|
||||
private boolean convertSensorStatus(String status) {
|
||||
return status.equals(SensorStatusKey);
|
||||
}
|
||||
|
||||
private void setAlarmHistoryDeviceList(Device device) {
|
||||
if (alarmHistoryDeviceList.size() == maxAlarmHistoryListSize) {
|
||||
alarmHistoryDeviceList.remove(alarmHistoryDeviceList.size() -1);
|
||||
}
|
||||
Device alarmHistoryDevice = new Device(device.getTimeStamp(), device.getDeviceID(), device.getSensorStatus(), device.getSensorType(), device.getSensorMassage());
|
||||
alarmHistoryDeviceList.add(0, alarmHistoryDevice);
|
||||
setMutableLiveDataAlarmHistoryList();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public class AccelerometerViewModel extends ViewModel implements ViewModelInterface {
|
||||
|
||||
private MutableLiveData<List<Device>> mDeviceList;
|
||||
private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
|
||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
private ArrayList<Float> Gesamt_be;
|
||||
int arraySize = 500;
|
||||
int functionCallCount;
|
||||
float meanValue;
|
||||
float offsetValue;
|
||||
float thresholdValue;
|
||||
boolean startMeasuring;
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
if (mDeviceList == null) {
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
initGesamtBE();
|
||||
mMovementDetected.setValue(false);
|
||||
functionCallCount = 0;
|
||||
meanValue = 0f;
|
||||
offsetValue = 0.1f;
|
||||
thresholdValue = 0.15f;
|
||||
startMeasuring = false;
|
||||
}
|
||||
|
||||
public void initGesamtBE() {
|
||||
Gesamt_be = new ArrayList<>(arraySize);
|
||||
for (int i = 0; i < arraySize; i++) {
|
||||
Gesamt_be.add(0f);
|
||||
}
|
||||
}
|
||||
|
||||
public void addValueToGesamtBE(float newValue) {
|
||||
if (Gesamt_be.size() == arraySize) {
|
||||
Gesamt_be.remove(Gesamt_be.size() -1);
|
||||
}
|
||||
Gesamt_be.add(0, newValue);
|
||||
functionCallCount++;
|
||||
}
|
||||
|
||||
public void meanValueCalculation() {
|
||||
for (float element : Gesamt_be) {
|
||||
meanValue += Math.abs(element);
|
||||
}
|
||||
meanValue = meanValue/arraySize;
|
||||
}
|
||||
|
||||
public void calibrateAccelerometerSensor() {
|
||||
if (functionCallCount <= arraySize) {
|
||||
offsetValue = meanValue;
|
||||
}
|
||||
else {
|
||||
startMeasuring = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void checkAlarmCondition() {
|
||||
if (meanValue > (thresholdValue + offsetValue) && startMeasuring && !mMovementDetected.getValue()) {
|
||||
mMovementDetected.setValue(true);
|
||||
}
|
||||
else if (meanValue < (thresholdValue + offsetValue) && mMovementDetected.getValue()){
|
||||
mMovementDetected.setValue(false);
|
||||
}
|
||||
}
|
||||
|
||||
public String getSystemTimeStamp() {
|
||||
return mDeviceRepository.getSystemTimeStamp();
|
||||
}
|
||||
|
||||
public LiveData<Boolean> getMovementDetectedValue() {
|
||||
return mMovementDetected;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||
return mDeviceList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getAlarmHistoryList() {
|
||||
return mAlarmHistoryList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTimeStamp(String deviceID, String timeStamp) {
|
||||
mDeviceRepository.setTimeStamp(deviceID, timeStamp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTimeStamp(String deviceID) {
|
||||
return mDeviceRepository.getTimeStamp(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDeviceID(String deviceID, String newDeviceID) {
|
||||
mDeviceRepository.setDeviceID(deviceID, newDeviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDeviceID(String deviceID) {
|
||||
return mDeviceRepository.getDeviceID(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorStatus(String deviceID, boolean sensorStatus) {
|
||||
mDeviceRepository.setSensorStatus(deviceID, sensorStatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getSensorStatus(String deviceID) {
|
||||
return mDeviceRepository.getSensorStatus(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorType(String deviceID, String sensorType) {
|
||||
mDeviceRepository.setSensorType(deviceID, sensorType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSensorType(String deviceID) {
|
||||
return mDeviceRepository.getSensorType(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLocalDeviceUUID() {
|
||||
return mDeviceRepository.getLocalDeviceUUID();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.lifecycle.MutableLiveData;
|
||||
import androidx.lifecycle.ViewModel;
|
||||
|
||||
import com.example.greenwatch.communication.WiFiCommunication;
|
||||
import com.example.greenwatch.models.Device;
|
||||
import com.example.greenwatch.repositories.DeviceRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MainActivityViewModel extends ViewModel implements ViewModelInterface {
|
||||
|
||||
private MutableLiveData<List<Device>> mDeviceList;
|
||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||
private DeviceRepository mDeviceRepository;
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
WiFiCommunication mWiFiCommunication;
|
||||
if(mDeviceList != null) {
|
||||
return;
|
||||
}
|
||||
//todo: check if WiFi instanz can be hold only by the repository
|
||||
mDeviceRepository = DeviceRepository.getInstance();
|
||||
mWiFiCommunication = WiFiCommunication.getInstance();
|
||||
mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
|
||||
mWiFiCommunication.setDeviceRepository(mDeviceRepository);
|
||||
mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
|
||||
mDeviceRepository.createNewDevice("00:00", "1234", true, "Test", 21);
|
||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||
return mDeviceList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LiveData<List<Device>> getAlarmHistoryList() {
|
||||
return mAlarmHistoryList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTimeStamp(String deviceID, String timeStamp) {
|
||||
mDeviceRepository.setTimeStamp(deviceID, timeStamp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTimeStamp(String deviceID) {
|
||||
return mDeviceRepository.getTimeStamp(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDeviceID(String deviceID, String newDeviceID) {
|
||||
mDeviceRepository.setDeviceID(deviceID, newDeviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDeviceID(String deviceID) {
|
||||
return mDeviceRepository.getDeviceID(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorStatus(String deviceID, boolean sensorStatus) {
|
||||
mDeviceRepository.setSensorStatus(deviceID, sensorStatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getSensorStatus(String deviceID) {
|
||||
return mDeviceRepository.getSensorStatus(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorType(String deviceID, String sensorType) {
|
||||
mDeviceRepository.setSensorType(deviceID, sensorType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSensorType(String deviceID) {
|
||||
return mDeviceRepository.getSensorType(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSensorMassage(String deviceID, int sensorMessage) {
|
||||
mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSensorMassage(String deviceID) {
|
||||
return mDeviceRepository.getSensorMassage(deviceID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getLocalDeviceUUID() {
|
||||
return mDeviceRepository.getLocalDeviceUUID();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.example.greenwatch.viewmodels;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
|
||||
import com.example.greenwatch.models.Device;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ViewModelInterface {
|
||||
void init();
|
||||
LiveData<List<Device>> getConnectedDeviceList();
|
||||
LiveData<List<Device>> getAlarmHistoryList();
|
||||
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);
|
||||
String getDeviceID(String deviceID);
|
||||
void setSensorStatus(String deviceID, boolean sensorStatus);
|
||||
boolean getSensorStatus(String deviceID);
|
||||
void setSensorType(String deviceID, String sensorType);
|
||||
String getSensorType(String deviceID);
|
||||
void setSensorMassage(String deviceID, int sensorMessage);
|
||||
int getSensorMassage(String deviceID);
|
||||
String getLocalDeviceUUID();
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccelerometerData"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
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"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/deviceListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:listitem="@layout/device_item"
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:listitem="@layout/alarm_history_item"
|
||||
android:layout_weight="1">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Audiodetection Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectorBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".AudiodetectionAndAccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Audiodetection + Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionAndAccelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,31 +1,83 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<TextureView
|
||||
android:id="@+id/textureView"
|
||||
android:layout_width="1sp"
|
||||
android:layout_height="1sp"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/button"
|
||||
app:layout_constraintVertical_bias="0.0" />
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/alarmHistoryListRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="3"
|
||||
tools:listitem="@layout/alarm_history_item">
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="339dp"
|
||||
android:text="Record Video"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
<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>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="3">
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
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_weight="1"
|
||||
android:text="Videodetection">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/accelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/audiodetectionAndAccelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Audiodetection + Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionAndAccelerometerButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Videodetection + Accelerometer">
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
android:id="@+id/connectionButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Connect to Devices">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Videodetection Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectorBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:context=".VideodetectionAndAccelerometerActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvVideodetectionAndAccelerometerStatusmessage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Videodetection + Accelerometer Activity">
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Back to MainActivity">
|
||||
</Button>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,51 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="8dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceSensorType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sensor_type_placeholder"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:maxLines="1"
|
||||
android:layout_alignParentStart="true"
|
||||
android:ellipsize="end">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceID"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceSensorType"
|
||||
android:text="@string/deviceID_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceTimeStamp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceID"
|
||||
android:text="@string/sensor_time_stamp_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAlarmHistoryDeviceSensorMassage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvAlarmHistoryDeviceTimeStamp"
|
||||
android:text="@string/sensor_message_placeholder">
|
||||
</TextView>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
@@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="8dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDeviceSensorStatus"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:text="@string/sensor_status_placeholder"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDeviceSensorType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sensor_type_placeholder"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
android:maxLines="1"
|
||||
android:layout_toStartOf="@id/tvDeviceSensorStatus"
|
||||
android:layout_alignParentStart="true"
|
||||
android:ellipsize="end">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDeviceID"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvDeviceSensorType"
|
||||
android:text="@string/deviceID_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDeviceTimeStamp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvDeviceID"
|
||||
android:text="@string/sensor_time_stamp_placeholder">
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDeviceSensorMassage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tvDeviceTimeStamp"
|
||||
android:text="@string/sensor_message_placeholder">
|
||||
</TextView>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
@@ -1,3 +1,8 @@
|
||||
<resources>
|
||||
<string name="app_name">GreenWatch</string>
|
||||
<string name="sensor_type_placeholder">Sensortyp: %s</string>
|
||||
<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: %d</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user