siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added

Browse Source
This commit is contained in:
Leon Market 2023-06-14 22:11:38 +02:00
parent cafe763c4a
commit 3d02d8d4c0
3 changed files with 94 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Notiz.txt Normal file
View File

@ -0,0 +1,3 @@
Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
Stichwort: Intent
Siehe Skript Teil 1

172
app/src/main/java/com/example/ueberwachungssystem/Accelerometer.java
View File

@ -1,6 +1,6 @@
package com.example.ueberwachungssystem; package com.example.ueberwachungssystem;
import static java.lang.Math.sqrt;
import android.content.Context; import android.content.Context;
import android.hardware.Sensor; import android.hardware.Sensor;
@ -11,122 +11,114 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
public class Accelerometer extends Detector implements SensorEventListener {
public class Accelerometer implements Runnable, SensorEventListener {
Logger logger; Logger logger;
private volatile boolean running = false;
public SensorManager sensorManager; public SensorManager sensorManager;
private static final int sensorType = Sensor.TYPE_LINEAR_ACCELERATION; private int sensorType = Sensor.TYPE_ACCELEROMETER;
private Sensor accelerometer; private Sensor accelerometer;
private Context context; private Context context;
boolean alarm = false; private Thread thread;
//Preallocate memory for the data of each axis of the acceleration sensor private String threadName = "Accelerometer Thread";
float x; double[] gravity = new double[3];
float y; double[] linear_acceleration = new double[3];
float z; private TextView textViewWorkerThread;
float betrag; //Betrag aller drei Achsen sqrt(x*x + y*y + z*z)
private DetectionReport detectionReport;
TextView textViewLog;
// In constructor pass Context from MainActivity in Accelerometer class
// In constructor pass Activity, Context and TextView from MainActivity in Accelerometer class public Accelerometer(Context context, TextView textViewWorkerThread){
public Accelerometer(Context context, Logger mainLogger, TextView textViewLog){
super(context); //von Detektor
logger = mainLogger;
this.context = context; this.context = context;
this.textViewLog = textViewLog; this.textViewWorkerThread = textViewWorkerThread;
//Logger logger = new Logger(this.getClass().getSimpleName(), textViewLog, ""); }
// Passing Activity's instance as argument on worker thread
AppCompatActivity activity;
public Accelerometer(AppCompatActivity activity){
this.activity = activity;
} }
public void getSensor(){ private void print (final String s){
sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); activity.runOnUiThread(new Runnable() {
if(sensorManager.getSensorList(sensorType).size()==0) { @Override
logger.log("Es gibt den gewünschten Sensor nicht"); public void run() {
accelerometer = null; textViewWorkerThread.setText(s);
} }
else { });
accelerometer = sensorManager.getSensorList(sensorType).get(0);
logger.log("Sensor gefunden");
}
} }
@Override
public void run() {
while (running) {
sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
if (sensorManager.getSensorList(sensorType).size() == 0) {
logger.log("Es gibt den gewünschten Sensor nicht");
accelerometer = null;
} else {
accelerometer = sensorManager.getSensorList(sensorType).get(0);
}
}
}
void start(){
logger.log("Starting" + threadName);
running = true;
thread = new Thread(this);
thread.setName(threadName);
thread.start();
logger.log("alright, " + threadName + " started!");
void start() {
// register the sensor before using // // register the sensor before using //
sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_NORMAL); sensorManager.registerListener((SensorEventListener) context, accelerometer, SensorManager.SENSOR_DELAY_NORMAL);
logger.log("Accelerometer, start!"); logger.log("Accelerometer, du bist dran!");
} }
void stop() { void stop() {
// unregister from the sensor to stop using it // // unregister from the sensor to stop using it //
sensorManager.unregisterListener(this, accelerometer); sensorManager.unregisterListener((SensorEventListener) context, accelerometer);
logger.log("Accelerometer unregistered!"); logger.log("Das reicht Accelerometer, komm zurück!");
if (!running){
logger.log(threadName + " not running.");
} else {
logger.log("Stopping " + threadName);
running = false;
while (true) {
try {
thread.join();
logger.log("..." + threadName + " stopped");
break;
} catch (InterruptedException e){
e.printStackTrace();
}
}
}
} }
@Override @Override
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
checkAlarm(event); // Highpass filter to filter out gravity influence
} final double alpha = 0.8;
StringBuffer stringBuffer = new StringBuffer(); gravity[0] = alpha * gravity[0] + (1 - alpha) * event.values[0];
public void checkAlarm (SensorEvent event) { gravity[1] = alpha * gravity[1] + (1 - alpha) * event.values[1];
x = event.values[0]; gravity[2] = alpha * gravity[2] + (1 - alpha) * event.values[2];
y = event.values[1]; linear_acceleration[0] = event.values[0] - gravity[0];
z = event.values[2];
betrag = (float) sqrt(x*x + y*y + z*z);
double schwelle = 1.5;
if (!alarm) { linear_acceleration[1] = event.values[1] - gravity[1];
if (betrag > schwelle) { linear_acceleration[2] = event.values[2] - gravity[2];
stringBuffer.append("\n Betragswert über Schwelle, Detection Report wird gleich aufgerufen");
//logger.log("Betragswert über Schwelle erkannt, Alarm wird gleich angeschaltet"); String sb = "t=" + event.timestamp +
alarm = true; "\nx=" + event.values[0] + // Wert liegend: x = 0.04
stringBuffer.append("\nAlarm = " + alarm); "\ny=" + event.values[1] + // Wert liegend: y = 0.44
detectionReport = new DetectionReport("Accelerometer1", "Bewegung", betrag); "\nz=" + event.values[2] + // Wert liegend: z = 9.90 = Erdbeschleunigung --> Wenn Ausrichtung unbekannt ist, müsste kalibrierung bei Start der Bewegungsüberwachung vorgenommen werden
stringBuffer.append("\nDetectionReport = " + detectionReport) "\nlin_x=" + linear_acceleration[0] +
.append("\nAlarm an" + betrag + event.timestamp); "\nlin_x=" + linear_acceleration[1] +
//logger.log("Alarm an"); "\nlin_x=" + linear_acceleration[2];
//logger.log("Betrag: " + betrag + event.timestamp);
logger.clearLog(); logger.clearLog();
logger.log(stringBuffer.toString()); logger.log(sb);
stringBuffer.delete(0, stringBuffer.length());
}
} else {
if (betrag < schwelle) {
stringBuffer.append("\nAlarm noch an; Neuer Betragswert unter Schwellwert:" + betrag);
//logger.log("Alarm ist noch an; Neuer Betragswert unter Schwellwert: " + betrag);
alarm = false;
//logger.log("Alarm" + alarm);
//logger.log("Alarm wieder ausgeschaltet");
stringBuffer.append("\nAlarm = " + alarm);
} else {
logger.log("Betragswert immer noch über Schwellwert: " + betrag + "; Alarm bleibt an.");
logger.log("Betragswert immer noch über Schwellwert: " + betrag + "; Alarm bleibt an.");
}
//logger.clearLog();
logger.log(stringBuffer.toString());
stringBuffer.delete(0, stringBuffer.length());
}
} }
@Override @Override
public void onAccuracyChanged(Sensor sensor, int accuracy) { public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
@Override
public void startDetection() {
// entspricht void start()
if (accelerometer != null) {
sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
logger.log("Sensor registriert");
}
}
@Override
public void stopDetection() {
// entspricht void stop()
sensorManager.unregisterListener(this, accelerometer);
logger.log("Vom Sensor abgemeldet");
} }
} }

