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

fixes for video recording and playback

n8fr84cba15e51d41
diff --git a/build.gradle b/build.gradle
index 18ac7f1..8e399f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,5 +124,5 @@ dependencies {
implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
transitive = true
}
-
+ implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'
}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 0c0340e..58f6ee3 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,40 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="org.havenapp.main">
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.CAMERA"/>
+ <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.SEND_SMS"/>
+ <uses-permission android:name="android.permission.SEND_SMS" />
- <uses-feature android:name="android.hardware.camera" android:required="false" />
- <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
- <uses-feature android:name="android.hardware.telephony" android:required="false" />
- <uses-feature android:name="android.hardware.microphone" android:required="false" />
- <!-- Some Chromebooks don't support touch. Although not essential,
- it's a good idea to explicitly include this declaration. -->
- <uses-feature android:name="android.hardware.touchscreen"
+ <uses-feature
+ android:name="android.hardware.camera"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.camera.autofocus"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.telephony"
+ android:required="false" />
+ <uses-feature
+ android:name="android.hardware.microphone"
+ android:required="false" />
+ <!--
+ Some Chromebooks don't support touch. Although not essential,
+ it's a good idea to explicitly include this declaration.
+ -->
+ <uses-feature
+ android:name="android.hardware.touchscreen"
android:required="false" />
- <uses-permission android:name="android.permission.WAKE_LOCK"/>
- <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
- <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-
- <application xmlns:tools="http://schemas.android.com/tools"
- android:name="org.havenapp.main.HavenApp"
+ <application xmlns:tools="http://schemas.android.com/tools"
+ android:name=".HavenApp"
+ android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- tools:replace="android:allowBackup"
- android:allowBackup="false"
android:largeHeap="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ tools:replace="android:allowBackup">
<activity
- android:name="org.havenapp.main.ListActivity"
- android:label="@string/title_activity_start"
+ android:name=".ListActivity"
android:configChanges="orientation|screenSize"
+ android:label="@string/title_activity_start"
android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -43,21 +54,27 @@
</intent-filter>
</activity>
<activity
- android:name="org.havenapp.main.SettingsActivity"
+ android:name=".SettingsActivity"
+ android:configChanges="orientation|screenSize"
android:label="@string/settings"
android:theme="@style/SettingsTheme"
- android:configChanges="orientation|screenSize"
android:windowSoftInputMode="stateHidden" />
- <activity android:name="org.havenapp.main.ui.PPAppIntro"
- android:screenOrientation="portrait"
- />
<activity
- android:name="org.havenapp.main.MonitorActivity"
- android:label="@string/app_name"
+ android:name=".ui.PPAppIntro"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".MonitorActivity"
android:configChanges="orientation|screenSize"
+ android:label="@string/app_name"
android:launchMode="singleTop" />
+ <activity
+ android:name=".ui.VideoPlayerActivity"
+ android:configChanges="orientation|keyboardHidden|screenLayout|screenSize"
+ android:label="@string/title_activity_video_player"
+ android:theme="@style/AppTheme" />
- <service android:name="org.havenapp.main.service.MonitorService"
+ <service
+ android:name=".service.MonitorService"
android:exported="false" />
<meta-data
@@ -74,23 +91,26 @@
android:value="org.havenapp.main.model" />
<activity
- android:name="org.havenapp.main.ui.EventActivity"
- android:label="@string/title_activity_event"
+ android:name=".ui.EventActivity"
android:configChanges="orientation|screenSize"
+ android:label="@string/title_activity_event"
android:theme="@style/AppTheme" />
- <activity android:name="org.havenapp.main.ui.MicrophoneConfigureActivity"
- android:configChanges="orientation|screenSize|keyboardHidden"/>
- <activity android:name="org.havenapp.main.ui.AccelConfigureActivity"
- android:configChanges="orientation|screenSize|keyboardHidden"/>
- <activity android:name="org.havenapp.main.ui.CameraConfigureActivity"
- android:configChanges="orientation|screenSize|keyboardHidden"/>
+ <activity
+ android:name=".ui.MicrophoneConfigureActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden" />
+ <activity
+ android:name=".ui.AccelConfigureActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden" />
+ <activity
+ android:name=".ui.CameraConfigureActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden" />
- <receiver android:name="org.havenapp.main.sensors.PowerConnectionReceiver">
+ <receiver android:name=".sensors.PowerConnectionReceiver">
<intent-filter>
- <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
- <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
+ <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+ <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
</intent-filter>
</receiver>
</application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java
index e16153e..0632a48 100644
--- a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java
+++ b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java
@@ -3,6 +3,8 @@ package org.havenapp.main.sensors.media;
import android.hardware.Camera;
import android.media.MediaRecorder;
import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
import java.io.IOException;
@@ -16,11 +18,13 @@ public class MediaRecorderTask {
private android.media.MediaRecorder mMediaRecorder;
private Camera mCamera;
private int mSeconds;
+ private SurfaceHolder mHolder;
- public MediaRecorderTask(Camera camera, String fileImageDir, int seconds) {
+ public MediaRecorderTask(Camera camera, String fileImageDir, int seconds, SurfaceHolder holder) {
mCamera = camera;
mOutputFile = fileImageDir;
mSeconds = seconds;
+ mHolder = holder;
if(prepare(mCamera)){
Log.d("Done", "Media Recorder prepared");
} else {
@@ -39,10 +43,11 @@ public class MediaRecorderTask {
mMediaRecorder = new MediaRecorder();
mCamera.unlock();
mMediaRecorder.setCamera(mCamera);
- mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+ mMediaRecorder.setPreviewDisplay(mHolder.getSurface());
+ // mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.DEFAULT);
mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
- mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+ // mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.MPEG_4_SP);
mMediaRecorder.setMaxDuration(mSeconds);
mMediaRecorder.setOutputFile(mOutputFile);
diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
index c423dc9..4cae11e 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -241,7 +241,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
camera.setPreviewCallback(new PreviewCallback() {
- public void onPreviewFrame(byte[] data, Camera cam) {
+ public void onPreviewFrame(byte[] data, final Camera cam) {
Camera.Size size;
try {
@@ -300,20 +300,22 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
stream.flush();
stream.close();
message.getData().putString("path", fileImage.getAbsolutePath());
- if (!doingVideoProcessing && prefs.getVideoMonitoringActive()) {
- record(camera, serviceMessenger);
- }
- /**
- fileImage = new File(fileImageDir, "detected.match." + ts);
- stream = new FileOutputStream(fileImage);
- oldBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
- stream.flush();
- stream.close();
- message.getData().putString("path", fileImage.getAbsolutePath());
- **/
+ //store the still match frame, even if doing video
serviceMessenger.send(message);
+ if (prefs.getVideoMonitoringActive() && (!doingVideoProcessing)) {
+ new Thread ()
+ {
+ public void run ()
+ {
+ camera.stopPreview();
+ record(camera, serviceMessenger);
+
+ }
+ }.start();
+ }
+
} catch (Exception e) {
// Cannot happen
Log.e("Preview", "error creating image", e);
@@ -343,21 +345,28 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
}
}
}
- Handler handler = new Handler();
- void record(Camera cam, Messenger messenger) {
+
+ private synchronized boolean record(Camera cam, Messenger messenger) {
+
+ if (mediaRecorder != null && doingVideoProcessing)
+ return false;
+
String ts1 = String.valueOf(new Date().getTime());
videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";
int seconds = prefs.getMonitoringTime() * 1000;
- MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, videoFile, seconds);
+ MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, videoFile, seconds, mHolder);
mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();
+
+ /**
AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
if (audioManager != null) {
audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, true);
audioManager.setStreamMute(AudioManager.STREAM_MUSIC,true);
- }
- mediaRecorder.start();
+ }**/
+
doingVideoProcessing = true;
- handler.postDelayed(() -> {
+ mediaRecorder.start();
+ updateHandler.postDelayed(() -> {
if (messenger != null) {
Message message = new Message();
message.what = EventTrigger.CAMERA_VIDEO;
@@ -367,16 +376,20 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
} catch (RemoteException e) {
e.printStackTrace();
}
+ /**
if (audioManager != null) {
audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, false);
audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);
- }
+ }**/
+
mediaRecorder.stop();
mediaRecorder.reset();
mediaRecorder.release();
doingVideoProcessing = false;
}
}, seconds);
+
+ return true;
}
public void surfaceDestroyed(SurfaceHolder holder) {
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index e619037..9118fed 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -87,8 +87,8 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
holder.video.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(eventTrigger.getPath()));
- intent.setDataAndType(Uri.parse(eventTrigger.getPath()), "video/*");
+ Intent intent = new Intent(context, VideoPlayerActivity.class);
+ intent.setData(Uri.parse("file://" + eventTrigger.getPath()));
context.startActivity(intent);
}
});
@@ -103,7 +103,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
break;
case EventTrigger.CAMERA:
holder.image.setVisibility(View.VISIBLE);
- Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
+ Picasso.get().load(new File(eventTrigger.getPath())).into(holder.image);
holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java b/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java
new file mode 100644
index 0000000..0ff972d
--- /dev/null
+++ b/src/main/java/org/havenapp/main/ui/VideoPlayerActivity.java
@@ -0,0 +1,97 @@
+package org.havenapp.main.ui;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.halilibo.bettervideoplayer.BetterVideoCallback;
+import com.halilibo.bettervideoplayer.BetterVideoPlayer;
+
+import org.havenapp.main.R;
+
+public class VideoPlayerActivity extends AppCompatActivity implements BetterVideoCallback {
+
+ private BetterVideoPlayer player;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_video_player);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+// Grabs a reference to the player view
+ player = (BetterVideoPlayer) findViewById(R.id.player);
+
+ // Sets the callback to this Activity, since it inherits EasyVideoCallback
+ player.setCallback(this);
+
+ player.setAutoPlay(true);
+
+ // Sets the source to the HTTP URL held in the TEST_URL variable.
+ // To play files, you can use Uri.fromFile(new File("..."))
+ player.setSource(getIntent().getData());
+
+
+
+ // From here, the player view will show a progress indicator until the player is prepared.
+ // Once it's prepared, the progress indicator goes away and the controls become enabled for the user to
+
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ // Make sure the player stops playing if the user presses the home button.
+ player.pause();
+ }
+
+ // Methods for the implemented EasyVideoCallback
+
+ @Override
+ public void onStarted(BetterVideoPlayer player) {
+ //Log.i(TAG, "Started");
+
+ player.showControls();
+ }
+
+ @Override
+ public void onPaused(BetterVideoPlayer player) {
+ //Log.i(TAG, "Paused");
+ }
+
+ @Override
+ public void onPreparing(BetterVideoPlayer player) {
+ //Log.i(TAG, "Preparing");
+ }
+
+ @Override
+ public void onPrepared(BetterVideoPlayer player) {
+ //Log.i(TAG, "Prepared");
+ }
+
+ @Override
+ public void onBuffering(int percent) {
+ //Log.i(TAG, "Buffering " + percent);
+ }
+
+ @Override
+ public void onError(BetterVideoPlayer player, Exception e) {
+ //Log.i(TAG, "Error " +e.getMessage());
+ }
+
+ @Override
+ public void onCompletion(BetterVideoPlayer player) {
+ //Log.i(TAG, "Completed");
+ }
+
+ @Override
+ public void onToggleControls(BetterVideoPlayer player, boolean isShowing) {
+ //Log.i(TAG, "Controls toggled " + isShowing);
+ }
+
+}
diff --git a/src/main/res/layout/activity_video_player.xml b/src/main/res/layout/activity_video_player.xml
new file mode 100644
index 0000000..ac1ea8d
--- /dev/null
+++ b/src/main/res/layout/activity_video_player.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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=".ui.VideoPlayerActivity">
+
+ <android.support.design.widget.AppBarLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:theme="@style/AppTheme.AppBarOverlay">
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+ </android.support.design.widget.AppBarLayout>
+
+ <include layout="@layout/content_video_player" />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/content_video_player.xml b/src/main/res/layout/content_video_player.xml
new file mode 100644
index 0000000..a2e4243
--- /dev/null
+++ b/src/main/res/layout/content_video_player.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.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"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior"
+ tools:context=".ui.VideoPlayerActivity"
+ tools:showIn="@layout/activity_video_player">
+
+ <com.halilibo.bettervideoplayer.BetterVideoPlayer
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/player"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 46987d5..f0e0c5b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -155,5 +155,6 @@
<string name="hearbeat_monitor_summary">Monitor Time Interval</string>
<string name="heartbeat_time_dialog">Enter interval time (minutes) to receive notifications:\n\nMinimum of 1, default is 5.</string>
<string name="hearbeat_monitor_dialog">Set alert delay for the status notifications </string>
-
+ <string name="title_activity_video_player">VideoPlayerActivity</string>
+
</resources>