Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b208a1853a | ||
|
|
12697ab05a | ||
|
|
c2ad9c6847 | ||
|
|
a111765677 | ||
|
|
4c0c4416fc |
@@ -25,7 +25,6 @@ android {
|
|||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
namespace 'com.example.greenwatch'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -36,10 +35,4 @@ 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}"
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.example.greenwatch">
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
|
||||||
<uses-permission android:name="android.permission.CAMERA"/>
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH"/>
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
||||||
|
|
||||||
<uses-feature android:name="android.hardware.camera"/>
|
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@@ -18,6 +9,9 @@
|
|||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.GreenWatch">
|
android:theme="@style/Theme.GreenWatch">
|
||||||
|
<activity
|
||||||
|
android:name=".Beschleunigungssensor"
|
||||||
|
android:exported="false" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true">
|
android:exported="true">
|
||||||
@@ -27,10 +21,6 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".KameraAktivitaet" />
|
|
||||||
<activity android:name=".Kamera_Beschleunigungssensor" />
|
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -1,4 +1,188 @@
|
|||||||
package com.example.greenwatch;
|
package com.example.greenwatch;
|
||||||
|
|
||||||
public class Beschleunigungssensor {
|
|
||||||
}
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.hardware.Sensor;
|
||||||
|
import android.hardware.SensorEvent;
|
||||||
|
import android.hardware.SensorEventListener;
|
||||||
|
import android.hardware.SensorManager;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
public class Beschleunigungssensor extends AppCompatActivity implements SensorEventListener{
|
||||||
|
|
||||||
|
private SensorManager bsmanager;
|
||||||
|
private ArrayList<Float> Gesamt_be;
|
||||||
|
private int sensorType = Sensor.TYPE_GYROSCOPE, zaehler_runde =0, listen_groesse = 500, kalibrieren, Offset_shared = 0, shared_merk, mittelwertsumme_shared;
|
||||||
|
private Sensor sens, sensor_l;
|
||||||
|
private float x_value = 0, y_value, z_value, Vorbesetzung = 0, gesamt_runde =0;
|
||||||
|
private double Schwellwert = 0.15, mittelwertsumme = 0.0, Offset = 0.1;
|
||||||
|
String Daten, Warnung, Zeitstempel, Array_shared;
|
||||||
|
private final static String KEY_kalibirieren = "KEY_KALIBRIEREN_"+Beschleunigungssensor.class.getSimpleName();
|
||||||
|
private final static String KEY_Gesamt_be = "KEY_GESAMT_BE_"+Beschleunigungssensor.class.getSimpleName();
|
||||||
|
private final static String KEY_Offset = "KEY_OFFSET_"+Beschleunigungssensor.class.getSimpleName();
|
||||||
|
private final static String KEY_Mittelwertsumme = "KEY_MITTELWERTSUMME_"+Beschleunigungssensor.class.getSimpleName();
|
||||||
|
TextView Daten_Bsensor, Warnung_Bsensor, test;
|
||||||
|
private boolean toggle = true, ts_setzen = true, start_messen;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_beschleunigungssensor);
|
||||||
|
|
||||||
|
Daten_Bsensor = (TextView) findViewById(R.id.DatenBsensor);
|
||||||
|
Warnung_Bsensor = (TextView) findViewById(R.id.WarnungBsensor);
|
||||||
|
test = (TextView) findViewById(R.id.test);
|
||||||
|
|
||||||
|
bsmanager = (SensorManager) getSystemService(SENSOR_SERVICE);
|
||||||
|
if (bsmanager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
|
||||||
|
sens = null;
|
||||||
|
Daten = "kein B Sensor voranden";
|
||||||
|
} else {
|
||||||
|
sens = bsmanager.getSensorList(sensorType).get(0);
|
||||||
|
}
|
||||||
|
Gesamt_be = new ArrayList<Float>();
|
||||||
|
for (int i = 0; i < listen_groesse ; i++){
|
||||||
|
Gesamt_be.add(Vorbesetzung);
|
||||||
|
}
|
||||||
|
kalibrieren = 0;
|
||||||
|
start_messen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getTimestamp(){
|
||||||
|
Long tslong = System.currentTimeMillis();
|
||||||
|
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
|
||||||
|
Date date = new Date(tslong);
|
||||||
|
String result = sdf.format(date);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSensorChanged(SensorEvent event) {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("x=").append(event.values[0])//.append(event.timestamp)
|
||||||
|
.append("\ny=").append(event.values[1])
|
||||||
|
.append("\nz=").append(event.values[2]);
|
||||||
|
Daten = sb.toString();
|
||||||
|
Daten_Bsensor.setText(Daten);
|
||||||
|
gesamt_runde = event.values[0] + event.values[1] + event.values[2];
|
||||||
|
Gesamt_be.remove(zaehler_runde);
|
||||||
|
Gesamt_be.add(zaehler_runde, gesamt_runde);
|
||||||
|
mittelwertsumme = 0.0;
|
||||||
|
|
||||||
|
//Mittelwert des Arrays berechnen
|
||||||
|
for (int i = 0; i < listen_groesse; i++){
|
||||||
|
if (Gesamt_be.get(i) < 0){
|
||||||
|
mittelwertsumme += (Gesamt_be.get(i) * (-1));
|
||||||
|
}else {
|
||||||
|
mittelwertsumme += Gesamt_be.get(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mittelwertsumme = mittelwertsumme/listen_groesse;
|
||||||
|
if (kalibrieren < listen_groesse){
|
||||||
|
Offset = mittelwertsumme;
|
||||||
|
kalibrieren++;
|
||||||
|
}else {
|
||||||
|
start_messen = true;
|
||||||
|
}
|
||||||
|
StringBuilder testsb = new StringBuilder();
|
||||||
|
testsb.append(mittelwertsumme);
|
||||||
|
String tests = testsb.toString();
|
||||||
|
test.setText(tests);
|
||||||
|
|
||||||
|
if((mittelwertsumme > (Schwellwert+Offset) ) & (ts_setzen == true) &(start_messen == true)){
|
||||||
|
Zeitstempel = getTimestamp();
|
||||||
|
StringBuilder ts = new StringBuilder();
|
||||||
|
ts.append(Zeitstempel)
|
||||||
|
.append(", Gruppe3")
|
||||||
|
.append(", An")
|
||||||
|
.append(", Bewegung, ")
|
||||||
|
.append(mittelwertsumme);
|
||||||
|
Warnung = ts.toString();
|
||||||
|
Warnung_Bsensor.setText(Warnung);
|
||||||
|
ts_setzen = false;
|
||||||
|
}else if((mittelwertsumme > (Schwellwert+Offset)) & (ts_setzen == false)){
|
||||||
|
} else if ((mittelwertsumme < (Schwellwert+Offset)) & (ts_setzen == false)) {
|
||||||
|
Warnung_Bsensor.setText("");
|
||||||
|
ts_setzen = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (zaehler_runde < (listen_groesse -1)){
|
||||||
|
zaehler_runde++;
|
||||||
|
}else {
|
||||||
|
zaehler_runde = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//mittelwertsumme ist kein int in diesem programm
|
||||||
|
//shared prefenrences: bei Kippen speichern -> nochmal neu klalibrieren? -> eig ja, weil neuer Standort
|
||||||
|
//Vorbelegung nicht nochmal neu vornehmen -> aus onCreate Funktion raus -> hilfsvariablen auch in shared preferences speichern
|
||||||
|
@Override
|
||||||
|
public void onAccuracyChanged(Sensor sensor, int accuracy) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
if (sens != null) {
|
||||||
|
if (bsmanager.registerListener(this, sens, SensorManager.SENSOR_DELAY_GAME)) {
|
||||||
|
Daten = "Wir haben uns beim Sensor angemeldet";
|
||||||
|
} else {
|
||||||
|
Daten = "Das anmelden hat nicht geklappt";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
|
||||||
|
//mittelwertsumme_shared = p.getInt(KEY_Mittelwertsumme, 0);
|
||||||
|
//kalibrieren = p.getInt(KEY_kalibirieren, 0);
|
||||||
|
//Offset_shared = p.getInt(KEY_Offset, 0 );
|
||||||
|
//Array_shared = p.getString(KEY_Gesamt_be, "");
|
||||||
|
|
||||||
|
//mittelwertsumme = (double) mittelwertsumme_shared;
|
||||||
|
//mittelwertsumme /= 1000000.0;
|
||||||
|
|
||||||
|
//Offset = (double) Offset_shared;
|
||||||
|
//Offset /= 1000000.0;
|
||||||
|
|
||||||
|
//String zw[] = Array_shared.split(";", listen_groesse);
|
||||||
|
|
||||||
|
//if(shared_merk == 2){
|
||||||
|
//for (int i=0; i<listen_groesse; i++){
|
||||||
|
//float wert = Float.valueOf(zw[i]);
|
||||||
|
//Gesamt_be.add(i, wert);
|
||||||
|
//}}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause () {
|
||||||
|
super.onPause();
|
||||||
|
if (sens != null) {
|
||||||
|
bsmanager.unregisterListener(this, sens);
|
||||||
|
}
|
||||||
|
//shared_merk = 2;
|
||||||
|
// Offset_shared = (int) (Offset * 1000000.0);
|
||||||
|
//mittelwertsumme_shared = (int) (mittelwertsumme * 1000000.0);
|
||||||
|
|
||||||
|
//StringBuilder ar = new StringBuilder();
|
||||||
|
//for (int z=0; z < listen_groesse; z++){
|
||||||
|
//ar.append(Gesamt_be.get(z)).append(";");
|
||||||
|
//}
|
||||||
|
//Array_shared = ar.toString();
|
||||||
|
|
||||||
|
//SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
|
||||||
|
//SharedPreferences.Editor editor = p.edit();
|
||||||
|
//editor.putInt(KEY_Mittelwertsumme, mittelwertsumme_shared);
|
||||||
|
//editor.putInt(KEY_kalibirieren, kalibrieren);
|
||||||
|
//editor.putInt(KEY_Offset, Offset_shared);
|
||||||
|
//editor.putString(KEY_Gesamt_be, Array_shared);
|
||||||
|
//editor.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
package com.example.greenwatch;
|
||||||
|
|
||||||
|
public class Kamera {
|
||||||
|
}
|
||||||
@@ -1,205 +0,0 @@
|
|||||||
package com.example.greenwatch;
|
|
||||||
|
|
||||||
import android.graphics.ImageFormat;
|
|
||||||
import android.media.Image;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.util.Size;
|
|
||||||
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.camera.core.CameraSelector;
|
|
||||||
import androidx.camera.core.ImageAnalysis;
|
|
||||||
import androidx.camera.lifecycle.ProcessCameraProvider;
|
|
||||||
// PREVIEW
|
|
||||||
//import androidx.camera.view.PreviewView;
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
|
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class KameraAktivitaet extends AppCompatActivity {
|
|
||||||
|
|
||||||
// PREVIEW
|
|
||||||
// private PreviewView previewView;
|
|
||||||
private boolean isMotionDetected;
|
|
||||||
private boolean camera_alarm = false;
|
|
||||||
private TextView alarm;
|
|
||||||
|
|
||||||
// Bildverarbeitung Variablen
|
|
||||||
private ByteBuffer previousBuffer;
|
|
||||||
private int previousWidth;
|
|
||||||
private int previousHeight;
|
|
||||||
private final int threshold = 50;
|
|
||||||
private int startX;
|
|
||||||
private int startY;
|
|
||||||
private int endX;
|
|
||||||
private int endY;
|
|
||||||
|
|
||||||
private static final long ALARM_RESET_DELAY = 5000;
|
|
||||||
private Runnable alarmResetRunnable;
|
|
||||||
private final Handler alarmResetHandler = new Handler();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_main);
|
|
||||||
|
|
||||||
// NUR FÜR TESTS
|
|
||||||
alarm = findViewById(R.id.textView);
|
|
||||||
|
|
||||||
// previewView = findViewById(R.id.previewView);
|
|
||||||
|
|
||||||
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
|
|
||||||
cameraProviderFuture.addListener(() -> {
|
|
||||||
try {
|
|
||||||
bindImageAnalysis(cameraProviderFuture.get());
|
|
||||||
} catch (ExecutionException | InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}, ContextCompat.getMainExecutor(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void bindImageAnalysis(ProcessCameraProvider cameraProvider) {
|
|
||||||
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(this),
|
|
||||||
imageProxy -> {
|
|
||||||
|
|
||||||
int imageFormat = imageProxy.getFormat();
|
|
||||||
|
|
||||||
if (imageFormat == ImageFormat.YUV_420_888) {
|
|
||||||
|
|
||||||
Image currentImage = imageProxy.getImage();
|
|
||||||
|
|
||||||
if (previousHeight != 0) {
|
|
||||||
assert currentImage != null;
|
|
||||||
isMotionDetected = 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();
|
|
||||||
|
|
||||||
if (isMotionDetected) {
|
|
||||||
|
|
||||||
alarm.setText("ALARM");
|
|
||||||
camera_alarm = true;
|
|
||||||
|
|
||||||
if(alarmResetRunnable != null) {
|
|
||||||
alarmResetHandler.removeCallbacks(alarmResetRunnable);
|
|
||||||
}
|
|
||||||
|
|
||||||
alarmResetRunnable = this::resetAlarmStatus;
|
|
||||||
alarmResetHandler.postDelayed(alarmResetRunnable, ALARM_RESET_DELAY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
imageProxy.close();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Preview preview = new Preview.Builder().build();
|
|
||||||
|
|
||||||
CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
|
|
||||||
|
|
||||||
// PREVIEW //
|
|
||||||
// preview.setSurfaceProvider(previewView.getSurfaceProvider());
|
|
||||||
|
|
||||||
cameraProvider.bindToLifecycle(this, cameraSelector, imageAnalysis);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bildverarbeitung zur Bewegungserkennung
|
|
||||||
private boolean compareFrames(Image currentImage) {
|
|
||||||
Image.Plane[] planes = currentImage.getPlanes();
|
|
||||||
ByteBuffer currentBuffer = planes[0].getBuffer();
|
|
||||||
int currentWidth = currentImage.getWidth();
|
|
||||||
int currentHeight = currentImage.getHeight();
|
|
||||||
int yRowStride = planes[0].getRowStride();
|
|
||||||
int yPixelStride = planes[0].getPixelStride();
|
|
||||||
|
|
||||||
|
|
||||||
//System.out.println("Höhe: " + currentHeight + " Breite: " + currentWidth);
|
|
||||||
|
|
||||||
if (previousWidth != currentWidth || previousHeight != currentHeight) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Blöcke weiter verkleinern
|
|
||||||
int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
|
|
||||||
|
|
||||||
//System.out.println(blockSize);
|
|
||||||
|
|
||||||
int numBlocksX = currentWidth / blockSize;
|
|
||||||
int numBlocksY = currentHeight / blockSize;
|
|
||||||
|
|
||||||
for (int blockY = 0; blockY < numBlocksY; blockY++) {
|
|
||||||
for (int blockX = 0; blockX < numBlocksX; blockX++) {
|
|
||||||
startX = blockX * blockSize;
|
|
||||||
startY = blockY * blockSize;
|
|
||||||
endX = startX + blockSize;
|
|
||||||
endY = startY + blockSize;
|
|
||||||
|
|
||||||
float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
|
|
||||||
float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
|
|
||||||
|
|
||||||
int pixelDifference = Math.abs((int) previousLuminance - (int) currentLuminance);
|
|
||||||
|
|
||||||
//System.out.println(pixelDifference);
|
|
||||||
|
|
||||||
if (pixelDifference > threshold) {
|
|
||||||
System.out.println(pixelDifference);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private float berechneMittlereLuminanz(ByteBuffer buffer, int rowStride, int pixelStride) {
|
|
||||||
int sumLuminance = 0;
|
|
||||||
int countPixels = 0;
|
|
||||||
|
|
||||||
for (int row = startY; row < endY; row++) {
|
|
||||||
for (int col = startX; col < endX; col++) {
|
|
||||||
int bufferIndex = row * rowStride + col * pixelStride;
|
|
||||||
int currentPixel = buffer.get(bufferIndex) & 0xFF;
|
|
||||||
|
|
||||||
sumLuminance += currentPixel;
|
|
||||||
countPixels++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (float) sumLuminance / countPixels;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int kleinstesQuadrat(int height, int width) {
|
|
||||||
if (height == width) {
|
|
||||||
return height;
|
|
||||||
} else if (height > width) {
|
|
||||||
return kleinstesQuadrat(height - width, width);
|
|
||||||
} else {
|
|
||||||
return kleinstesQuadrat(height, width - height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void resetAlarmStatus() {
|
|
||||||
camera_alarm = false;
|
|
||||||
alarm.setText("OK");
|
|
||||||
alarmResetRunnable = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,320 +0,0 @@
|
|||||||
package com.example.greenwatch;
|
|
||||||
|
|
||||||
import android.graphics.ImageFormat;
|
|
||||||
import android.hardware.Sensor;
|
|
||||||
import android.hardware.SensorEvent;
|
|
||||||
import android.hardware.SensorEventListener;
|
|
||||||
import android.hardware.SensorManager;
|
|
||||||
import android.media.Image;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.HandlerThread;
|
|
||||||
import android.os.Looper;
|
|
||||||
import android.util.Size;
|
|
||||||
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.camera.core.CameraSelector;
|
|
||||||
import androidx.camera.core.ImageAnalysis;
|
|
||||||
import androidx.camera.lifecycle.ProcessCameraProvider;
|
|
||||||
// PREVIEW
|
|
||||||
//import androidx.camera.view.PreviewView;
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
|
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
|
|
||||||
public class Kamera_Beschleunigungssensor extends AppCompatActivity implements SensorEventListener {
|
|
||||||
|
|
||||||
private HandlerThread cameraThread;
|
|
||||||
private Handler cameraHandler;
|
|
||||||
// PREVIEW
|
|
||||||
// private PreviewView previewView;
|
|
||||||
private boolean isMotionDetected;
|
|
||||||
private boolean camera_alarm;
|
|
||||||
private TextView alarm;
|
|
||||||
private ByteBuffer previousBuffer;
|
|
||||||
private int previousWidth;
|
|
||||||
private int previousHeight;
|
|
||||||
|
|
||||||
/////////////////////////////////////
|
|
||||||
|
|
||||||
private SensorManager bsmanager;
|
|
||||||
private ArrayList<Float> Gesamt_be;
|
|
||||||
private int sensorType = Sensor.TYPE_GYROSCOPE, zaehler_runde =0, listen_groesse = 500, kalibrieren, Offset_shared = 0, shared_merk, mittelwertsumme_shared;
|
|
||||||
private Sensor sens, sensor_l;
|
|
||||||
private float x_value = 0, y_value, z_value, Vorbesetzung = 0, gesamt_runde =0;
|
|
||||||
private double Schwellwert = 0.15, mittelwertsumme = 0.0, Offset = 0.1;
|
|
||||||
String Daten, Warnung, Zeitstempel, Array_shared;
|
|
||||||
private final static String KEY_kalibirieren = "KEY_KALIBRIEREN_"+Beschleunigungssensor.class.getSimpleName();
|
|
||||||
private final static String KEY_Gesamt_be = "KEY_GESAMT_BE_"+Beschleunigungssensor.class.getSimpleName();
|
|
||||||
private final static String KEY_Offset = "KEY_OFFSET_"+Beschleunigungssensor.class.getSimpleName();
|
|
||||||
private final static String KEY_Mittelwertsumme = "KEY_MITTELWERTSUMME_"+Beschleunigungssensor.class.getSimpleName();
|
|
||||||
TextView Daten_Bsensor, Warnung_Bsensor, test;
|
|
||||||
private boolean toggle = true, ts_setzen = true, start_messen;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.activity_beschleunigung_kamera);
|
|
||||||
////////
|
|
||||||
Daten_Bsensor = (TextView) findViewById(R.id.DatenBsensor);
|
|
||||||
Warnung_Bsensor = (TextView) findViewById(R.id.WarnungBsensor);
|
|
||||||
test = (TextView) findViewById(R.id.test);
|
|
||||||
|
|
||||||
bsmanager = (SensorManager) getSystemService(SENSOR_SERVICE);
|
|
||||||
if (bsmanager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
|
|
||||||
sens = null;
|
|
||||||
Daten = "kein B Sensor voranden";
|
|
||||||
} else {
|
|
||||||
sens = bsmanager.getSensorList(sensorType).get(0);
|
|
||||||
}
|
|
||||||
Gesamt_be = new ArrayList<Float>();
|
|
||||||
for (int i = 0; i < listen_groesse ; i++){
|
|
||||||
Gesamt_be.add(Vorbesetzung);
|
|
||||||
}
|
|
||||||
kalibrieren = 0;
|
|
||||||
start_messen = false;
|
|
||||||
|
|
||||||
///////
|
|
||||||
// NUR FÜR TESTS
|
|
||||||
alarm = findViewById(R.id.Alarm_Kamera);
|
|
||||||
|
|
||||||
// PREVIEW //
|
|
||||||
// previewView = findViewById(R.id.previewView);
|
|
||||||
|
|
||||||
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
|
|
||||||
cameraProviderFuture.addListener(() -> {
|
|
||||||
try {
|
|
||||||
bindImageAnalysis(cameraProviderFuture.get());
|
|
||||||
} catch (ExecutionException | InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}, ContextCompat.getMainExecutor(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getTimestamp(){
|
|
||||||
Long tslong = System.currentTimeMillis();
|
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
|
|
||||||
Date date = new Date(tslong);
|
|
||||||
String result = sdf.format(date);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSensorChanged(SensorEvent event) {
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.append("x=").append(event.values[0])//.append(event.timestamp)
|
|
||||||
.append("\ny=").append(event.values[1])
|
|
||||||
.append("\nz=").append(event.values[2]);
|
|
||||||
Daten = sb.toString();
|
|
||||||
Daten_Bsensor.setText(Daten);
|
|
||||||
gesamt_runde = event.values[0] + event.values[1] + event.values[2];
|
|
||||||
Gesamt_be.remove(zaehler_runde);
|
|
||||||
Gesamt_be.add(zaehler_runde, gesamt_runde);
|
|
||||||
mittelwertsumme = 0.0;
|
|
||||||
|
|
||||||
//Mittelwert des Arrays berechnen
|
|
||||||
for (int i = 0; i < listen_groesse; i++){
|
|
||||||
if (Gesamt_be.get(i) < 0){
|
|
||||||
mittelwertsumme += (Gesamt_be.get(i) * (-1));
|
|
||||||
}else {
|
|
||||||
mittelwertsumme += Gesamt_be.get(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mittelwertsumme = mittelwertsumme/listen_groesse;
|
|
||||||
if (kalibrieren < listen_groesse){
|
|
||||||
Offset = mittelwertsumme;
|
|
||||||
kalibrieren++;
|
|
||||||
}else {
|
|
||||||
start_messen = true;
|
|
||||||
}
|
|
||||||
StringBuilder testsb = new StringBuilder();
|
|
||||||
testsb.append(mittelwertsumme);
|
|
||||||
String tests = testsb.toString();
|
|
||||||
test.setText(tests);
|
|
||||||
|
|
||||||
if((mittelwertsumme > (Schwellwert+Offset) ) & (ts_setzen == true) &(start_messen == true)){
|
|
||||||
Zeitstempel = getTimestamp();
|
|
||||||
StringBuilder ts = new StringBuilder();
|
|
||||||
ts.append(Zeitstempel)
|
|
||||||
.append(", Gruppe3")
|
|
||||||
.append(", An")
|
|
||||||
.append(", Bewegung, ")
|
|
||||||
.append(mittelwertsumme);
|
|
||||||
Warnung = ts.toString();
|
|
||||||
Warnung_Bsensor.setText(Warnung);
|
|
||||||
ts_setzen = false;
|
|
||||||
}else if((mittelwertsumme > (Schwellwert+Offset)) & (ts_setzen == false)){
|
|
||||||
} else if ((mittelwertsumme < (Schwellwert+Offset)) & (ts_setzen == false)) {
|
|
||||||
Warnung_Bsensor.setText("");
|
|
||||||
ts_setzen = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zaehler_runde < (listen_groesse -1)){
|
|
||||||
zaehler_runde++;
|
|
||||||
}else {
|
|
||||||
zaehler_runde = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//mittelwertsumme ist kein int in diesem programm
|
|
||||||
//shared prefenrences: bei Kippen speichern -> nochmal neu klalibrieren? -> eig ja, weil neuer Standort
|
|
||||||
//Vorbelegung nicht nochmal neu vornehmen -> aus onCreate Funktion raus -> hilfsvariablen auch in shared preferences speichern
|
|
||||||
@Override
|
|
||||||
public void onAccuracyChanged(Sensor sensor, int accuracy) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
if (sens != null) {
|
|
||||||
if (bsmanager.registerListener(this, sens, SensorManager.SENSOR_DELAY_GAME)) {
|
|
||||||
Daten = "Wir haben uns beim Sensor angemeldet";
|
|
||||||
} else {
|
|
||||||
Daten = "Das anmelden hat nicht geklappt";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
|
|
||||||
//mittelwertsumme_shared = p.getInt(KEY_Mittelwertsumme, 0);
|
|
||||||
//kalibrieren = p.getInt(KEY_kalibirieren, 0);
|
|
||||||
//Offset_shared = p.getInt(KEY_Offset, 0 );
|
|
||||||
//Array_shared = p.getString(KEY_Gesamt_be, "");
|
|
||||||
|
|
||||||
//mittelwertsumme = (double) mittelwertsumme_shared;
|
|
||||||
//mittelwertsumme /= 1000000.0;
|
|
||||||
|
|
||||||
//Offset = (double) Offset_shared;
|
|
||||||
//Offset /= 1000000.0;
|
|
||||||
|
|
||||||
//String zw[] = Array_shared.split(";", listen_groesse);
|
|
||||||
|
|
||||||
//if(shared_merk == 2){
|
|
||||||
//for (int i=0; i<listen_groesse; i++){
|
|
||||||
//float wert = Float.valueOf(zw[i]);
|
|
||||||
//Gesamt_be.add(i, wert);
|
|
||||||
//}}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPause () {
|
|
||||||
super.onPause();
|
|
||||||
if (sens != null) {
|
|
||||||
bsmanager.unregisterListener(this, sens);
|
|
||||||
}
|
|
||||||
//shared_merk = 2;
|
|
||||||
// Offset_shared = (int) (Offset * 1000000.0);
|
|
||||||
//mittelwertsumme_shared = (int) (mittelwertsumme * 1000000.0);
|
|
||||||
|
|
||||||
//StringBuilder ar = new StringBuilder();
|
|
||||||
//for (int z=0; z < listen_groesse; z++){
|
|
||||||
//ar.append(Gesamt_be.get(z)).append(";");
|
|
||||||
//}
|
|
||||||
//Array_shared = ar.toString();
|
|
||||||
|
|
||||||
//SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
|
|
||||||
//SharedPreferences.Editor editor = p.edit();
|
|
||||||
//editor.putInt(KEY_Mittelwertsumme, mittelwertsumme_shared);
|
|
||||||
//editor.putInt(KEY_kalibirieren, kalibrieren);
|
|
||||||
//editor.putInt(KEY_Offset, Offset_shared);
|
|
||||||
//editor.putString(KEY_Gesamt_be, Array_shared);
|
|
||||||
//editor.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// KAMERA //
|
|
||||||
private void bindImageAnalysis(ProcessCameraProvider cameraProvider) {
|
|
||||||
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(this),
|
|
||||||
imageProxy -> {
|
|
||||||
|
|
||||||
int imageFormat = imageProxy.getFormat();
|
|
||||||
|
|
||||||
if (imageFormat == ImageFormat.YUV_420_888) {
|
|
||||||
|
|
||||||
Image currentImage = imageProxy.getImage();
|
|
||||||
|
|
||||||
if (previousHeight != 0) {
|
|
||||||
assert currentImage != null;
|
|
||||||
isMotionDetected = 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();
|
|
||||||
|
|
||||||
if (isMotionDetected) {
|
|
||||||
alarm.setText("ALARM");
|
|
||||||
camera_alarm = true;
|
|
||||||
} else {
|
|
||||||
camera_alarm = false;
|
|
||||||
alarm.setText("OK");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
imageProxy.close();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Preview preview = new Preview.Builder().build();
|
|
||||||
|
|
||||||
CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
|
|
||||||
|
|
||||||
// PREVIEW //
|
|
||||||
// preview.setSurfaceProvider(previewView.getSurfaceProvider());
|
|
||||||
|
|
||||||
cameraProvider.bindToLifecycle(this, cameraSelector, imageAnalysis);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bildverarbeitung zur Bewegungserkennung
|
|
||||||
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) {
|
|
||||||
// Testzwecke
|
|
||||||
//String text = String.valueOf(pixelDifference);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,40 +1,41 @@
|
|||||||
package com.example.greenwatch;
|
package com.example.greenwatch;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import androidx.core.app.ActivityCompat;
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity {
|
||||||
private static final int RECHTEANFORDERUNG_KAMERA = 10;
|
|
||||||
|
private Button Beschleunigungssensor;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
Button kameraStarten = findViewById(R.id.button_camera);
|
|
||||||
kameraStarten.setOnClickListener(v -> {
|
final Button Beschleunigungssensor = (Button) findViewById(R.id.beschleunigungssensor);
|
||||||
if (istZugriffAufKameraErlaubt()) {
|
Beschleunigungssensor.setOnClickListener(new View.OnClickListener() {
|
||||||
starteKameraAktivitaet();
|
@Override
|
||||||
} else {
|
public void onClick(View v) {
|
||||||
zugriffAufKameraAnfordern();
|
Intent intent = new Intent(MainActivity.this, Beschleunigungssensor.class);
|
||||||
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean istZugriffAufKameraErlaubt() {
|
@Override
|
||||||
return ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
|
protected void onResume() {
|
||||||
|
super.onResume();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void zugriffAufKameraAnfordern() {
|
|
||||||
ActivityCompat.requestPermissions(this,new String[]{android.Manifest.permission.CAMERA}, RECHTEANFORDERUNG_KAMERA);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void starteKameraAktivitaet() {
|
@Override
|
||||||
startActivity(new Intent(this, KameraAktivitaet.class));
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-6
@@ -28,11 +28,5 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="" />
|
android:text="" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/Alarm_Kamera"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="OK" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout 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"
|
|
||||||
tools:context=".KameraAktivitaet">
|
|
||||||
|
|
||||||
<FrameLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:id="@+id/erklaerung">
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button2"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="Button" />
|
|
||||||
|
|
||||||
<androidx.camera.view.PreviewView
|
|
||||||
android:id="@+id/previewView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
</androidx.camera.view.PreviewView>
|
|
||||||
</FrameLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/alarm"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text=""
|
|
||||||
android:textSize="100sp"
|
|
||||||
android:textColor="#9999ff"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/threshold_test"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text=""
|
|
||||||
android:textSize="100sp"
|
|
||||||
android:textColor="#9999ff"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@@ -6,39 +6,42 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".MainActivity">
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
<Button
|
<LinearLayout
|
||||||
android:id="@+id/button_camera"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:orientation="vertical">
|
||||||
android:text="Kamera starten"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintHorizontal_bias="0.129"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:layout_constraintVertical_bias="0.931" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView"
|
android:id="@+id/textView"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text=" "
|
android:text="TextView"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
tools:layout_editor_absoluteX="171dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
tools:layout_editor_absoluteY="186dp" />
|
||||||
app:layout_constraintHorizontal_bias="0.498"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:layout_constraintVertical_bias="0.247" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView2"
|
android:id="@+id/textView2"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="TextView"
|
android:text="TextView" />
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/textView" />
|
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/beschleunigungssensor"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Beschleunigungssensor" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/aufnahme"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Aufnahme Start" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/wiedergabe"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Wiedergabe" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.0.0' apply false
|
id 'com.android.application' version '7.1.3' apply false
|
||||||
id 'com.android.library' version '8.0.0' apply false
|
id 'com.android.library' version '7.1.3' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
task clean(type: Delete) {
|
||||||
|
|||||||
@@ -19,5 +19,3 @@ android.useAndroidX=true
|
|||||||
# resources declared in the library itself and none from the library's dependencies,
|
# resources declared in the library itself and none from the library's dependencies,
|
||||||
# thereby reducing the size of the R class for that library
|
# thereby reducing the size of the R class for that library
|
||||||
android.nonTransitiveRClass=true
|
android.nonTransitiveRClass=true
|
||||||
android.defaults.buildfeatures.buildconfig=true
|
|
||||||
android.nonFinalResIds=false
|
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#Thu May 11 14:50:16 CEST 2023
|
#Thu May 11 14:50:16 CEST 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Reference in New Issue
Block a user