|
@@ -304,6 +304,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
super.onClose();
|
|
super.onClose();
|
|
try {
|
|
try {
|
|
LOG_INFO("[onClose]");
|
|
LOG_INFO("[onClose]");
|
|
|
|
+ MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
//MainActivity.mIOInterface.ctrlPopupGUI(true);
|
|
//MainActivity.mIOInterface.ctrlPopupGUI(true);
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
nSelectedFilter = 0;
|
|
nSelectedFilter = 0;
|
|
@@ -329,7 +330,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
if (ConfigValues.bReliefCall) selectReliefCallFilter(nSelectedFilter);
|
|
if (ConfigValues.bReliefCall) selectReliefCallFilter(nSelectedFilter);
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
|
|
+
|
|
initCallVariables();
|
|
initCallVariables();
|
|
//super.setFinishTimerDestroy();
|
|
//super.setFinishTimerDestroy();
|
|
//Global.add1stCallHistoryInfoFinal();
|
|
//Global.add1stCallHistoryInfoFinal();
|
|
@@ -423,6 +424,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
try {
|
|
try {
|
|
LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "] RemoteIDInfo.strIP [" + RemoteIDInfo.strIP + "]");
|
|
LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "] RemoteIDInfo.strIP [" + RemoteIDInfo.strIP + "]");
|
|
if (eEvent == MAINEVENT.BTN_HOME && m_bCallStartBtnEnable == false) {
|
|
if (eEvent == MAINEVENT.BTN_HOME && m_bCallStartBtnEnable == false) {
|
|
|
|
+ MainActivity.mCallController.mSIPInterface.videoSet(false, false, false); //add KSJ 2022.04.26 통화 종료시 화면이 종료 안되는 현상 수정.
|
|
send_stop_talking_request(RemoteIDInfo.strIP);
|
|
send_stop_talking_request(RemoteIDInfo.strIP);
|
|
if ((MainActivity.mCallController.mCallInfo.getLOBBY() != CALLSTATUS.TALKING) && ((MainActivity) mContext).bDelCallTouch == false) Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
if ((MainActivity.mCallController.mCallInfo.getLOBBY() != CALLSTATUS.TALKING) && ((MainActivity) mContext).bDelCallTouch == false) Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
ctrlAlphaBlending(false);
|
|
ctrlAlphaBlending(false);
|
|
@@ -460,7 +462,28 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
public void onCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage) {
|
|
public void onCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage) {
|
|
try {
|
|
try {
|
|
LOG_INFO("[onCallEvent] eCallOwner [" + eCallOwner + "], eCallStatus [" + eCallStatus + "], eCallType [" + eCallType + "], strRemoteIP [" + strRemoteIP + "], strRemoteSIPID [" + strRemoteSIPID + "], strMessage [" + strMessage + "]");
|
|
LOG_INFO("[onCallEvent] eCallOwner [" + eCallOwner + "], eCallStatus [" + eCallStatus + "], eCallType [" + eCallType + "], strRemoteIP [" + strRemoteIP + "], strRemoteSIPID [" + strRemoteSIPID + "], strMessage [" + strMessage + "]");
|
|
- if (eCallType == CALLTYPE.NONE) return;
|
|
|
|
|
|
+ if (eCallType == CALLTYPE.NONE)
|
|
|
|
+ {
|
|
|
|
+ bEnableVisitorPic = false;
|
|
|
|
+ bReliefCallInit = false;
|
|
|
|
+ //Global.stopMelodyRepeat();
|
|
|
|
+ MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
|
|
+ ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_ALL);
|
|
|
|
+ ((MainActivity) mContext).finishManual(ID.MANUAL.MANUAL_ALL);
|
|
|
|
+ //((MainActivity) mContext).displayRemoteID(null);
|
|
|
|
+ if (eCallOwner == CALLOWNER.MOBILE) {
|
|
|
|
+ MainActivity.mCallController.quitMoIPCall();
|
|
|
|
+// ((MainActivity) mContext).showRemoteCallNoticeText(false);
|
|
|
|
+ }
|
|
|
|
+ MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.LOBBY, CALLSTATUS.IDLE);
|
|
|
|
+ MainActivity.mCallController.stop1stCallTimer();
|
|
|
|
+ MainActivity.mCallController.stop2ndCallTimer();
|
|
|
|
+ MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
|
|
+ nSelectedFilter = 0;
|
|
|
|
+ sendReliefFilterSelectBR(nSelectedFilter);
|
|
|
|
+ MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
if (eCallType == CALLTYPE.LOBBY) {
|
|
if (eCallType == CALLTYPE.LOBBY) {
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
@@ -1508,16 +1531,16 @@ public class TalkLobby 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
|
|
|
|
-
|
|
|
|
- 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);
|
|
|
|
- }
|
|
|
|
|
|
+ mPathCheckHandler.sendEmptyMessage(2); // 통화패스 Normal로 변경 확인 후 멘트 출력 seulki
|
|
|
|
+
|
|
|
|
+// 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);
|
|
@@ -1916,14 +1939,14 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
if (eCallStatus == CALLSTATUS.TALKING) {
|
|
if (eCallStatus == CALLSTATUS.TALKING) {
|
|
Global.setV40WallPadVolume_LOBBY(nCurrentVolume);
|
|
Global.setV40WallPadVolume_LOBBY(nCurrentVolume);
|
|
|
|
|
|
- if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
|
- {
|
|
|
|
- Global.setV40WallPadMicGain("0x0200");
|
|
|
|
- }
|
|
|
|
- else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
|
- {
|
|
|
|
- Global.setV40WallPadMicGain("0x0080");
|
|
|
|
- }
|
|
|
|
|
|
+// if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
|
+// {
|
|
|
|
+// Global.setV40WallPadMicGain("0x0200");
|
|
|
|
+// }
|
|
|
|
+// else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
|
+// {
|
|
|
|
+// Global.setV40WallPadMicGain("0x0080");
|
|
|
|
+// }
|
|
|
|
|
|
}
|
|
}
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
@@ -2179,14 +2202,14 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
|
|
|
|
case HANDLERMSG.SET_VOLUME_TABLE:
|
|
case HANDLERMSG.SET_VOLUME_TABLE:
|
|
Global.setV40WallPadVolume_LOBBY(nCurrentVolume);
|
|
Global.setV40WallPadVolume_LOBBY(nCurrentVolume);
|
|
- if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
|
- {
|
|
|
|
- Global.setV40WallPadMicGain("0x0200");
|
|
|
|
- }
|
|
|
|
- else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
|
- {
|
|
|
|
- Global.setV40WallPadMicGain("0x0080");
|
|
|
|
- }
|
|
|
|
|
|
+// if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
|
+// {
|
|
|
|
+// Global.setV40WallPadMicGain("0x0200");
|
|
|
|
+// }
|
|
|
|
+// else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
|
+// {
|
|
|
|
+// Global.setV40WallPadMicGain("0x0080");
|
|
|
|
+// }
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -2317,13 +2340,13 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
}
|
|
}
|
|
else if (msg.what == 3) {
|
|
else if (msg.what == 3) {
|
|
Log.d(TAG, "[mPathCheckHandler.handleMessage] Handler finish!! PATH [NORMAL] -> play dooropen ment!");
|
|
Log.d(TAG, "[mPathCheckHandler.handleMessage] Handler finish!! PATH [NORMAL] -> play dooropen ment!");
|
|
- try {
|
|
|
|
-
|
|
|
|
- Thread.sleep(3000);
|
|
|
|
- } catch (InterruptedException e) {
|
|
|
|
- //e.printStackTrace();
|
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
- }
|
|
|
|
|
|
+// try {
|
|
|
|
+//
|
|
|
|
+// Thread.sleep(3000);
|
|
|
|
+// } catch (InterruptedException e) {
|
|
|
|
+// //e.printStackTrace();
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+// }
|
|
int nMentDuration = MainActivity.mSound.PlayMent(SND.mode.OPENDOOR);
|
|
int nMentDuration = MainActivity.mSound.PlayMent(SND.mode.OPENDOOR);
|
|
try {
|
|
try {
|
|
Log.d(TAG, "[mPathCheckHandler.handleMessage] nMentDuration -> " + nMentDuration);
|
|
Log.d(TAG, "[mPathCheckHandler.handleMessage] nMentDuration -> " + nMentDuration);
|