Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

tuning of sensor sensitivity UI and preference setting

n8fr8581ae379e0d4
diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java
index f5feb3e..c6415e7 100644
--- a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java
+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java
@@ -13,6 +13,7 @@ import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
+import android.util.FloatMath;
import android.util.Log;
import org.havenapp.main.PreferenceManager;
@@ -57,13 +58,16 @@ public class AccelerometerMonitor implements SensorEventListener {
*/
private int shakeThreshold = -1;
+ private float mAccelCurrent = SensorManager.GRAVITY_EARTH;
+ private float mAccelLast = SensorManager.GRAVITY_EARTH;
+ private float mAccel = 0.00f;
/**
* Text showing accelerometer values
*/
private int maxAlertPeriod = 30;
private int remainingAlertPeriod = 0;
private boolean alert = false;
- private final static int CHECK_INTERVAL = 1000;
+ private final static int CHECK_INTERVAL = 100;
public AccelerometerMonitor(Context context) {
prefs = new PreferenceManager(context);
@@ -116,12 +120,19 @@ public class AccelerometerMonitor implements SensorEventListener {
if (last_accel_values != null) {
+ /**
float speed = Math.abs(
accel_values[0] + accel_values[1] + accel_values[2] -
last_accel_values[0] + last_accel_values[1] + last_accel_values[2])
/ diffTime * 1000;
-
- if (speed > shakeThreshold) {
+ **/
+ mAccelLast = mAccelCurrent;
+ mAccelCurrent =(float)Math.sqrt(accel_values[0]* accel_values[0] + accel_values[1]*accel_values[1]
+ + accel_values[2]*accel_values[2]);
+ float delta = mAccelCurrent - mAccelLast;
+ mAccel = mAccel * 0.9f + delta;
+
+ if (mAccel > shakeThreshold) {
/*
* Send Alert
*/
@@ -131,7 +142,7 @@ public class AccelerometerMonitor implements SensorEventListener {
Message message = new Message();
message.what = EventTrigger.ACCELEROMETER;
- message.getData().putString("path",speed+"");
+ message.getData().putString("path",mAccel+"");
try {
if (serviceMessenger != null) {
diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
index b53a196..ae6efb4 100644
--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
@@ -10,6 +10,8 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Bundle;
+import android.os.Message;
+import android.os.RemoteException;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
@@ -21,6 +23,7 @@ import com.maxproj.simplewaveform.SimpleWaveform;
import org.havenapp.main.PreferenceManager;
import org.havenapp.main.R;
+import org.havenapp.main.model.EventTrigger;
import java.util.LinkedList;
@@ -55,10 +58,10 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
private float last_accel_values[];
- /**
- * Shake threshold
- */
- private int shakeThreshold = -1;
+ private float mAccelCurrent = SensorManager.GRAVITY_EARTH;
+ private float mAccelLast = SensorManager.GRAVITY_EARTH;
+ private float mAccel = 0.00f;
+
/**
* Text showing accelerometer values
@@ -66,13 +69,14 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
private int maxAlertPeriod = 30;
private int remainingAlertPeriod = 0;
private boolean alert = false;
- private final static int CHECK_INTERVAL = 1000;
+ private final static int CHECK_INTERVAL = 100;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_accel_configure);
+ mPrefManager = new PreferenceManager(this.getApplicationContext());
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -87,16 +91,17 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
mNumberTrigger.setMinValue(0);
mNumberTrigger.setMaxValue(MAX_SLIDER_VALUE);
- mNumberTrigger.setListener(new OnValueChangeListener() {
- @Override
- public void onValueChanged(int oldValue, int newValue) {
- mWaveform.setThreshold(newValue);
- mPrefManager.setAccelerometerSensitivity(newValue+"");
- }
+ if (!mPrefManager.getAccelerometerSensitivity().equals(PreferenceManager.HIGH))
+ mNumberTrigger.setValue(Integer.parseInt(mPrefManager.getAccelerometerSensitivity()));
+ else
+ mNumberTrigger.setValue(50);
+
+ mNumberTrigger.setListener((oldValue, newValue) -> {
+ mWaveform.setThreshold(newValue);
+ mPrefManager.setAccelerometerSensitivity(newValue+"");
});
- mPrefManager = new PreferenceManager(this.getApplicationContext());
@@ -216,42 +221,31 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
if (last_accel_values != null) {
- int speed = (int)(Math.abs(
- accel_values[0] + accel_values[1] + accel_values[2] -
- last_accel_values[0] + last_accel_values[1] + last_accel_values[2])
- / diffTime * 1000);
+ mAccelLast = mAccelCurrent;
+ mAccelCurrent =(float)Math.sqrt(accel_values[0]* accel_values[0] + accel_values[1]*accel_values[1]
+ + accel_values[2]*accel_values[2]);
+ float delta = mAccelCurrent - mAccelLast;
+ mAccel = (mAccel * 0.9f + delta);
- if (speed > shakeThreshold) {
- /*
- * Send Alert
- */
-
- alert = true;
- remainingAlertPeriod = maxAlertPeriod;
-
- double averageDB = 0.0;
- if (speed != 0) {
- averageDB = 20 * Math.log10(Math.abs(speed));
- }
-
- if (averageDB > maxAmp) {
- maxAmp = averageDB + 5d; //add 5db buffer
- mNumberTrigger.setValue((int) maxAmp);
- mNumberTrigger.invalidate();
- }
+ double averageDB = 0.0;
+ if (mAccel != 0) {
+ averageDB = 20 * Math.log10(Math.abs(mAccel));
+ }
- mWaveAmpList.addFirst(speed);
+ if (averageDB > maxAmp) {
+ maxAmp = averageDB + 5d; //add 5db buffer
+ }
- if (mWaveAmpList.size() > mWaveform.width / mWaveform.barGap + 2) {
- mWaveAmpList.removeLast();
- }
+ mWaveAmpList.addFirst((int)mAccel);
- mWaveform.refresh();
- mTextLevel.setText(getString(R.string.current_accel_base) + ' ' + speed);
+ if (mWaveAmpList.size() > mWaveform.width / mWaveform.barGap + 2) {
+ mWaveAmpList.removeLast();
+ }
+ mWaveform.refresh();
+ mTextLevel.setText(getString(R.string.current_accel_base) + " " + (int)mAccel);
- }
}
last_accel_values = accel_values.clone();
}
diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
index 84284f3..f31d3c7 100644
--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@ -30,15 +30,20 @@ import android.widget.SeekBar;
import org.havenapp.main.PreferenceManager;
import org.havenapp.main.R;
+import me.angrybyte.numberpicker.listener.OnValueChangeListener;
+import me.angrybyte.numberpicker.view.ActualNumberPicker;
+
public class CameraConfigureActivity extends AppCompatActivity {
- private PreferenceManager preferences = null;
+ private PreferenceManager mPrefManager = null;
private boolean mIsMonitoring = false;
private boolean mIsInitializedLayout = false;
private CameraFragment mFragment;
+ private ActualNumberPicker mNumberTrigger;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -51,7 +56,7 @@ public class CameraConfigureActivity extends AppCompatActivity {
}
private void initLayout() {
- preferences = new PreferenceManager(getApplicationContext());
+ mPrefManager = new PreferenceManager(getApplicationContext());
setContentView(R.layout.activity_camera_configure);
Toolbar toolbar = findViewById(R.id.toolbar);
@@ -69,36 +74,26 @@ public class CameraConfigureActivity extends AppCompatActivity {
}
});
- SeekBar sBar = ((SeekBar) findViewById(R.id.seekCameraSensitivity));
- sBar.setProgress(preferences.getCameraSensitivity());
- sBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
- @Override
- public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
- mFragment.setMotionSensitivity(i);
- preferences.setCameraSensitivity(i);
- }
-
- @Override
- public void onStartTrackingTouch(SeekBar seekBar) {
-
- }
+ mNumberTrigger = findViewById(R.id.number_trigger_level);
+ mNumberTrigger.setValue(mPrefManager.getCameraSensitivity());
+ mNumberTrigger.setListener(new OnValueChangeListener() {
@Override
- public void onStopTrackingTouch(SeekBar seekBar) {
-
+ public void onValueChanged(int oldValue, int newValue) {
+ mFragment.setMotionSensitivity(newValue);
+ mPrefManager.setCameraSensitivity(newValue);
}
});
-
mIsInitializedLayout = true;
}
private void switchCamera() {
- String camera = preferences.getCamera();
+ String camera = mPrefManager.getCamera();
if (camera.equals(PreferenceManager.FRONT))
- preferences.setCamera(PreferenceManager.BACK);
+ mPrefManager.setCamera(PreferenceManager.BACK);
else if (camera.equals(PreferenceManager.BACK))
- preferences.setCamera(PreferenceManager.FRONT);
+ mPrefManager.setCamera(PreferenceManager.FRONT);
((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
index c808e6a..0422cd9 100644
--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
@@ -42,6 +42,7 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_microphone_configure);
+ mPrefManager = new PreferenceManager(this.getApplicationContext());
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -52,19 +53,20 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
mTextLevel = findViewById(R.id.text_display_level);
mNumberTrigger = findViewById(R.id.number_trigger_level);
mWaveform = findViewById(R.id.simplewaveform);
- mWaveform.setMaxVal(MAX_SLIDER_VALUE);
+ mWaveform.setMaxVal(100);
mNumberTrigger.setMinValue(0);
mNumberTrigger.setMaxValue(MAX_SLIDER_VALUE);
- mNumberTrigger.setListener(new OnValueChangeListener() {
- @Override
- public void onValueChanged(int oldValue, int newValue) {
- mWaveform.setThreshold(newValue);
- mPrefManager.setMicrophoneSensitivity(newValue+"");
- }
+ if (!mPrefManager.getMicrophoneSensitivity().equals(PreferenceManager.MEDIUM))
+ mNumberTrigger.setValue(Integer.parseInt(mPrefManager.getMicrophoneSensitivity()));
+ else
+ mNumberTrigger.setValue(60);
+
+ mNumberTrigger.setListener((oldValue, newValue) -> {
+ mWaveform.setThreshold(newValue);
+ mPrefManager.setMicrophoneSensitivity(newValue+"");
});
- mPrefManager = new PreferenceManager(this.getApplicationContext());
@@ -95,6 +97,8 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
//if show bars?
mWaveform.showBar = true;
+ mWaveform.setMaxVal(100);
+
//define how to show peaks outline
mWaveform.modePeak = SimpleWaveform.MODE_PEAK_ORIGIN;
//if show peaks outline?
@@ -225,7 +229,7 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
mNumberTrigger.invalidate();
}
- int perc = (int)((averageDB/160d)*100d);
+ int perc = (int)((averageDB/120d)*100d)-10;
mWaveAmpList.addFirst(perc);
if (mWaveAmpList.size() > mWaveform.width / mWaveform.barGap + 2) {
diff --git a/src/main/res/layout/activity_accel_configure.xml b/src/main/res/layout/activity_accel_configure.xml
index 30204a2..3c9f918 100644
--- a/src/main/res/layout/activity_accel_configure.xml
+++ b/src/main/res/layout/activity_accel_configure.xml
@@ -64,7 +64,9 @@
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="3dp"
+ android:layout_margin="6dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
android:background="#FFFFFF"
app:bar_color="@android:color/darker_gray"
app:bar_width="1dp"
diff --git a/src/main/res/layout/activity_camera_configure.xml b/src/main/res/layout/activity_camera_configure.xml
index 04620be..9d95407 100644
--- a/src/main/res/layout/activity_camera_configure.xml
+++ b/src/main/res/layout/activity_camera_configure.xml
@@ -57,25 +57,37 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="10dp">
+ android:padding="0dp">
<ImageView
android:id="@+id/btnCameraSwitch"
android:layout_width="36dp"
android:layout_height="36dp"
- android:layout_margin="20dp"
+ android:layout_margin="0dp"
android:foreground="?attr/selectableItemBackground"
app:srcCompat="@drawable/ic_camera_front_white" />
- <SeekBar
- android:layout_width="wrap_content"
+ <me.angrybyte.numberpicker.view.ActualNumberPicker
+ android:id="@+id/number_trigger_level"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:layout_weight="1"
- android:layout_height="36dp"
- android:layout_marginBottom="24dp"
- android:id="@+id/seekCameraSensitivity"
- android:max="100000"
- android:min="2000"
- />
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="6dp"
+ android:background="#FFFFFF"
+ app:bar_color="@android:color/darker_gray"
+ app:bar_width="1dp"
+ app:draw_over_controls="true"
+ app:max_value="60000"
+ app:value="10000"
+ app:min_value="0"
+ app:show_bars="true"
+ app:show_controls="false"
+ app:show_fast_controls="false"
+ app:show_text="true"
+ app:text_color="@android:color/darker_gray"
+ app:text_size="16sp" />
+
</LinearLayout>
</LinearLayout>
diff --git a/src/main/res/layout/activity_microphone_configure.xml b/src/main/res/layout/activity_microphone_configure.xml
index ff4929f..c67f889 100644
--- a/src/main/res/layout/activity_microphone_configure.xml
+++ b/src/main/res/layout/activity_microphone_configure.xml
@@ -45,7 +45,7 @@
android:id="@+id/simplewaveform"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_margin="10dp"
+ android:layout_margin="0dp"
android:layout_weight="5" />
<TextView
@@ -61,7 +61,9 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="3dp"
+ android:layout_margin="6dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
android:layout_weight="1"
android:background="#FFFFFFFF"
app:bar_color="@android:color/darker_gray"