|
@@ -314,6 +314,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
nSelectedFilter = 0;
|
|
nSelectedFilter = 0;
|
|
sendReliefFilterSelectBR(nSelectedFilter);
|
|
sendReliefFilterSelectBR(nSelectedFilter);
|
|
|
|
+ ctrlAlphaBlending(false);
|
|
|
|
|
|
if (TalkFrontHandler != null) {
|
|
if (TalkFrontHandler != null) {
|
|
TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE);
|
|
TalkFrontHandler.removeMessages(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE);
|
|
@@ -373,6 +374,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.END) {
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.END) {
|
|
bEnableVisitorPic = false;
|
|
bEnableVisitorPic = false;
|
|
|
|
+ ctrlAlphaBlending(false);
|
|
doEnd();
|
|
doEnd();
|
|
send_stop_talking_request(RemoteIDInfo.strIP);
|
|
send_stop_talking_request(RemoteIDInfo.strIP);
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.SAVE_PICTURE) {
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.SAVE_PICTURE) {
|
|
@@ -383,7 +385,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
|
|
sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.DOOROPEN) {
|
|
} else if (nID == ID.SCREEN.TALKFRONT.ELEMENT.BUTTON.DOOROPEN) {
|
|
if (!bSentiMAP) {
|
|
if (!bSentiMAP) {
|
|
- sendHandlerMsg(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
|
|
|
|
|
|
+ sendHandlerMsgDelayed(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null, 3000); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
|
|
doDoorOpen();
|
|
doDoorOpen();
|
|
//send_stop_talking_request(RemoteIDInfo.strIP);
|
|
//send_stop_talking_request(RemoteIDInfo.strIP);
|
|
}
|
|
}
|
|
@@ -437,7 +439,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
doTalkByBTN(CALLOWNER.WALLPAD);
|
|
doTalkByBTN(CALLOWNER.WALLPAD);
|
|
} else if (keyCode == Declare.BTN.DOOR_OPEN || keyCode == Declare.BTN.DOOR_OPEN_V40) {
|
|
} else if (keyCode == Declare.BTN.DOOR_OPEN || keyCode == Declare.BTN.DOOR_OPEN_V40) {
|
|
if (!bSentiMAP) {
|
|
if (!bSentiMAP) {
|
|
- sendHandlerMsg(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
|
|
|
|
|
|
+ sendHandlerMsgDelayed(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null, 3000); // 문열림으로 통화 종료시 로비 영상 노이즈가 생기므로 영상을 GUI 아래로 내림
|
|
doDoorOpen();
|
|
doDoorOpen();
|
|
}
|
|
}
|
|
} else if (keyCode == Declare.BTN.PLAY_DECODED_VIDEO || keyCode == Declare.BTN.PLAY_DECODED_VIDEO_V40) {
|
|
} else if (keyCode == Declare.BTN.PLAY_DECODED_VIDEO || keyCode == Declare.BTN.PLAY_DECODED_VIDEO_V40) {
|
|
@@ -882,7 +884,12 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
if (doSubPhoneDoorOpen(eCallOwner, eCallType))
|
|
if (doSubPhoneDoorOpen(eCallOwner, eCallType))
|
|
MainActivity.mSubPhoneController.sendACKDoorOpen(eCallOwner, eCallType);
|
|
MainActivity.mSubPhoneController.sendACKDoorOpen(eCallOwner, eCallType);
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
|
|
+ if (eCallOwner != CALLOWNER.WALLPAD) {
|
|
|
|
+ doEnd();
|
|
|
|
+ }
|
|
|
|
+ }else {
|
|
Log.w(TAG, "[onSubPhoneEvent] Incorrect eCallStatus!!! eCallStatus = " + eCallStatus);
|
|
Log.w(TAG, "[onSubPhoneEvent] Incorrect eCallStatus!!! eCallStatus = " + eCallStatus);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
@@ -924,14 +931,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
try {
|
|
try {
|
|
LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
|
|
|
|
- if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(bShow, false);
|
|
|
|
-
|
|
|
|
- if (bShow) {
|
|
|
|
- sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- enableSavePicBTN(false);
|
|
|
|
- }
|
|
|
|
|
|
+// if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(bShow, false);
|
|
|
|
+//
|
|
|
|
+// if (bShow) {
|
|
|
|
+// sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// enableSavePicBTN(false);
|
|
|
|
+// }
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1508,6 +1515,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
private void enableSavePicBTN(boolean bEnable) {
|
|
private void enableSavePicBTN(boolean bEnable) {
|
|
try {
|
|
try {
|
|
|
|
+
|
|
|
|
+ //LOG_INFO("[enableSavePicBTN] enableSavePicBTN [" + bEnable + "]");
|
|
if (bEnable) {
|
|
if (bEnable) {
|
|
if (ConfigValues.bReliefCall)
|
|
if (ConfigValues.bReliefCall)
|
|
BTN_SAVE_PICTURE.setImageResource(R.drawable.btn_photo_normal);
|
|
BTN_SAVE_PICTURE.setImageResource(R.drawable.btn_photo_normal);
|
|
@@ -1550,12 +1559,16 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
// }
|
|
// }
|
|
//MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
//MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
// MainActivity.mSound.Play(SND.mode.OPENDOOR);
|
|
// MainActivity.mSound.Play(SND.mode.OPENDOOR);
|
|
- mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
|
|
|
|
|
|
|
|
- // 출입 데이터 기록(로비 문열림)
|
|
|
|
-// WallpadAccessData WpadAccessData = new WallpadAccessData(getContext());
|
|
|
|
-// WpadAccessData.Insert(WallpadAccessData.KIND.WPAD_CALL, null);
|
|
|
|
-// WpadAccessData.closeDB();
|
|
|
|
|
|
+ int nMentDuration = MainActivity.mSound.PlayMent(SND.mode.OPENDOOR);
|
|
|
|
+ try {
|
|
|
|
+ Log.d(TAG, "[mPathCheckHandler.handleMessage] nMentDuration -> " + nMentDuration);
|
|
|
|
+ Thread.sleep(nMentDuration + 1500);
|
|
|
|
+ } catch (InterruptedException e) {
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+ }
|
|
|
|
+
|
|
enableTalkBTN(false);
|
|
enableTalkBTN(false);
|
|
enableEndBTN(false);
|
|
enableEndBTN(false);
|
|
enableOpenDoorBTN(false);
|
|
enableOpenDoorBTN(false);
|
|
@@ -1567,6 +1580,24 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
// BTN_RELIEF_FILTER_04.setButtonEventOffEnable(R.drawable.btn_filter_4_normal);
|
|
// BTN_RELIEF_FILTER_04.setButtonEventOffEnable(R.drawable.btn_filter_4_normal);
|
|
}
|
|
}
|
|
doEnd();
|
|
doEnd();
|
|
|
|
+//
|
|
|
|
+// mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
|
|
|
|
+//
|
|
|
|
+// // 출입 데이터 기록(로비 문열림)
|
|
|
|
+//// WallpadAccessData WpadAccessData = new WallpadAccessData(getContext());
|
|
|
|
+//// WpadAccessData.Insert(WallpadAccessData.KIND.WPAD_CALL, null);
|
|
|
|
+//// WpadAccessData.closeDB();
|
|
|
|
+// enableTalkBTN(false);
|
|
|
|
+// enableEndBTN(false);
|
|
|
|
+// enableOpenDoorBTN(false);
|
|
|
|
+// enableSavePicBTN(false);
|
|
|
|
+// if (ConfigValues.bReliefCall) {
|
|
|
|
+// BTN_RELIEF_FILTER_01.setButtonEventOffEnable(R.drawable.btn_big_filter_1_normal);
|
|
|
|
+// BTN_RELIEF_FILTER_02.setButtonEventOffEnable(R.drawable.btn_big_filter_2_normal);
|
|
|
|
+//// BTN_RELIEF_FILTER_03.setButtonEventOffEnable(R.drawable.btn_filter_3_normal);
|
|
|
|
+//// BTN_RELIEF_FILTER_04.setButtonEventOffEnable(R.drawable.btn_filter_4_normal);
|
|
|
|
+// }
|
|
|
|
+// doEnd();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -2233,8 +2264,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
break;
|
|
break;
|
|
|
|
|
|
case TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO:
|
|
case TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO:
|
|
- if (IMG_VIDEO_MODULE != null) IMG_VIDEO_MODULE.setImageResource(R.drawable.image_lobby);
|
|
|
|
- if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlPopupGUI(true);
|
|
|
|
|
|
+ ctrlAlphaBlending(false);
|
|
|
|
+ //if (IMG_VIDEO_MODULE != null) IMG_VIDEO_MODULE.setImageResource(R.drawable.image_lobby);
|
|
|
|
+ //if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlPopupGUI(true);
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|
|
@@ -2366,7 +2398,15 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
- MainActivity.mIOInterface.setMICGain(nCurrentMicGain);
|
|
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ MainActivity.mIOInterface.setMICGain(nCurrentMicGain);
|
|
|
|
+ }
|
|
|
|
+ catch (NullPointerException ne)
|
|
|
|
+ {
|
|
|
|
+ ne.fillInStackTrace();
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
};
|
|
@@ -2398,7 +2438,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
- sendHandlerMsg(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null);
|
|
|
|
|
|
+ sendHandlerMsgDelayed(TalkFront.HANDLERMSG.HIDE_LOBBYVIDEO, 0, 0, null, 3000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|