|
@@ -274,8 +274,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
nSelectedFilter = 0;
|
|
|
// bEnableVisitorPic = false; // 부재중 방문객 사진 저장은 임시로 삭제한다.
|
|
|
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
+
|
|
|
|
|
|
sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
|
|
|
sendHandlerMsgDelayed(TalkFront.HANDLERMSG.SHOW_FRONTVIDEO, 0, 0, null, 1000);
|
|
@@ -329,12 +328,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
bEnableVisitorPic = false;
|
|
|
bReliefCallInit = false;
|
|
|
- MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
|
|
|
- initCallVariables();
|
|
|
+ if (ConfigValues.DEVICE_MODELTYPE == Version.MODEL_TYPE.IHN_D101_I_LX2)
|
|
|
+ MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
|
|
|
+
|
|
|
if (ConfigValues.bReliefCall) selectReliefCallFilter(nSelectedFilter);
|
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
|
MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
+ initCallVariables();
|
|
|
//Global.add1stCallHistoryInfoFinal();
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -459,6 +460,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
|
sendHandlerMsg(TalkFront.HANDLERMSG.SET_BTN_STATUS, 0, 0, null);
|
|
|
if (eCallStatus == CALLSTATUS.CALLED) {
|
|
|
+ MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.FRONT, false);
|
|
|
Global.playMelodyRepeat(eCallType);
|
|
|
super.setFinishTimerDestroy();
|
|
@@ -491,6 +494,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
//MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.FRONT, false);
|
|
|
//Global.playMelodyRepeat(eCallType);
|
|
|
//MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
+
|
|
|
super.setFinishTimerDestroy();
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
|
((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
|
|
@@ -585,14 +591,23 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
Global.stopMelodyRepeat();
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
|
((MainActivity) mContext).displayRemoteID(null);
|
|
|
- MainActivity.mSound.PlayMent(SND.call.BUSY_TRY_LATER);
|
|
|
- MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.FRONT, CALLSTATUS.IDLE);
|
|
|
- MainActivity.mCallController.stop1stCallTimer();
|
|
|
- ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
- Global.change1stCallLogAction(CALLACTION.BUSY);
|
|
|
- nSelectedFilter = 0;
|
|
|
- sendReliefFilterSelectBR(nSelectedFilter);
|
|
|
- MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
+ //MainActivity.mSound.PlayMent(SND.call.BUSY_TRY_LATER);
|
|
|
+ int nTime = MainActivity.mSound.PlayMent(SND.call.BUSY_TRY_LATER);
|
|
|
+
|
|
|
+ new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
|
|
|
+ @Override
|
|
|
+ public void run() {
|
|
|
+
|
|
|
+ MainActivity.mCallController.stop1stCallTimer();
|
|
|
+ ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
+ Global.change1stCallLogAction(CALLACTION.BUSY);
|
|
|
+ nSelectedFilter = 0;
|
|
|
+ sendReliefFilterSelectBR(nSelectedFilter);
|
|
|
+ MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
+ }
|
|
|
+ }, nTime + 500);
|
|
|
+
|
|
|
+
|
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
|
bEnableVisitorPic = false;
|
|
|
bReliefCallInit = false;
|
|
@@ -858,6 +873,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
if (eCallType == CALLTYPE.FRONT) {
|
|
|
|
|
|
if (eCallStatus == CALLSTATUS.CALLING) {
|
|
|
+ MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.FRONT, false);
|
|
|
super.setFinishTimerDestroy();
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
@@ -1807,6 +1824,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
private boolean send_check_sip_activation_request(final String strTargetIP) {
|
|
|
try {
|
|
|
+ //ctrlAlphaBlending(false);
|
|
|
Request_check_sip_activation check_sip_activation = new Request_check_sip_activation(mContext);
|
|
|
if (check_sip_activation.send_check_sip_activation(strTargetIP, null)) {
|
|
|
check_sip_activation.setResultCtrl(new RetProci() {
|
|
@@ -1814,6 +1832,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
@Override
|
|
|
public void ProcSuccess() {
|
|
|
LOG_INFO("[send_check_sip_activation_request] ProcSuccess()");
|
|
|
+ //ctrlAlphaBlending(true);
|
|
|
MainActivity.mCallController.mSIPInterface.requestCallForwardToStun(MainActivity.mCallController.makeCallForwarInfo(strTargetIP));
|
|
|
}
|
|
|
|
|
@@ -2237,15 +2256,27 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
break;
|
|
|
|
|
|
case TalkFront.HANDLERMSG.ENABLE_TALK_BTN:
|
|
|
- enableTalkBTN(true);
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
+ enableTalkBTN(true);
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ }
|
|
|
+
|
|
|
break;
|
|
|
|
|
|
case TalkFront.HANDLERMSG.ENABLE_END_BTN:
|
|
|
- enableEndBTN(true);
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
+ enableEndBTN(true);
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ }
|
|
|
+
|
|
|
break;
|
|
|
|
|
|
case TalkFront.HANDLERMSG.ENABLE_OPENDOOR_BTN:
|
|
|
- enableOpenDoorBTN(true);
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
+ enableOpenDoorBTN(true);
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
+ }
|
|
|
+
|
|
|
break;
|
|
|
|
|
|
case TalkFront.HANDLERMSG.OFF_FRONT:
|