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

a few tweaks to camera behavior

n8fr86966bed5473e
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index 03bc67f..39a359b 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -253,7 +253,7 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
}
else if (requestCode == REQUEST_CAMERA)
{
- mFragmentCamera.resetCamera();
+ mFragmentCamera.initCamera();
}
}
diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
index 8b47bc4..c9d24b4 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
@@ -69,27 +69,27 @@ public class CameraViewHolder {
/**
* True IFF there's an async task processing images
*/
- private boolean doingProcessing, doingVideoProcessing = false;
+ private boolean doingVideoProcessing = false;
/**
* Handler used to update back the UI after motion detection
*/
private final Handler updateHandler = new Handler();
-
- /**
- * Last frame captured
- */
- private int imageCount = 0;
/**
* Sensitivity of motion detection
*/
private int motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;
-
+
+ /**
+ * holder of the CameraView and state of running
+ */
+ private CameraView cameraView = null;
+ private boolean isCameraStarted = false;
+
/**
* Messenger used to signal motion to the alert service
*/
- private CameraView cameraView = null;
private Messenger serviceMessenger = null;
//private Camera camera;
private Activity context;
@@ -135,7 +135,6 @@ public class CameraViewHolder {
listener.onProcess(sourceImage,detectedImage,rawBitmap,motionDetected);
if (motionDetected) {
- Log.i("MotionListener", "Motion detected");
if (serviceMessenger != null) {
Message message = new Message();
@@ -199,20 +198,10 @@ public class CameraViewHolder {
* (preferred is 640x480)
* in order to minimize CPU usage
*/
- public void startCamera() {
+ public synchronized void startCamera() {
- switch (prefs.getCamera()) {
- case PreferenceManager.FRONT:
- cameraView.setFacing(CameraView.FACING_FRONT);
- break;
- case PreferenceManager.BACK:
- cameraView.setFacing(CameraView.FACING_BACK);
- break;
- default:
- // camera = null;
- break;
- }
+ updateCamera();
cameraView.start();
@@ -229,13 +218,29 @@ public class CameraViewHolder {
Log.i("CameraViewHolder", "Processing new image");
mDecodeThreadPool.execute(() -> processNewFrame(data, width, height, rotationDegrees));
- }
- else
- {
- mEncodeVideoThreadPool.execute(() -> recordNewFrame(data, width,height,rotationDegrees));
+ } else {
+ mEncodeVideoThreadPool.execute(() -> recordNewFrame(data, width, height, rotationDegrees));
}
});
+
+ }
+
+ public void updateCamera ()
+ {
+ switch (prefs.getCamera()) {
+ case PreferenceManager.FRONT:
+ if (cameraView.getFacing() != CameraView.FACING_FRONT)
+ cameraView.setFacing(CameraView.FACING_FRONT);
+ break;
+ case PreferenceManager.BACK:
+ if (cameraView.getFacing() != CameraView.FACING_BACK)
+ cameraView.setFacing(CameraView.FACING_BACK);
+ break;
+ default:
+ // camera = null;
+ break;
+ }
}
// A queue of Runnables
diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
index dd60ff4..15cacfb 100644
--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@ -96,7 +96,7 @@ public class CameraConfigureActivity extends AppCompatActivity {
else if (camera.equals(PreferenceManager.BACK))
mPrefManager.setCamera(PreferenceManager.FRONT);
- ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();
+ ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).updateCamera();
setResult(RESULT_OK);
}
diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.java
index ef70ac4..7d98350 100644
--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java
+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java
@@ -63,14 +63,20 @@ public final class CameraFragment extends Fragment {
@Override
public void onResume() {
super.onResume();
- if (cameraViewHolder == null)
+ // if (cameraViewHolder == null)
initCamera();
- else
- resetCamera();
+
cameraViewHolder.setMotionSensitivity(prefs.getCameraSensitivity());
}
+ public void updateCamera ()
+ {
+ if (cameraViewHolder != null) {
+ cameraViewHolder.updateCamera();
+ }
+ }
+
public void stopCamera ()
{
if (cameraViewHolder != null) {
@@ -78,13 +84,14 @@ public final class CameraFragment extends Fragment {
}
}
+ /**
public void resetCamera ()
{
stopCamera();
initCamera();
- }
+ }**/
- private void initCamera ()
+ public void initCamera ()
{
@@ -115,9 +122,11 @@ public final class CameraFragment extends Fragment {
});
}
- cameraViewHolder.startCamera();
}
+
+ cameraViewHolder.startCamera();
+
}
@Override