dotzlaffed82329/Detection
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: dotzlaffed82329:master
Branches Tags
dotzlaffed82329:master
dotzlaffed82329:EpiTest
...
pull from: dotzlaffed82329:EpiTest
Branches Tags
dotzlaffed82329:master
dotzlaffed82329:EpiTest

2 Commits
master ... EpiTest

Author SHA1 Message Date
Raz492
65cabe66e9 Pre-AlphaV9 - 5 GPS Test Buttons und Displayaktualisierung 2021-06-27 11:16:37 +02:00
Raz492
f875ab6415 Pre-AlphaV9 - Epizentrum mit 5 Test GPS Buttons 2021-06-26 17:38:45 +02:00
4 changed files with 390 additions and 70 deletions
Show Stats Expand all files Collapse all files

398
app/src/main/java/de/edotzlaff/detection/MainActivity.java
View File

@ -19,6 +19,7 @@ import android.location.Location;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.provider.ContactsContract;
import android.provider.Settings;
import android.util.Log;
import android.view.View;
@ -69,7 +70,8 @@ public class MainActivity extends AppCompatActivity {
//##########################################################################################################################################################################
//################################################################## vvv SensorParameter vvv ##############################################################################
private SensorManager mSensorManager;
private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen
private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen //Für passende Empfindlichkeit auf 0.025f setzen ohne Smartphonehülle
//private static final float mUpperThreshold = 1.0f; // für Emulator auf 1.5 setzen //Für passende Empfindlichkeit auf 0.025f setzen ohne Smartphonehülle
private static final float mLowerThreshold = 0.5f; // für Emulator auf 0.5 setzen
private static final long mShakeDetectionLockTimeMicroSeconds = 3500;
private float mAccel;
@ -378,34 +380,83 @@ public class MainActivity extends AppCompatActivity {
public void analyzeDBchanges(DataSnapshot data)
{
for (int i=1; i<=data.getChildrenCount(); i++)
{
if(analyzeForFullIDG(data,i) || analyzeForEmptyIDG(data,i))
{
TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
String dbSlotStringContent = getSlotString(data,i);
String displayContent;
switch (i){
case 1:
displayContent = txtDevice1.getText().toString();
if(!displayContent.equals(dbSlotStringContent))
{
if(analyzeForEmptyIDG(data,i))
{
txtDevice1.setText("");
}else
{
txtDevice1.setText(dbSlotStringContent);
}
}
break;
case 2:
displayContent = txtDevice2.getText().toString();
if(!displayContent.equals(dbSlotStringContent))
{
if(analyzeForEmptyIDG(data,i))
{
txtDevice2.setText("");
}else
{
txtDevice2.setText(dbSlotStringContent);
}
}
break;
case 3:
displayContent = txtDevice3.getText().toString();
if(!displayContent.equals(dbSlotStringContent))
{
if(analyzeForEmptyIDG(data,i))
{
txtDevice3.setText("");
}else
{
txtDevice3.setText(dbSlotStringContent);
}
}
break;
case 4:
displayContent = txtDevice4.getText().toString();
if(!displayContent.equals(dbSlotStringContent))
{
if(analyzeForEmptyIDG(data,i))
{
txtDevice4.setText("");
}else
{
txtDevice4.setText(dbSlotStringContent);
}
}
break;
default:
break;
}
}
}
int takenIDG = 0;
for (int i=1; i<=data.getChildrenCount(); i++)
{
if(analyzeForFullIDG(data,i))
{
//Ein voller IDG slot
takenIDG++;
}
}
if(takenIDG>=1 && takenIDG <=5)
{
//Kommt bei einer neuen vollen IDG ins Display
for(writtenDevices = writtenDevices; writtenDevices <= takenIDG; writtenDevices++)
{
setDisplayText(data,writtenDevices);
enableDisplayReset = true; //Für DB zurücksetzen
}
}else
{
if(enableDisplayReset)
{
resetDisplayText();
enableDisplayReset = false;
}
}
//Bei genau 3 Einträgen:
if(takenIDG >= 3 && allowCalculation)
{
Toast.makeText(MainActivity.this, "3 Geräte regisrtiert - Berechnung möglich!", Toast.LENGTH_SHORT).show();
@ -414,7 +465,17 @@ public class MainActivity extends AppCompatActivity {
btnEarthquake.setEnabled(true);
}
}
public String getSlotString(DataSnapshot data,int i)
{
String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
String databaseSlotString = "Device ID " + i + ": "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n";
return databaseSlotString;
}
public boolean analyzeForFullIDG(DataSnapshot data, int i)
{
String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
@ -434,50 +495,6 @@ public class MainActivity extends AppCompatActivity {
}
}
public void setDisplayText(DataSnapshot data, int i)
{
String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
switch (i){
case 1:
txtDevice1.setText("Device ID 1: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 2:
txtDevice2.setText("Device ID 2: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 3:
txtDevice3.setText("Device ID 3: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 4:
txtDevice4.setText("Device ID 4: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
default:
break;
}
}
public void resetDisplayText()
{
Button btnEarthquake = (Button) findViewById(R.id.btnEarthquakeLocation);
btnEarthquake.setEnabled(false);
TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
txtDevice1.setText("");
txtDevice2.setText("");
txtDevice3.setText("");
txtDevice4.setText("");
}
public String getandroidid ()
{
return Settings.Secure.getString(this.getContentResolver(), Settings.Secure.ANDROID_ID);
@ -549,6 +566,203 @@ public class MainActivity extends AppCompatActivity {
btnReadyToDetect.setEnabled(false);
}
});
//TODO Benötigt für Testzwecke (Epizentrum) für Jan
Button btnGerichtet = (Button) findViewById(R.id.btnGerichtet1);
btnGerichtet.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View v) {
getDataBaseValuesWithListener();
mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
}
mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.448290362613854);
mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.097272994499544);
mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
}
mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.44466671859845);
mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.11073498515257);
mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
}
mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.44263735292373);
mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.124199910730779);
mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
}
});
Button btnDreiGoogle = (Button) findViewById(R.id.btnDreieckGoogle);
btnDreiGoogle.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View v) {
mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
}
mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.449588027612);
mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069961699379434);
mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
}
mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.45813339772139);
mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.105891230575331);
mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
}
mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42208575064953);
mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.096983614292839);
mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
}
});
Button btnDreiEigen = (Button) findViewById(R.id.btnDreieckEigen);
btnDreiEigen.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View v) {
mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
}
mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.44796056728842);
mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069682589518582);
mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
}
mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.445169649958295);
mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.110874403601176);
mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
}
mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42197662865119);
mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.07097763125116);
mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
}
});
Button btnLinieGoogle= (Button) findViewById(R.id.btnLinieGoogle);
btnLinieGoogle.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View v) {
mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
}
mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.439093816961254);
mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.087992224141008);
mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
}
mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.43058961031174);
mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.092487606432716);
mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
}
mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.42208989434345);
mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.096991470517569);
mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
}
});
Button btnLinieEigen = (Button) findViewById(R.id.btnLinieEigen);
btnLinieEigen.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public void onClick(View v) {
mDatenbank = FirebaseDatabase.getInstance().getReference().child("overviewdetection");
mDatenbank.child("IDG1").child("a_androidid").setValue("ID1");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG1").child("b_localdatetime").setValue("2021-06-25T19:00:00.000");
}
mDatenbank.child("IDG1").child("d_breitengrad").setValue(49.44709382725857);
mDatenbank.child("IDG1").child("e_laengengrad").setValue(11.069646529622538);
mDatenbank.child("IDG1").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG1").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG1").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG2").child("a_androidid").setValue("ID2");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG2").child("b_localdatetime").setValue("2021-06-25T19:01:40.000");
}
mDatenbank.child("IDG2").child("d_breitengrad").setValue(49.446938212388574);
mDatenbank.child("IDG2").child("e_laengengrad").setValue(11.055889659014166);
mDatenbank.child("IDG2").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG2").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG2").child("w_wellengeschwindigkeit").setValue(10);
mDatenbank.child("IDG3").child("a_androidid").setValue("ID3");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
mDatenbank.child("IDG3").child("b_localdatetime").setValue("2021-06-25T19:03:20.000");
}
mDatenbank.child("IDG3").child("d_breitengrad").setValue(49.447447927483005);
mDatenbank.child("IDG3").child("e_laengengrad").setValue(11.042050722727316);
mDatenbank.child("IDG3").child("h_timestamp").setValue(Calendar.getInstance().getTimeInMillis());
mDatenbank.child("IDG3").child("i_amplitude").setValue(1000);
mDatenbank.child("IDG3").child("w_wellengeschwindigkeit").setValue(10);
}
});
}
@ -556,4 +770,54 @@ public class MainActivity extends AppCompatActivity {
//###########################################################################################################################################################
}
}
/*
public void setDisplayText(DataSnapshot data, int i)
{
String androidid = data.child("IDG" + i).child("a_androidid").getValue().toString();
String localedatetime = data.child("IDG" + i).child("b_localdatetime").getValue().toString();
String breitengrad = data.child("IDG" + i).child("d_breitengrad").getValue().toString();
String laengengrad = data.child("IDG" + i).child("e_laengengrad").getValue().toString();
String timestamp = data.child("IDG" + i).child("h_timestamp").getValue().toString();
String ampltiude = data.child("IDG" + i).child("i_amplitude").getValue().toString();
TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
switch (i){
case 1:
txtDevice1.setText("Device ID 1: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 2:
txtDevice2.setText("Device ID 2: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 3:
txtDevice3.setText("Device ID 3: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
case 4:
txtDevice4.setText("Device ID 4: "+ androidid + "\n" + "Latitude: "+breitengrad+"\n"+ "Longitude: "+ laengengrad +"\n" + "Time Stamp: "+ timestamp + "\n" + "LocalDateTime: " + localedatetime +"\n"+ "Amplitude: "+ ampltiude+"\n");
break;
default:
break;
}
}
*/
/*
public void resetDisplayText()
{
Button btnEarthquake = (Button) findViewById(R.id.btnEarthquakeLocation);
btnEarthquake.setEnabled(false);
TextView txtDevice1 = (TextView) findViewById(R.id.txtdevice1);
TextView txtDevice2 = (TextView) findViewById(R.id.txtdevice2);
TextView txtDevice3 = (TextView) findViewById(R.id.txtdevice3);
TextView txtDevice4 = (TextView) findViewById(R.id.txtdevice4);
txtDevice1.setText("");
txtDevice2.setText("");
txtDevice3.setText("");
txtDevice4.setText("");
allowCalculation=true;
}
*/