19
app/src/main/java/com/example/ueberwachungssystem/ThreadDemo.java
View File

@ -9,21 +9,20 @@ public class ThreadDemo implements Runnable {
private volatile boolean running = false; private volatile boolean running = false;
private Thread thread; private Thread thread;
private String threadname = "testThread"; private String threadname = "testThread";
//Logger logger; Logger logger;
TextView textViewWorkerThread;
// Passing Activity's instance as argument on worker thread // Passing Activity's instance as argument on worker thread
AppCompatActivity activity; AppCompatActivity activity;
public ThreadDemo(AppCompatActivity activity, TextView textViewWorkerThread){ public ThreadDemo(AppCompatActivity activity){
this.activity = activity; this.activity = activity;
this.textViewWorkerThread = textViewWorkerThread;
} }
//Method print which delegates access on MainActivity to runOnUiThread //Method print which delegates access on MainActivity to runOnUiThread
private void print(final String s) { private void print(final String s) {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
textViewWorkerThread.setText(s); //textViewWorkerThread.setText(s);
} }
}); });
} }
@ -44,23 +43,23 @@ public class ThreadDemo implements Runnable {
} }
void start() { void start() {
//logger.log("Starting " + threadname + "..."); logger.log("Starting " + threadname + "...");
running = true; running = true;
thread = new Thread(this); thread = new Thread(this);
thread.setName(threadname); thread.setName(threadname);
thread.start(); thread.start();
//logger.log("..." + threadname + " started"); logger.log("..." + threadname + " started");
} }
void stop() { void stop() {
if (!running) { if (!running) {
//logger.log(threadname + " not running"); logger.log(threadname + " not running");
} else { } else {
//logger.log("Stopping " + threadname + "..."); logger.log("Stopping " + threadname + "...");
running = false; running = false;
while(true){ while(true){
try { try {
thread.join(); thread.join();
//logger.log("... " + threadname + " stopped"); logger.log("... " + threadname + " stopped");
break; break;
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();