Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0423a56117 | ||
|
|
a13f4e295b | ||
|
|
c57d277dfb | ||
|
|
e3df8b63b8 | ||
|
|
6c4b6b67a4 | ||
|
|
1094b0f75d | ||
|
|
8dd4c6d56a |
@@ -35,4 +35,10 @@ dependencies {
|
|||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation 'junit:junit:4.13.2'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||||
|
|
||||||
|
def camerax_version = "1.2.3"
|
||||||
|
implementation "androidx.camera:camera-camera2:${camerax_version}"
|
||||||
|
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
|
||||||
|
implementation "androidx.camera:camera-view:${camerax_version}"
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,9 @@
|
|||||||
package="com.example.greenwatch">
|
package="com.example.greenwatch">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.CAMERA"/>
|
||||||
|
|
||||||
|
<uses-feature android:name="android.hardware.camera"/>
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
|||||||
@Override
|
@Override
|
||||||
public void onChanged(List<Device> devices) {
|
public void onChanged(List<Device> devices) {
|
||||||
deviceListAdapter.setDevices(devices);
|
deviceListAdapter.setDevices(devices);
|
||||||
Toast.makeText(AccelerometerActivity.this, "onChanged", Toast.LENGTH_LONG).show();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -81,6 +80,18 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mAccelerometerViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
|
mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
|
||||||
@Override
|
@Override
|
||||||
public void onChanged(Boolean aBoolean) {
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
|||||||
@@ -57,11 +57,11 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
|
mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
|
||||||
mMainActivityViewModel.init();
|
mMainActivityViewModel.init();
|
||||||
|
mMainActivityViewModel.accessRequestCamera(this);
|
||||||
mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||||
@Override
|
@Override
|
||||||
public void onChanged(List<Device> devices) {
|
public void onChanged(List<Device> devices) {
|
||||||
deviceListAdapter.setDevices(devices);
|
deviceListAdapter.setDevices(devices);
|
||||||
Toast.makeText(MainActivity.this, "onChanged", Toast.LENGTH_LONG).show();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -72,6 +72,18 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mMainActivityViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
audiodetectionButton.setOnClickListener(new View.OnClickListener() {
|
audiodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
@@ -82,10 +94,12 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
videodetectionButton.setOnClickListener(new View.OnClickListener() {
|
videodetectionButton.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
//openVideodetectionActivity();
|
if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
|
||||||
mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Video");
|
openVideodetectionActivity();
|
||||||
mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "12:50");
|
}
|
||||||
mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "12345");
|
else {
|
||||||
|
mMainActivityViewModel.accessRequestCamera(MainActivity.this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
accelerometerButton.setOnClickListener(new View.OnClickListener() {
|
accelerometerButton.setOnClickListener(new View.OnClickListener() {
|
||||||
@@ -134,9 +148,8 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
public void openVideodetectionAndAccelerometerActivity(){
|
public void openVideodetectionAndAccelerometerActivity(){
|
||||||
//Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
|
Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
|
||||||
//startActivity(intent);
|
startActivity(intent);
|
||||||
mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "24:00", false, "Video", 0);
|
|
||||||
}
|
}
|
||||||
public void openConnectionActivity(){
|
public void openConnectionActivity(){
|
||||||
//Intent intent = new Intent(this, ConnectionActivity.class);
|
//Intent intent = new Intent(this, ConnectionActivity.class);
|
||||||
|
|||||||
@@ -1,14 +1,32 @@
|
|||||||
package com.example.greenwatch;
|
package com.example.greenwatch;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.lifecycle.Observer;
|
||||||
|
import androidx.lifecycle.ViewModelProvider;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
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;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
public class VideodetectionActivity extends AppCompatActivity {
|
public class VideodetectionActivity extends AppCompatActivity {
|
||||||
|
|
||||||
private Button backToMainActivity;
|
private Button backToMainActivity;
|
||||||
|
private VideodetectionViewModel mVideoDetectionViewModel;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@@ -17,11 +35,75 @@ public class VideodetectionActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
|
backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mVideoDetectionViewModel = new ViewModelProvider(this).get(VideodetectionViewModel.class);
|
||||||
|
mVideoDetectionViewModel.init();
|
||||||
|
mVideoDetectionViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(List<Device> devices) {
|
||||||
|
deviceListAdapter.setDevices(devices);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideoDetectionViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(List<Device> devices) {
|
||||||
|
alarmHistoryListAdapter.setAlarmHistoryList(devices);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideoDetectionViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideoDetectionViewModel.getVideoAlarmDetectedValue().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 10);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
|
||||||
|
cameraProviderFuture.addListener(() -> {
|
||||||
|
try {
|
||||||
|
mVideoDetectionViewModel.bindImageAnalysis(cameraProviderFuture.get(), this, this);
|
||||||
|
} catch (ExecutionException | InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}, ContextCompat.getMainExecutor(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+145
-1
@@ -1,27 +1,171 @@
|
|||||||
package com.example.greenwatch;
|
package com.example.greenwatch;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
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.os.Bundle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
public class VideodetectionAndAccelerometerActivity extends AppCompatActivity {
|
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.VideodetectionAndAccelerometerViewModel;
|
||||||
|
import com.example.greenwatch.viewmodels.VideodetectionViewModel;
|
||||||
|
import com.google.common.util.concurrent.ListenableFuture;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
|
public class VideodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
|
||||||
|
private SensorManager accelerometerManager;
|
||||||
|
private Sensor accelerometerSensor;
|
||||||
|
private TextView videodetectionAndAccelerometerStatusMessage;
|
||||||
|
private TextView videodetectionAndAccelerometerDataTV;
|
||||||
|
private TextView videodetectionAndAccelerometerWarningTV;
|
||||||
private Button backToMainActivity;
|
private Button backToMainActivity;
|
||||||
|
private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_videodetection_and_accelerometer);
|
setContentView(R.layout.activity_videodetection_and_accelerometer);
|
||||||
|
|
||||||
|
videodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerStatusmessage);
|
||||||
|
videodetectionAndAccelerometerDataTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerData);
|
||||||
|
videodetectionAndAccelerometerWarningTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerWarning);
|
||||||
backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
|
backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
backToMainActivity.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
mVideodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(VideodetectionAndAccelerometerViewModel.class);
|
||||||
|
mVideodetectionAndAccelerometerViewModel.init();
|
||||||
|
mVideodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(List<Device> devices) {
|
||||||
|
deviceListAdapter.setDevices(devices);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideodetectionAndAccelerometerViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(List<Device> devices) {
|
||||||
|
alarmHistoryListAdapter.setAlarmHistoryList(devices);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideodetectionAndAccelerometerViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
mVideodetectionAndAccelerometerViewModel.getVideodetectionAndAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (aBoolean) {
|
||||||
|
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
|
||||||
|
cameraProviderFuture.addListener(() -> {
|
||||||
|
try {
|
||||||
|
mVideodetectionAndAccelerometerViewModel.bindImageAnalysis(cameraProviderFuture.get(), this, this);
|
||||||
|
} catch (ExecutionException | InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}, ContextCompat.getMainExecutor(this));
|
||||||
|
|
||||||
|
accelerometerManager = (SensorManager) getSystemService(SENSOR_SERVICE);
|
||||||
|
if (accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
|
||||||
|
accelerometerSensor = null;
|
||||||
|
Toast.makeText(VideodetectionAndAccelerometerActivity.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]);
|
||||||
|
videodetectionAndAccelerometerDataTV.setText(sb.toString());
|
||||||
|
mVideodetectionAndAccelerometerViewModel.addValueToGesamtBE(event.values[0] + event.values[1] + event.values[2]);
|
||||||
|
mVideodetectionAndAccelerometerViewModel.meanValueCalculation();
|
||||||
|
mVideodetectionAndAccelerometerViewModel.calibrateAccelerometerSensor();
|
||||||
|
mVideodetectionAndAccelerometerViewModel.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(VideodetectionAndAccelerometerActivity.this, "We registered to the sensor", Toast.LENGTH_LONG).show();
|
||||||
|
} else {
|
||||||
|
Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Registration did not work", Toast.LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (accelerometerSensor != null) {
|
||||||
|
accelerometerManager.unregisterListener(this, accelerometerSensor);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.example.greenwatch.communication;
|
package com.example.greenwatch.communication;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import com.example.greenwatch.repositories.DeviceRepository;
|
import com.example.greenwatch.repositories.DeviceRepository;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -56,23 +58,6 @@ public class WiFiCommunication {
|
|||||||
this.isNewMessage = isNewMessage;
|
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() {
|
public void stopCommunication() {
|
||||||
running = false;
|
running = false;
|
||||||
socket.close();
|
socket.close();
|
||||||
@@ -89,7 +74,7 @@ public class WiFiCommunication {
|
|||||||
{
|
{
|
||||||
isNewMessage = false;
|
isNewMessage = false;
|
||||||
//todo: adapt send String
|
//todo: adapt send String
|
||||||
String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
|
String txString = sendMessage;
|
||||||
byte[] txBuffer = txString.getBytes();
|
byte[] txBuffer = txString.getBytes();
|
||||||
|
|
||||||
DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);
|
DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);
|
||||||
|
|||||||
@@ -1,14 +1,21 @@
|
|||||||
package com.example.greenwatch.repositories;
|
package com.example.greenwatch.repositories;
|
||||||
|
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import androidx.lifecycle.MutableLiveData;
|
import androidx.lifecycle.MutableLiveData;
|
||||||
|
|
||||||
import com.example.greenwatch.models.Device;
|
import com.example.greenwatch.models.Device;
|
||||||
import com.example.greenwatch.communication.WiFiCommunication;
|
import com.example.greenwatch.communication.WiFiCommunication;
|
||||||
|
|
||||||
|
import java.net.Inet4Address;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.NetworkInterface;
|
||||||
|
import java.net.SocketException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Enumeration;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@@ -17,10 +24,12 @@ public class DeviceRepository {
|
|||||||
|
|
||||||
private final int maxAlarmHistoryListSize = 20;
|
private final int maxAlarmHistoryListSize = 20;
|
||||||
private final String delimiter = ", ";
|
private final String delimiter = ", ";
|
||||||
private final String SensorStatusKey = "An";
|
private final String sensorStatusKey = "An";
|
||||||
private String localDeviceUUID;
|
private String localDeviceUUID;
|
||||||
private static DeviceRepository deviceRepositoryInstance;
|
private static DeviceRepository deviceRepositoryInstance;
|
||||||
private WiFiCommunication mWiFiCommunication;
|
private WiFiCommunication mWiFiCommunication;
|
||||||
|
private boolean startAlarmRecordingValue;
|
||||||
|
private MutableLiveData<Boolean> startAlarmRecording = new MutableLiveData<>();
|
||||||
private MutableLiveData<List<Device>> deviceList = new MutableLiveData<>();
|
private MutableLiveData<List<Device>> deviceList = new MutableLiveData<>();
|
||||||
private MutableLiveData<List<Device>> alarmHistoryList = new MutableLiveData<>();
|
private MutableLiveData<List<Device>> alarmHistoryList = new MutableLiveData<>();
|
||||||
private HashMap<String, Device> connectedDevicesList = new HashMap<>();
|
private HashMap<String, Device> connectedDevicesList = new HashMap<>();
|
||||||
@@ -29,6 +38,7 @@ public class DeviceRepository {
|
|||||||
|
|
||||||
private DeviceRepository() {
|
private DeviceRepository() {
|
||||||
setLocalDeviceUUID();
|
setLocalDeviceUUID();
|
||||||
|
startAlarmRecordingValue = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static synchronized DeviceRepository getInstance() {
|
public static synchronized DeviceRepository getInstance() {
|
||||||
@@ -52,22 +62,33 @@ public class DeviceRepository {
|
|||||||
return alarmHistoryList;
|
return alarmHistoryList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MutableLiveData<Boolean> getStartAlarmRecording() {
|
||||||
|
setMutableLiveDataStartAlarmRecording();
|
||||||
|
return startAlarmRecording;
|
||||||
|
}
|
||||||
|
|
||||||
public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
|
public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
|
||||||
Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
|
||||||
if (sensorStatus) {
|
if (sensorStatus) {
|
||||||
setAlarmHistoryDeviceList(newDevice);
|
setAlarmHistoryDeviceList(newDevice);
|
||||||
}
|
}
|
||||||
|
boolean newStartAlarmRecordingValue = checkDeviceStatus();
|
||||||
|
if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
|
||||||
|
startAlarmRecordingValue = newStartAlarmRecordingValue;
|
||||||
|
setMutableLiveDataStartAlarmRecording();
|
||||||
|
}
|
||||||
addToConnectedDeviceList(newDevice.getDeviceID(), newDevice);
|
addToConnectedDeviceList(newDevice.getDeviceID(), newDevice);
|
||||||
setMutableLiveDataDeviceList();
|
setMutableLiveDataDeviceList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getNewReceivedMessage(String newMessage) {
|
public void getNewReceivedMessage(String newMessage) {
|
||||||
String[] messageString = messageStringSplitter(newMessage);
|
String[] messageString = messageStringSplitter(newMessage);
|
||||||
String timeStamp = messageString[0];
|
if(messageString[0]=="1" && messageString.length == 7){
|
||||||
String deviceID = messageString[1];
|
String timeStamp = messageString[1];
|
||||||
boolean sensorStatus = convertSensorStatus(messageString[2]);
|
String deviceID = messageString[3];
|
||||||
String sensorType = messageString[3];
|
boolean sensorStatus = convertSensorStatus(messageString[4]);
|
||||||
int sensorMassage = Integer.valueOf(messageString[4]);
|
String sensorType = messageString[5];
|
||||||
|
int sensorMassage = Integer.valueOf(messageString[6]);
|
||||||
|
|
||||||
if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
|
if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
|
||||||
return;
|
return;
|
||||||
@@ -80,14 +101,20 @@ public class DeviceRepository {
|
|||||||
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private String messageStringBuilder(String deviceID) {
|
private String messageStringBuilder(String deviceID) {
|
||||||
StringBuilder message = new StringBuilder();
|
StringBuilder message = new StringBuilder();
|
||||||
Device device = connectedDevicesList.get(deviceID);
|
Device device = connectedDevicesList.get(deviceID);
|
||||||
if(device != null) {
|
if(device != null) {
|
||||||
message.append(device.getTimeStamp())
|
message.append("1")
|
||||||
.append(delimiter)
|
.append(delimiter)
|
||||||
.append(device.getDeviceID())
|
.append(device.getTimeStamp())
|
||||||
|
.append(delimiter)
|
||||||
|
.append("Gruppe3")
|
||||||
|
.append(delimiter)
|
||||||
|
//.append(device.getDeviceID())
|
||||||
|
.append(getLocalIpAddress(deviceID))
|
||||||
.append(delimiter)
|
.append(delimiter)
|
||||||
.append(device.getSensorStatus())
|
.append(device.getSensorStatus())
|
||||||
.append(delimiter)
|
.append(delimiter)
|
||||||
@@ -104,6 +131,10 @@ public class DeviceRepository {
|
|||||||
.append(delimiter)
|
.append(delimiter)
|
||||||
.append("")
|
.append("")
|
||||||
.append(delimiter)
|
.append(delimiter)
|
||||||
|
.append("")
|
||||||
|
.append(delimiter)
|
||||||
|
.append("")
|
||||||
|
.append(delimiter)
|
||||||
.append("");
|
.append("");
|
||||||
}
|
}
|
||||||
return message.toString();
|
return message.toString();
|
||||||
@@ -124,6 +155,11 @@ public class DeviceRepository {
|
|||||||
setAlarmHistoryDeviceList(device);
|
setAlarmHistoryDeviceList(device);
|
||||||
}
|
}
|
||||||
device.setSensorStatus(sensorStatus);
|
device.setSensorStatus(sensorStatus);
|
||||||
|
boolean newStartAlarmRecordingValue = checkDeviceStatus();
|
||||||
|
if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
|
||||||
|
startAlarmRecordingValue = newStartAlarmRecordingValue;
|
||||||
|
setMutableLiveDataStartAlarmRecording();
|
||||||
|
}
|
||||||
addToConnectedDeviceList(checkedDeviceID, device);
|
addToConnectedDeviceList(checkedDeviceID, device);
|
||||||
setMutableLiveDataDeviceList();
|
setMutableLiveDataDeviceList();
|
||||||
}
|
}
|
||||||
@@ -177,6 +213,11 @@ public class DeviceRepository {
|
|||||||
setAlarmHistoryDeviceList(device);
|
setAlarmHistoryDeviceList(device);
|
||||||
}
|
}
|
||||||
device.setSensorStatus(sensorStatus);
|
device.setSensorStatus(sensorStatus);
|
||||||
|
boolean newStartAlarmRecordingValue = checkDeviceStatus();
|
||||||
|
if (startAlarmRecordingValue != newStartAlarmRecordingValue) {
|
||||||
|
startAlarmRecordingValue = newStartAlarmRecordingValue;
|
||||||
|
setMutableLiveDataStartAlarmRecording();
|
||||||
|
}
|
||||||
addToConnectedDeviceList(checkedDeviceID, device);
|
addToConnectedDeviceList(checkedDeviceID, device);
|
||||||
setMutableLiveDataDeviceList();
|
setMutableLiveDataDeviceList();
|
||||||
|
|
||||||
@@ -245,6 +286,10 @@ public class DeviceRepository {
|
|||||||
alarmHistoryList.setValue(alarmHistoryDeviceList);
|
alarmHistoryList.setValue(alarmHistoryDeviceList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void setMutableLiveDataStartAlarmRecording() {
|
||||||
|
startAlarmRecording.setValue(startAlarmRecordingValue);
|
||||||
|
}
|
||||||
|
|
||||||
private void addToConnectedDeviceList(String key, Device device) {
|
private void addToConnectedDeviceList(String key, Device device) {
|
||||||
connectedDevicesList.put(key, device);
|
connectedDevicesList.put(key, device);
|
||||||
if (key.equals(checkDeviceID(localDeviceUUID))) {
|
if (key.equals(checkDeviceID(localDeviceUUID))) {
|
||||||
@@ -272,7 +317,7 @@ public class DeviceRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean convertSensorStatus(String status) {
|
private boolean convertSensorStatus(String status) {
|
||||||
return status.equals(SensorStatusKey);
|
return status.equals(sensorStatusKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setAlarmHistoryDeviceList(Device device) {
|
private void setAlarmHistoryDeviceList(Device device) {
|
||||||
@@ -283,4 +328,34 @@ public class DeviceRepository {
|
|||||||
alarmHistoryDeviceList.add(0, alarmHistoryDevice);
|
alarmHistoryDeviceList.add(0, alarmHistoryDevice);
|
||||||
setMutableLiveDataAlarmHistoryList();
|
setMutableLiveDataAlarmHistoryList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean checkDeviceStatus() {
|
||||||
|
for (Device device : connectedDevicesList.values()) {
|
||||||
|
if (device.getSensorStatus()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLocalIpAddress(String deviceID) {
|
||||||
|
String checkedDeviceID = checkDeviceID(deviceID);
|
||||||
|
Device device = connectedDevicesList.get(checkedDeviceID);
|
||||||
|
if(device != null){
|
||||||
|
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 "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
package com.example.greenwatch.sensors;
|
||||||
|
|
||||||
|
import androidx.lifecycle.MutableLiveData;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
public class AccelerometerSensor {
|
||||||
|
private MutableLiveData<Boolean> mAccelerometerAlarmDetected = new MutableLiveData<>();
|
||||||
|
private static AccelerometerSensor accelerometerSensorInstance;
|
||||||
|
private boolean accelerometerAlarmDetected;
|
||||||
|
private ArrayList<Float> Gesamt_be;
|
||||||
|
int arraySize = 500;
|
||||||
|
int functionCallCount;
|
||||||
|
float meanValue;
|
||||||
|
float offsetValue;
|
||||||
|
float thresholdValue;
|
||||||
|
boolean startMeasuring;
|
||||||
|
|
||||||
|
private AccelerometerSensor() {
|
||||||
|
initGesamtBE();
|
||||||
|
accelerometerAlarmDetected = false;
|
||||||
|
setMutableLiveDataAccelerometerAlarmDetected();
|
||||||
|
functionCallCount = 0;
|
||||||
|
meanValue = 0.0f;
|
||||||
|
offsetValue = 0.1f;
|
||||||
|
thresholdValue = 0.15f;
|
||||||
|
startMeasuring = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static synchronized AccelerometerSensor getInstance() {
|
||||||
|
if (accelerometerSensorInstance == null){
|
||||||
|
accelerometerSensorInstance = new AccelerometerSensor();
|
||||||
|
}
|
||||||
|
return accelerometerSensorInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MutableLiveData<Boolean> getAccelerometerAlarmDetected() {
|
||||||
|
setMutableLiveDataAccelerometerAlarmDetected();
|
||||||
|
return mAccelerometerAlarmDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setMutableLiveDataAccelerometerAlarmDetected() {
|
||||||
|
mAccelerometerAlarmDetected.setValue(accelerometerAlarmDetected);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initGesamtBE() {
|
||||||
|
Gesamt_be = new ArrayList<>(arraySize);
|
||||||
|
for (int i = 0; i < arraySize; i++) {
|
||||||
|
Gesamt_be.add(0.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 && !mAccelerometerAlarmDetected.getValue()) {
|
||||||
|
mAccelerometerAlarmDetected.setValue(true);
|
||||||
|
}
|
||||||
|
else if (meanValue < (thresholdValue + offsetValue) && mAccelerometerAlarmDetected.getValue()){
|
||||||
|
mAccelerometerAlarmDetected.setValue(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package com.example.greenwatch.sensors;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.graphics.ImageFormat;
|
||||||
|
import android.media.Image;
|
||||||
|
import android.util.Size;
|
||||||
|
|
||||||
|
import androidx.camera.core.CameraSelector;
|
||||||
|
import androidx.camera.core.ImageAnalysis;
|
||||||
|
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
import androidx.lifecycle.MutableLiveData;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
|
public class CameraSensor {
|
||||||
|
private final MutableLiveData<Boolean> mVideoAlarmDetected = new MutableLiveData<>();
|
||||||
|
private static CameraSensor cameraSensorInstance;
|
||||||
|
private boolean videoAlarmDetected;
|
||||||
|
private ByteBuffer previousBuffer;
|
||||||
|
private int previousWidth;
|
||||||
|
private int previousHeight;
|
||||||
|
|
||||||
|
private CameraSensor() {
|
||||||
|
videoAlarmDetected = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static synchronized CameraSensor getInstance() {
|
||||||
|
if (cameraSensorInstance == null){
|
||||||
|
cameraSensorInstance = new CameraSensor();
|
||||||
|
}
|
||||||
|
return cameraSensorInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MutableLiveData<Boolean> getVideoAlarmDetectedValue() {
|
||||||
|
setMutableLiveDataVideoAlarmDetected();
|
||||||
|
return mVideoAlarmDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setMutableLiveDataVideoAlarmDetected() {
|
||||||
|
mVideoAlarmDetected.setValue(videoAlarmDetected);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
|
||||||
|
ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
|
||||||
|
builder.setTargetResolution(new Size(640, 480));
|
||||||
|
builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
|
||||||
|
ImageAnalysis imageAnalysis = builder.build();
|
||||||
|
imageAnalysis.setAnalyzer(
|
||||||
|
ContextCompat.getMainExecutor(context),
|
||||||
|
imageProxy -> {
|
||||||
|
|
||||||
|
int imageFormat = imageProxy.getFormat();
|
||||||
|
|
||||||
|
if (imageFormat == ImageFormat.YUV_420_888) {
|
||||||
|
|
||||||
|
Image currentImage = imageProxy.getImage();
|
||||||
|
|
||||||
|
if (previousHeight != 0) {
|
||||||
|
assert currentImage != null;
|
||||||
|
videoAlarmDetected = compareFrames(currentImage);
|
||||||
|
}
|
||||||
|
|
||||||
|
assert currentImage != null;
|
||||||
|
Image.Plane[] planes = currentImage.getPlanes();
|
||||||
|
ByteBuffer buffer = planes[0].getBuffer().duplicate();
|
||||||
|
previousBuffer = ByteBuffer.allocateDirect(buffer.remaining());
|
||||||
|
previousBuffer.put(buffer);
|
||||||
|
previousWidth = currentImage.getWidth();
|
||||||
|
previousHeight = currentImage.getHeight();
|
||||||
|
|
||||||
|
currentImage.close();
|
||||||
|
|
||||||
|
checkAlarmCondition();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
imageProxy.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
|
||||||
|
|
||||||
|
cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, imageAnalysis);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean compareFrames(Image currentImage) {
|
||||||
|
|
||||||
|
ByteBuffer currentBuffer = currentImage.getPlanes()[0].getBuffer();
|
||||||
|
|
||||||
|
int currentWidth = currentImage.getWidth();
|
||||||
|
int currentHeight = currentImage.getHeight();
|
||||||
|
|
||||||
|
if (previousWidth != currentWidth || previousHeight != currentHeight) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int row = 0; row < previousHeight; row++) {
|
||||||
|
for (int col = 0; col < previousWidth; col++) {
|
||||||
|
|
||||||
|
int previousIndex = row * previousWidth + col;
|
||||||
|
int currentIndex = row * currentWidth + col;
|
||||||
|
|
||||||
|
int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
|
||||||
|
int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
|
||||||
|
|
||||||
|
int pixelDifference = Math.abs(previousPixel - currentPixel);
|
||||||
|
int threshold = 120;
|
||||||
|
|
||||||
|
if (pixelDifference > threshold) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkAlarmCondition() {
|
||||||
|
if (videoAlarmDetected && !mVideoAlarmDetected.getValue()) {
|
||||||
|
setMutableLiveDataVideoAlarmDetected();
|
||||||
|
}
|
||||||
|
else if (!videoAlarmDetected && mVideoAlarmDetected.getValue()){
|
||||||
|
setMutableLiveDataVideoAlarmDetected();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
|||||||
private MutableLiveData<List<Device>> mDeviceList;
|
private MutableLiveData<List<Device>> mDeviceList;
|
||||||
private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
|
private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
|
||||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||||
|
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||||
private DeviceRepository mDeviceRepository;
|
private DeviceRepository mDeviceRepository;
|
||||||
private ArrayList<Float> Gesamt_be;
|
private ArrayList<Float> Gesamt_be;
|
||||||
int arraySize = 500;
|
int arraySize = 500;
|
||||||
@@ -32,6 +33,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
|||||||
mDeviceRepository = DeviceRepository.getInstance();
|
mDeviceRepository = DeviceRepository.getInstance();
|
||||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||||
|
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||||
}
|
}
|
||||||
initGesamtBE();
|
initGesamtBE();
|
||||||
mMovementDetected.setValue(false);
|
mMovementDetected.setValue(false);
|
||||||
@@ -82,10 +84,6 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSystemTimeStamp() {
|
|
||||||
return mDeviceRepository.getSystemTimeStamp();
|
|
||||||
}
|
|
||||||
|
|
||||||
public LiveData<Boolean> getMovementDetectedValue() {
|
public LiveData<Boolean> getMovementDetectedValue() {
|
||||||
return mMovementDetected;
|
return mMovementDetected;
|
||||||
}
|
}
|
||||||
@@ -100,6 +98,11 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
|||||||
return mAlarmHistoryList;
|
return mAlarmHistoryList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<Boolean> getStartAlarmRecording() {
|
||||||
|
return mStartAlarmRecording;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||||
@@ -159,4 +162,9 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
|
|||||||
public String getLocalDeviceUUID() {
|
public String getLocalDeviceUUID() {
|
||||||
return mDeviceRepository.getLocalDeviceUUID();
|
return mDeviceRepository.getLocalDeviceUUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemTimeStamp() {
|
||||||
|
return mDeviceRepository.getSystemTimeStamp();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
package com.example.greenwatch.viewmodels;
|
package com.example.greenwatch.viewmodels;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.lifecycle.MutableLiveData;
|
import androidx.lifecycle.MutableLiveData;
|
||||||
import androidx.lifecycle.ViewModel;
|
import androidx.lifecycle.ViewModel;
|
||||||
@@ -14,7 +20,9 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
|||||||
|
|
||||||
private MutableLiveData<List<Device>> mDeviceList;
|
private MutableLiveData<List<Device>> mDeviceList;
|
||||||
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||||
|
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||||
private DeviceRepository mDeviceRepository;
|
private DeviceRepository mDeviceRepository;
|
||||||
|
private static final int RIGHTS_REQUEST_CAMERA = 10;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
@@ -28,9 +36,17 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
|||||||
mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
|
mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
|
||||||
mWiFiCommunication.setDeviceRepository(mDeviceRepository);
|
mWiFiCommunication.setDeviceRepository(mDeviceRepository);
|
||||||
mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
|
mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
|
||||||
mDeviceRepository.createNewDevice("00:00", "1234", true, "Test", 21);
|
|
||||||
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
mDeviceList = mDeviceRepository.getConnectedDeviceList();
|
||||||
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
|
||||||
|
mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
@Override
|
||||||
@@ -43,6 +59,11 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
|||||||
return mAlarmHistoryList;
|
return mAlarmHistoryList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<Boolean> getStartAlarmRecording() {
|
||||||
|
return mStartAlarmRecording;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
|
||||||
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
|
||||||
@@ -102,4 +123,9 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
|
|||||||
public String getLocalDeviceUUID() {
|
public String getLocalDeviceUUID() {
|
||||||
return mDeviceRepository.getLocalDeviceUUID();
|
return mDeviceRepository.getLocalDeviceUUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemTimeStamp() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+196
@@ -0,0 +1,196 @@
|
|||||||
|
package com.example.greenwatch.viewmodels;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||||
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
import androidx.lifecycle.LiveData;
|
||||||
|
import androidx.lifecycle.MutableLiveData;
|
||||||
|
import androidx.lifecycle.Observer;
|
||||||
|
import androidx.lifecycle.ViewModel;
|
||||||
|
|
||||||
|
import com.example.greenwatch.models.Device;
|
||||||
|
import com.example.greenwatch.repositories.DeviceRepository;
|
||||||
|
import com.example.greenwatch.sensors.AccelerometerSensor;
|
||||||
|
import com.example.greenwatch.sensors.CameraSensor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class VideodetectionAndAccelerometerViewModel extends ViewModel implements ViewModelInterface{
|
||||||
|
private MutableLiveData<List<Device>> mDeviceList;
|
||||||
|
private MutableLiveData<Boolean> mAccelerometerAlarmDetected;
|
||||||
|
private MutableLiveData<Boolean> mVideoAlarmDetected;
|
||||||
|
private MutableLiveData<Boolean> mVideodetectionAndAccelerometerAlarmDetected = new MutableLiveData<>();
|
||||||
|
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||||
|
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||||
|
private AccelerometerSensor mAccelerometerSensor;
|
||||||
|
private CameraSensor mCameraSensor;
|
||||||
|
private DeviceRepository mDeviceRepository;
|
||||||
|
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;
|
||||||
|
registerAlarmObserver();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addValueToGesamtBE(float newValue) {
|
||||||
|
mAccelerometerSensor.addValueToGesamtBE(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void meanValueCalculation() {
|
||||||
|
mAccelerometerSensor.meanValueCalculation();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void calibrateAccelerometerSensor() {
|
||||||
|
mAccelerometerSensor.calibrateAccelerometerSensor();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkAlarmCondition() {
|
||||||
|
mAccelerometerSensor.checkAlarmCondition();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
|
||||||
|
mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LiveData<Boolean> getVideodetectionAndAccelerometerAlarmDetected() {
|
||||||
|
setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
|
||||||
|
return mVideodetectionAndAccelerometerAlarmDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected() {
|
||||||
|
mVideodetectionAndAccelerometerAlarmDetected.setValue(VideodetectionAndAccelerometerAlarmDetected);
|
||||||
|
}
|
||||||
|
|
||||||
|
Observer<Boolean> observer = new Observer<Boolean>() {
|
||||||
|
@Override
|
||||||
|
public void onChanged(Boolean aBoolean) {
|
||||||
|
if (mVideoAlarmDetected.getValue() || mAccelerometerAlarmDetected.getValue() && !VideodetectionAndAccelerometerAlarmDetected) {
|
||||||
|
VideodetectionAndAccelerometerAlarmDetected = true;
|
||||||
|
setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (!mVideoAlarmDetected.getValue() && !mAccelerometerAlarmDetected.getValue() && VideodetectionAndAccelerometerAlarmDetected) {
|
||||||
|
VideodetectionAndAccelerometerAlarmDetected = false;
|
||||||
|
setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private void registerAlarmObserver() {
|
||||||
|
mVideoAlarmDetected.observeForever(observer);
|
||||||
|
mAccelerometerAlarmDetected.observeForever(observer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCleared() {
|
||||||
|
super.onCleared();
|
||||||
|
mVideoAlarmDetected.removeObserver(observer);
|
||||||
|
mAccelerometerAlarmDetected.removeObserver(observer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||||
|
return mDeviceList;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<List<Device>> getAlarmHistoryList() {
|
||||||
|
return mAlarmHistoryList;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<Boolean> getStartAlarmRecording() {
|
||||||
|
return mStartAlarmRecording;
|
||||||
|
}
|
||||||
|
|
||||||
|
@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();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemTimeStamp() {
|
||||||
|
return mDeviceRepository.getSystemTimeStamp();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
package com.example.greenwatch.viewmodels;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.camera.lifecycle.ProcessCameraProvider;
|
||||||
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
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 com.example.greenwatch.sensors.CameraSensor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class VideodetectionViewModel extends ViewModel implements ViewModelInterface {
|
||||||
|
|
||||||
|
private MutableLiveData<List<Device>> mDeviceList;
|
||||||
|
private MutableLiveData<Boolean> mVideoAlarmDetected;
|
||||||
|
private MutableLiveData<List<Device>> mAlarmHistoryList;
|
||||||
|
private MutableLiveData<Boolean> mStartAlarmRecording;
|
||||||
|
private DeviceRepository mDeviceRepository;
|
||||||
|
private CameraSensor mCameraSensor;
|
||||||
|
|
||||||
|
|
||||||
|
public LiveData<Boolean> getVideoMovementDetectedValue() {
|
||||||
|
return mVideoAlarmDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void init() {
|
||||||
|
if (mDeviceRepository == null) {
|
||||||
|
mDeviceRepository = DeviceRepository.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 (mVideoAlarmDetected == null) {
|
||||||
|
mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
|
||||||
|
mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LiveData<Boolean> getVideoAlarmDetectedValue() {
|
||||||
|
return mVideoAlarmDetected;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<List<Device>> getConnectedDeviceList() {
|
||||||
|
return mDeviceList;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<List<Device>> getAlarmHistoryList() {
|
||||||
|
return mAlarmHistoryList;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LiveData<Boolean> getStartAlarmRecording() {
|
||||||
|
return mStartAlarmRecording;
|
||||||
|
}
|
||||||
|
|
||||||
|
@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();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSystemTimeStamp() {
|
||||||
|
return mDeviceRepository.getSystemTimeStamp();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ public interface ViewModelInterface {
|
|||||||
void init();
|
void init();
|
||||||
LiveData<List<Device>> getConnectedDeviceList();
|
LiveData<List<Device>> getConnectedDeviceList();
|
||||||
LiveData<List<Device>> getAlarmHistoryList();
|
LiveData<List<Device>> getAlarmHistoryList();
|
||||||
|
LiveData<Boolean> getStartAlarmRecording();
|
||||||
void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
|
void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
|
||||||
void setTimeStamp(String deviceID, String timeStamp);
|
void setTimeStamp(String deviceID, String timeStamp);
|
||||||
String getTimeStamp(String deviceID);
|
String getTimeStamp(String deviceID);
|
||||||
@@ -22,4 +23,5 @@ public interface ViewModelInterface {
|
|||||||
void setSensorMassage(String deviceID, int sensorMessage);
|
void setSensorMassage(String deviceID, int sensorMessage);
|
||||||
int getSensorMassage(String deviceID);
|
int getSensorMassage(String deviceID);
|
||||||
String getLocalDeviceUUID();
|
String getLocalDeviceUUID();
|
||||||
|
String getSystemTimeStamp();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,4 +22,27 @@
|
|||||||
android:text="Back to MainActivity">
|
android:text="Back to MainActivity">
|
||||||
</Button>
|
</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>
|
</LinearLayout>
|
||||||
@@ -9,10 +9,24 @@
|
|||||||
tools:context=".VideodetectionAndAccelerometerActivity">
|
tools:context=".VideodetectionAndAccelerometerActivity">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvVideodetectionAndAccelerometerStatusmessage"
|
android:id="@+id/tvvideodetectionAndAccelerometerStatusmessage"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Videodetection + Accelerometer Activity">
|
android:text="">
|
||||||
|
</TextView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvvideodetectionAndAccelerometerData"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="">
|
||||||
|
</TextView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvvideodetectionAndAccelerometerWarning"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="">
|
||||||
</TextView>
|
</TextView>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@@ -22,4 +36,27 @@
|
|||||||
android:text="Back to MainActivity">
|
android:text="Back to MainActivity">
|
||||||
</Button>
|
</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>
|
</LinearLayout>
|
||||||
Reference in New Issue
Block a user