|
@@ -278,6 +278,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
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);
|
|
|
+ sendHandlerMsgDelayed(TalkFront.HANDLERMSG.SHOW_FRONTVIDEO, 0, 0, null, 2000);
|
|
|
+
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
} catch (Exception e) {
|
|
@@ -410,8 +413,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
@Override
|
|
|
public void onMainTouchEvent(MAINEVENT eEvent) {
|
|
|
try {
|
|
|
- LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "]");
|
|
|
+ LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "] RemoteIDInfo.strIP [" + RemoteIDInfo.strIP + "]");
|
|
|
if (eEvent == MAINEVENT.BTN_HOME) {
|
|
|
+ send_stop_talking_request(RemoteIDInfo.strIP);
|
|
|
if (MainActivity.mCallController.mCallInfo.getFRONT() != CALLSTATUS.TALKING) Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
finishWallpadCallApp();
|
|
|
} else if (eEvent == MAINEVENT.BTN_HOME_MOBILE) {
|
|
@@ -484,10 +488,11 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
else if (eCallStatus == CALLSTATUS.CALLING) {
|
|
|
//MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.FRONT, false);
|
|
|
//Global.playMelodyRepeat(eCallType);
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
super.setFinishTimerDestroy();
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
|
((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
|
|
|
- Global.make1stCallHistoryInfo(CALLTYPE.FRONT.toString(), "NONE", CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
|
|
|
+ //Global.make1stCallHistoryInfo(CALLTYPE.FRONT.toString(), "NONE", CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
|
|
|
//Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
// 부재중인 경우를 대비하여 임시저장 (외출방범 설정중에도 통화 부재중과 동일한 방식으로 처리한다. jeff, 2021.07.26)
|
|
@@ -593,6 +598,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
sendReliefFilterSelectBR(nSelectedFilter);
|
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_1STCALL) {
|
|
|
+ MainActivity.mIOInterface.ctrlPopupGUI(true);
|
|
|
bEnableVisitorPic = false;
|
|
|
bReliefCallInit = false;
|
|
|
Global.stopMelodyRepeat();
|
|
@@ -849,6 +855,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
if (eCallOwner != CALLOWNER.WALLPAD) {
|
|
|
((MainActivity) mContext).StartPopup(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
}
|
|
|
+
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(tr);
|
|
|
//((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
|
|
|
}
|
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
@@ -886,7 +894,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
try {
|
|
|
LOG_INFO("[onVideoSet] bSet [" + bSet + "], strRemoteSIPID [" + strRemoteSIPID + "]");
|
|
|
if (bSet) {
|
|
|
- if (!strRemoteSIPID.contains(Declare.DEVICENAME.strType_Lobby)) {
|
|
|
+ if (!strRemoteSIPID.contains(Declare.DEVICENAME.strType_Front)) {
|
|
|
Log.e(TAG, "[onVideoSet] Device name is not matched!!!");
|
|
|
return;
|
|
|
}
|
|
@@ -1064,8 +1072,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
private void doTalkByBTN(CALLOWNER eCallOwner) {
|
|
|
try {
|
|
|
LOG_INFO("[doTalkByBTN] CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getFRONT() + "]");
|
|
|
- if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED) {
|
|
|
- MainActivity.mCallController.acceptMoIPCall(false);
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING) {
|
|
|
+ send_start_talking_request(RemoteIDInfo.strIP);
|
|
|
+ //MainActivity.mCallController.acceptMoIPCall(false);
|
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
} else if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
@@ -1232,6 +1241,9 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
} else {
|
|
|
LOG("[procAddCall] No MultiCall!!");
|
|
|
// 멀티콜 없음
|
|
|
+ if (RemoteIDInfo.bAutoCall) {
|
|
|
+ doAutoCall(); // 멀티콜 상황이 아닌경우 자동호출을 수행함
|
|
|
+ }
|
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
|
}
|
|
|
} catch (RuntimeException re) {
|
|
@@ -1243,6 +1255,26 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void doAutoCall() {
|
|
|
+ try {
|
|
|
+ Log.e(TAG, "[doAutoCall] RemoteIDInfo.bAutoCall [" + RemoteIDInfo.bAutoCall + "]");
|
|
|
+ if (RemoteIDInfo.bAutoCall) {
|
|
|
+ RemoteIDInfo.bAutoCall = false;
|
|
|
+ LOG("[doAutoCall] strDong [" + RemoteIDInfo.strDong + "], strHo [" + RemoteIDInfo.strHo + "], strIP [" + RemoteIDInfo.strIP + "]");
|
|
|
+
|
|
|
+
|
|
|
+ } else {
|
|
|
+ LOG("[doAutoCall] AutoCall is not activated!!");
|
|
|
+ }
|
|
|
+ } catch (RuntimeException re) {
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
+ } catch (Exception e) {
|
|
|
+ Log.e(TAG, "[Exception] doAutoCall()");
|
|
|
+ //e.printStackTrace();
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void playFrontCamBell(boolean bBell) {
|
|
|
try {
|
|
|
MainActivity.mIOInterface.ctrlFrontCamPower(bBell);
|
|
@@ -1519,7 +1551,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
@Override
|
|
|
public void ProcError() {
|
|
|
- LOG_INFO("[send_check_sip_activation_request] ProcError()");
|
|
|
+ LOG_INFO("[send_lobby_open_request] ProcError()");
|
|
|
bSentiMAP = false;
|
|
|
MainActivity.mSound.Play(SND.setting.RETRY_ACTION);
|
|
|
// mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
|
|
@@ -1527,7 +1559,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
@Override
|
|
|
public void ProcDoing() {
|
|
|
- LOG_INFO("[send_check_sip_activation_request] ProcDoing()");
|
|
|
+ LOG_INFO("[send_lobby_open_request] ProcDoing()");
|
|
|
bSentiMAP = false;
|
|
|
}
|
|
|
});
|
|
@@ -1536,7 +1568,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
} catch (Exception e) {
|
|
|
- Log.e(TAG, "[Exception] send_check_sip_activation_request(String strTargetIP, String strMessage)");
|
|
|
+ Log.e(TAG, "[Exception] send_lobby_open_request(String strTargetIP, String strMessage)");
|
|
|
//e.printStackTrace();
|
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
|
}
|
|
@@ -1713,7 +1745,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
return true;
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- Log.e(TAG, "[Exception] send_check_sip_activation_request(String strTargetIP, String strMessage)");
|
|
|
+ Log.e(TAG, "[Exception] send_start_talking_request(String strTargetIP, String strMessage)");
|
|
|
e.printStackTrace();
|
|
|
MainActivity.mCallController.mSIPInterface.cancelCallForwardToStun();
|
|
|
}
|
|
@@ -1738,6 +1770,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
public void ProcError() {
|
|
|
LOG_INFO("[send_check_sip_activation_request] ProcError()");
|
|
|
MainActivity.mCallController.mSIPInterface.cancelCallForwardToStun();
|
|
|
+ //MainActivity.mSound.PlayMent(SND.call.BUSY_TRY_LATER);
|
|
|
+ //doEnd();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -2073,6 +2107,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
public final static int TAKE_VISITORPICTURE = 125;
|
|
|
public final static int CALL_FORWARD = 130;
|
|
|
public final static int ENABLE_SAVE_VISITORPICTURE = 140;
|
|
|
+ public final static int SHOW_FRONTVIDEO = 150;
|
|
|
public final static int FLICKER_LED_CALL = 160;
|
|
|
public final static int REFRESH_BTNLED_STATUS = 170;
|
|
|
public final static int SET_BTN_STATUS = 175;
|
|
@@ -2110,11 +2145,18 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
case TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE:
|
|
|
if (MainActivity.mCallController == null) return;
|
|
|
if (MainActivity.mCallController.mCallInfo == null) return;
|
|
|
- if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING) {
|
|
|
BTN_SAVE_PICTURE.setButtonEventOffDisable();
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(false);
|
|
|
}
|
|
|
break;
|
|
|
|
|
|
+ case HANDLERMSG.SHOW_FRONTVIDEO:
|
|
|
+
|
|
|
+ //ctrlAlphaBlending(true);
|
|
|
+
|
|
|
+ break;
|
|
|
+
|
|
|
case TalkFront.HANDLERMSG.TAKE_VISITORPICTURE:
|
|
|
if (bEnableVisitorPic) startTakeVisitorPicture((String) msg.obj);
|
|
|
break;
|