|
@@ -342,7 +342,7 @@ public class MainActivity extends WpadActivity {
|
|
|
public boolean bBlockHomeBTN = false;
|
|
|
public boolean bLCDReverse = false;
|
|
|
|
|
|
- public static boolean bRecordingStatus = false; // 거동수상자 녹화중 판별 플래그
|
|
|
+ //public static boolean bRecordingStatus = false; // 거동수상자 녹화중 판별 플래그
|
|
|
public static boolean bRecordingStopAndNewCall = false; // yjyoon.
|
|
|
|
|
|
public static boolean bFrontCallUse, bLobbyCallUse, bGuardCallUse, bResiCallUse, bPSTNCallUse, bCallHistoryUse, bVisitorPicUse;
|
|
@@ -365,6 +365,7 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
Global.setGlobalContext(this);
|
|
|
Global.getConfigValues(); // 디바이스 설정
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
nSysVolume = Global.getConfigSystemVolume();
|
|
|
|
|
|
if (ConfigValues.DEVICE_MODELTYPE == MODEL_TYPE.IHN_1020B_I) bFFMPEGEnable = true;
|
|
@@ -4543,7 +4544,7 @@ public class MainActivity extends WpadActivity {
|
|
|
mRecordTimer = new CountDownTimer(RECORDING_TIME * 1000, 1000) {
|
|
|
@Override
|
|
|
public void onTick(long millisUntilFinished) {
|
|
|
- if (bRecordingStatus) {
|
|
|
+ if (Global.getRecordingStatus()) {
|
|
|
mCurRecordTime++;
|
|
|
Log.d(TAG, "[checkRecordTimer] mCurRecordTime [" + mCurRecordTime + "]");
|
|
|
}
|
|
@@ -4553,7 +4554,7 @@ public class MainActivity extends WpadActivity {
|
|
|
public void onFinish() {
|
|
|
LOG("[checkRecordTimer] onFinish!! bRemoteCall [" + ConfigValues.bRemoteCall + "]");
|
|
|
if (ConfigValues.bRemoteCall) {
|
|
|
- bRecordingStatus = false;
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
mediaStopRecord(true);
|
|
|
mRemoteCallController.sendCloseRemoteCall();
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.FINISH_WALLPADCALL, 0, 0, 500);
|
|
@@ -4664,7 +4665,7 @@ public class MainActivity extends WpadActivity {
|
|
|
try {
|
|
|
Log.d(TAG, "[mediaStartRecord]");
|
|
|
|
|
|
- if (!bRecordingStatus) {
|
|
|
+ if (!Global.getRecordingStatus()) {
|
|
|
Log.d("yjyoon", "[mediaStartRecord] bRecordingStatus == false");
|
|
|
Log.d(TAG, "[mediaStartRecord] bRecordingStatus == false");
|
|
|
return;
|
|
@@ -4699,9 +4700,9 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG,re);
|
|
|
- bRecordingStatus = false;
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
} catch (Throwable t) {
|
|
|
- bRecordingStatus = false;
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
Log.e(TAG, "[Exception] mediaStartRecord()");
|
|
|
//t.printStackTrace();
|
|
|
LogUtil.errorLogInfo("", TAG, t);
|
|
@@ -4711,7 +4712,7 @@ public class MainActivity extends WpadActivity {
|
|
|
public void mediaStopRecord(boolean bDel) {
|
|
|
try {
|
|
|
Log.d(TAG, "[mediaStopRecord] bDel [" + bDel + "]");
|
|
|
- bRecordingStatus = false; // 녹화 종료
|
|
|
+ Global.setRecordingStatus(false); // 녹화 종료
|
|
|
resetRecordTimer();
|
|
|
if (mMediaRecorder != null) {
|
|
|
if (bMediaRecorder) {
|
|
@@ -4753,7 +4754,7 @@ public class MainActivity extends WpadActivity {
|
|
|
public void stopNSaveRecordingFile(boolean bDel, boolean bFinish) {
|
|
|
try {
|
|
|
LOG("[stopNSaveRecordingFile] bDel [" + bDel + "], bFinish [" + bFinish + "], bRemoteCall [" + ConfigValues.bRemoteCall + "]");
|
|
|
- bRecordingStatus = false;
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
mediaStopRecord(bDel);
|
|
|
saveRecordingFile(bFinish);
|
|
|
} catch (RuntimeException re) {
|
|
@@ -4986,7 +4987,7 @@ public class MainActivity extends WpadActivity {
|
|
|
bMediaRecorder = false;
|
|
|
}
|
|
|
resetRecordTimer();
|
|
|
- bRecordingStatus = false;
|
|
|
+ Global.setRecordingStatus(false);
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.FINISH_WALLPADCALL, 0, 0, 1000);
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -5741,10 +5742,10 @@ public class MainActivity extends WpadActivity {
|
|
|
else if (kind == 9999) {
|
|
|
// yjyoon. 거동수상자 녹화 중 새로운 콜 이벤트 수신.
|
|
|
|
|
|
- Log.v(this.TAG, "Received New call during Recording(9999). bRecodingStatus[" + bRecordingStatus + "]");
|
|
|
+ Log.v(this.TAG, "Received New call during Recording(9999). bRecodingStatus[" + Global.getRecordingStatus() + "]");
|
|
|
|
|
|
- if (!bRecordingStatus) {
|
|
|
- Log.v(this.TAG, "ignore new call!! bRecodingStatus[" + bRecordingStatus + "]");
|
|
|
+ if (!Global.getRecordingStatus()) {
|
|
|
+ Log.v(this.TAG, "ignore new call!! bRecodingStatus[" + Global.getRecordingStatus() + "]");
|
|
|
return;
|
|
|
}
|
|
|
|