|
@@ -222,6 +222,12 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
private static final int REQUEST_EXTERNAL_STORAGE = 100;
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ private boolean bMediaRecorder = false;
|
|
|
+
|
|
|
|
|
|
private WpadImageView TopBackground;
|
|
|
private WpadTextView TopTitle;
|
|
@@ -337,7 +343,8 @@ public class MainActivity extends WpadActivity {
|
|
|
public boolean bLCDReverse = false;
|
|
|
|
|
|
public static boolean bRecordingStatus = false;
|
|
|
- public static boolean bRecordingStopAndNewCall = false;
|
|
|
+ public static boolean bRecordingStopAndNewCall = false;
|
|
|
+ public static boolean bReadyToRecord = false;
|
|
|
|
|
|
public static boolean bFrontCallUse, bLobbyCallUse, bGuardCallUse, bResiCallUse, bPSTNCallUse, bCallHistoryUse, bVisitorPicUse;
|
|
|
|
|
@@ -3811,6 +3818,7 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
mFrontCamera.unlock();
|
|
|
|
|
|
+ bMediaRecorder = false;
|
|
|
|
|
|
mMediaRecorder = new MediaRecorder();
|
|
|
mMediaRecorder.setCamera(mFrontCamera);
|
|
@@ -3875,11 +3883,22 @@ public class MainActivity extends WpadActivity {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
if (mMediaRecorder != null) {
|
|
|
+ Log.d(TAG, "[mFrontCamOpenCheckHandler] m_mediaRecorder.start");
|
|
|
mMediaRecorder.start();
|
|
|
+ bMediaRecorder = true;
|
|
|
}
|
|
|
}
|
|
|
}, iPlayTime);
|
|
|
|
|
|
+
|
|
|
+ Log.v("yjyoon", "MainActivity > mFrontCamOpenCheckHandler: bReadyToRecord = true");
|
|
|
+ bReadyToRecord = true;
|
|
|
+
|
|
|
+ Log.v("yjyoon", "Ready to Recording.");
|
|
|
+ Intent newIntent = new Intent();
|
|
|
+ newIntent.setAction(ACNAME_MAIN_NOTI);
|
|
|
+ newIntent.putExtra("KIND", 1028);
|
|
|
+ getContext().sendBroadcast(newIntent);
|
|
|
|
|
|
} catch (IllegalStateException e) {
|
|
|
Log.e(TAG, "[IllegalStateException] mFrontCamOpenCheckHandler.start");
|
|
@@ -4634,10 +4653,17 @@ public class MainActivity extends WpadActivity {
|
|
|
try {
|
|
|
Log.d(TAG, "[mediaStartRecord]");
|
|
|
if (mMediaRecorder != null) {
|
|
|
- mMediaRecorder.stop();
|
|
|
+ if (bMediaRecorder) {
|
|
|
+ Log.d(TAG, "[mediaStartRecord] mMediaRecorder.stop");
|
|
|
+ mMediaRecorder.stop();
|
|
|
+ bMediaRecorder = false;
|
|
|
+ } else {
|
|
|
+ Log.d(TAG, "[mediaStartRecord] Skip mMediaRecorder.stop");
|
|
|
+ }
|
|
|
mMediaRecorder.reset();
|
|
|
mMediaRecorder.release();
|
|
|
mMediaRecorder = null;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
mFrontCamOpenCheckHandler.sendEmptyMessage(2);
|
|
@@ -4645,7 +4671,7 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
|
|
|
|
|
|
- Log.v("yjyoon", "Call MainActivity ###Common.BR_MAIN_NOTI.STOP_RECORDING");
|
|
|
+ Log.v("yjyoon", "Call MainActivity ###Common.BR_MAIN_NOTI.ACCEPT_RECORDING");
|
|
|
Intent newIntent = new Intent();
|
|
|
newIntent.setAction(ACNAME_MAIN_NOTI);
|
|
|
newIntent.putExtra("KIND", 1023);
|
|
@@ -4669,7 +4695,13 @@ public class MainActivity extends WpadActivity {
|
|
|
bRecordingStatus = false;
|
|
|
resetRecordTimer();
|
|
|
if (mMediaRecorder != null) {
|
|
|
- mMediaRecorder.stop();
|
|
|
+ if (bMediaRecorder) {
|
|
|
+ Log.d(TAG, "[mediaStopRecord] mMediaRecorder.stop");
|
|
|
+ mMediaRecorder.stop();
|
|
|
+ bMediaRecorder = false;
|
|
|
+ } else {
|
|
|
+ Log.d(TAG, "[mediaStopRecord] Skip mMediaRecorder.stop");
|
|
|
+ }
|
|
|
mMediaRecorder.reset();
|
|
|
mMediaRecorder.release();
|
|
|
mMediaRecorder = null;
|
|
@@ -4680,6 +4712,9 @@ public class MainActivity extends WpadActivity {
|
|
|
showFrontVideo(false);
|
|
|
if (bDel) ScreenLayout.removeView(FrontVideoSurface);
|
|
|
|
|
|
+ Log.v("yjyoon", "Mainactivity > mediaStopRecord: bReadyToRecord = false");
|
|
|
+ bReadyToRecord = false;
|
|
|
+
|
|
|
|
|
|
Log.v("yjyoon", "Call MainActivity ###Common.BR_MAIN_NOTI.STOP_RECORDING");
|
|
|
Intent newIntent = new Intent();
|
|
@@ -4930,6 +4965,8 @@ public class MainActivity extends WpadActivity {
|
|
|
if (mMediaRecorder != null) {
|
|
|
mMediaRecorder.release();
|
|
|
mMediaRecorder = null;
|
|
|
+ if (bMediaRecorder)
|
|
|
+ bMediaRecorder = false;
|
|
|
}
|
|
|
resetRecordTimer();
|
|
|
bRecordingStatus = false;
|