6
app/src/main/java/de/edotzlaff/detection/detektion/berechnung/EpizentrumRechnung.java
View File

@ -26,10 +26,10 @@ import java.util.Set;
public class EpizentrumRechnung {
//ToDo Schrittweite und Abstand auf Szenario anpassen
private static final double SCHRITTWEITE = 20;
private static final double MAX_ABSTAND = 5;
private static final double SCHRITTWEITE = 2;
private static final double MAX_ABSTAND = 0.5;
private static final int DOUBLESTELLEN = 15;
private static final int SCHLEIFENDURCHLAUFTE = 5000;
private static final int SCHLEIFENDURCHLAUFTE = 8000;
private static final String TAG = "EPIZENTRUMRECHNUNG";

51
app/src/main/res/layout/activity_main.xml
View File

@ -86,6 +86,57 @@
android:textColor="@color/black"
android:text="@string/db_zur_cksetzen" />
<Button
android:id="@+id/btnGerichtet1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/btnResetDB"
android:backgroundTint="@color/design_default_color_secondary_variant"
android:layout_alignParentStart="false"
android:layout_alignParentEnd="false"
android:layout_alignParentBottom="false"
android:layout_centerInParent="true"
android:layout_marginBottom="1dp"
android:text="@string/gerichtett"
android:textColor="@color/white" />
<Button
android:id="@+id/btnLinieGoogle"
android:backgroundTint="@color/design_default_color_secondary_variant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/btnGerichtet1"
android:layout_toStartOf="@id/btnGerichtet1"
android:text="@string/linie_g" />
<Button
android:id="@+id/btnDreieckGoogle"
android:backgroundTint="@color/design_default_color_secondary_variant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/btnGerichtet1"
android:layout_toEndOf="@id/btnGerichtet1"
android:text="@string/gerichtet_g"
tools:text="Dreieck_G" />
<Button
android:id="@+id/btnDreieckEigen"
android:backgroundTint="@color/design_default_color_secondary_variant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/btnGerichtet1"
android:layout_toEndOf="@id/btnGerichtet1"
android:text="@string/dreieck_e"
tools:text="Dreieck_E" />
<Button
android:id="@+id/btnLinieEigen"
android:backgroundTint="@color/design_default_color_secondary_variant"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/btnGerichtet1"
android:layout_toStartOf="@id/btnGerichtet1"
android:text="@string/linie_e" />

5
app/src/main/res/values/strings.xml
View File

@ -9,4 +9,9 @@
<string name="device_2">Device 2</string>
<string name="device_1">Device 1</string>
<string name="db_zur_cksetzen">DB zurücksetzen</string>
<string name="gerichtet_g">Gerichtet_G</string>
<string name="dreieck_e">Dreieck_E</string>
<string name="linie_e">Linie_E</string>
<string name="linie_g">Linie_G</string>
<string name="gerichtett">Gerichtett</string>
</resources>