|
@@ -280,7 +280,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MainActivity.mCallController.releaseDTMFEventListener();
|
|
MainActivity.mCallController.releaseDTMFEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
if (!MainActivity.mCallController.mCallInfo.getPSTNCallHold()) MainActivity.mPSTNController.sendHookOff();
|
|
if (!MainActivity.mCallController.mCallInfo.getPSTNCallHold()) MainActivity.mPSTNController.sendHookOff();
|
|
- Global.add1stCallHistoryInfoFinal();
|
|
|
|
|
|
+ //Global.add1stCallHistoryInfoFinal();
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -495,7 +495,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
else if (strRemoteSIPID.equals(HIDE_CID)) strTXT_PSTNNO = strMent_HideCID;
|
|
else if (strRemoteSIPID.equals(HIDE_CID)) strTXT_PSTNNO = strMent_HideCID;
|
|
else strTXT_PSTNNO = strRemoteSIPID;
|
|
else strTXT_PSTNNO = strRemoteSIPID;
|
|
updateScreen();
|
|
updateScreen();
|
|
- Global.make1stCallHistoryInfo(CALLTYPE.PSTN.toString(), strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.make1stCallHistoryInfo(CALLTYPE.PSTN.toString(), strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
}
|
|
}
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
super.setFinishTimerDestroy();
|
|
super.setFinishTimerDestroy();
|
|
@@ -561,7 +561,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
initPSTNInfo();
|
|
initPSTNInfo();
|
|
updateScreen();
|
|
updateScreen();
|
|
- Global.add1stCallHistoryInfoFinal();
|
|
|
|
|
|
+ //Global.add1stCallHistoryInfoFinal();
|
|
setOffCallLED();
|
|
setOffCallLED();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
@@ -620,7 +620,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
- Global.make2ndCallHistoryInfo(eCallType.toString(), NO_CID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.make2ndCallHistoryInfo(eCallType.toString(), NO_CID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
// ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_VIDEO); // 멀티콜영상 팝업은 임시로 안나오게 설정 TODO 추후수정
|
|
// ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_VIDEO); // 멀티콜영상 팝업은 임시로 안나오게 설정 TODO 추후수정
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
@@ -638,7 +638,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)),
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)),
|
|
Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
|
|
Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
- Global.make2ndCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.make2ndCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
} else {
|
|
} else {
|
|
// 멀티콜 있음
|
|
// 멀티콜 있음
|
|
@@ -659,7 +659,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", MainActivity.mCallController.mCallInfo.getMultiCall_Name(), strRemoteIP);
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", MainActivity.mCallController.mCallInfo.getMultiCall_Name(), strRemoteIP);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
- Global.make2ndCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.make2ndCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
|
|
} else {
|
|
} else {
|
|
// 멀티콜 있음
|
|
// 멀티콜 있음
|
|
@@ -672,13 +672,13 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
LOG_WARN("[onMultiCallEvent] Invalid eMulticallType [" + eMulticallType + "]");
|
|
LOG_WARN("[onMultiCallEvent] Invalid eMulticallType [" + eMulticallType + "]");
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
- Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
LOG_WARN("[onMultiCallEvent] Another multicall is processing. Change multicall to PSTN multicall!!");
|
|
LOG_WARN("[onMultiCallEvent] Another multicall is processing. Change multicall to PSTN multicall!!");
|
|
|
|
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", NO_CID, strRemoteIP);
|
|
MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", NO_CID, strRemoteIP);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
|
|
- Global.make2ndCallHistoryInfo(eCallType.toString(), NO_CID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.make2ndCallHistoryInfo(eCallType.toString(), NO_CID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
|
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
}
|
|
}
|
|
@@ -695,7 +695,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
- Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
} else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
|
|
} else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
@@ -705,7 +705,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
- Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
|
|
|
|
|
|
+ //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
}
|
|
}
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
|
|
@@ -727,7 +727,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
if (MainActivity.mCallController.mPopupEventListener != null)
|
|
if (MainActivity.mCallController.mPopupEventListener != null)
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
|
|
doMultiCallReject(false);
|
|
doMultiCallReject(false);
|
|
- Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
|
|
|
|
+ //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
|
|
@@ -864,7 +864,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
if (((MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.IDLE) || (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.TRYING_CALL)) && (strTXT_PSTNNO.length() != 0)) {
|
|
if (((MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.IDLE) || (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.TRYING_CALL)) && (strTXT_PSTNNO.length() != 0)) {
|
|
doHookOnNDial(eCallOwner, strTXT_PSTNNO);
|
|
doHookOnNDial(eCallOwner, strTXT_PSTNNO);
|
|
String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
- Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
|
|
|
|
+ //Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
}
|
|
}
|
|
else if (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.CALLED) {
|
|
else if (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.CALLED) {
|
|
MainActivity.mSound.StopRepeat();
|
|
MainActivity.mSound.StopRepeat();
|
|
@@ -885,7 +885,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
if ((MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.IDLE || MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.TRYING_CALL) && strTXT_PSTNNO.length() != 0) {
|
|
if ((MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.IDLE || MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.TRYING_CALL) && strTXT_PSTNNO.length() != 0) {
|
|
doHookOnNDial(eCallOwner, strTXT_PSTNNO);
|
|
doHookOnNDial(eCallOwner, strTXT_PSTNNO);
|
|
String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
- Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
|
|
|
|
+ //Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
} else if (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.CALLED) {
|
|
} else if (MainActivity.mCallController.mCallInfo.getPSTN() == CALLSTATUS.CALLED) {
|
|
MainActivity.mSound.StopRepeat();
|
|
MainActivity.mSound.StopRepeat();
|
|
doHookOn(eCallOwner);
|
|
doHookOn(eCallOwner);
|
|
@@ -1058,28 +1058,28 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
private void redialPSTN() {
|
|
private void redialPSTN() {
|
|
try {
|
|
try {
|
|
LOG("[redialPSTN]");
|
|
LOG("[redialPSTN]");
|
|
- if (MainActivity.mCallController.mCallInfo.getPSTN() != CALLSTATUS.IDLE) {
|
|
|
|
- MainActivity.mSound.PlayMent(SND.setting.RETRY_INPUT);
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- CallHistoryInfoTable InfoTable = new CallHistoryInfoTable();
|
|
|
|
- InfoTable.clearTable();
|
|
|
|
- InfoTable = MainActivity.mCallHistoryManager.getPSTNRedialInfo();
|
|
|
|
- if (InfoTable == null) {
|
|
|
|
- MainActivity.mSound.PlayMent(SND.setting.RETRY_INPUT);
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- InfoTable.printValue();
|
|
|
|
- String strName = InfoTable.getCallHistoryInfo(0).getName();
|
|
|
|
- String[] strParsed = strName.split(":");
|
|
|
|
- strTXT_PSTNNO = strParsed[1].trim();
|
|
|
|
-
|
|
|
|
- doHookOnNDial(CALLOWNER.WALLPAD, strTXT_PSTNNO);
|
|
|
|
- updateScreen();
|
|
|
|
- String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
|
|
- Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
|
|
|
|
+// if (MainActivity.mCallController.mCallInfo.getPSTN() != CALLSTATUS.IDLE) {
|
|
|
|
+// MainActivity.mSound.PlayMent(SND.setting.RETRY_INPUT);
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// CallHistoryInfoTable InfoTable = new CallHistoryInfoTable();
|
|
|
|
+// InfoTable.clearTable();
|
|
|
|
+// InfoTable = MainActivity.mCallHistoryManager.getPSTNRedialInfo();
|
|
|
|
+// if (InfoTable == null) {
|
|
|
|
+// MainActivity.mSound.PlayMent(SND.setting.RETRY_INPUT);
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// InfoTable.printValue();
|
|
|
|
+// String strName = InfoTable.getCallHistoryInfo(0).getName();
|
|
|
|
+// String[] strParsed = strName.split(":");
|
|
|
|
+// strTXT_PSTNNO = strParsed[1].trim();
|
|
|
|
+//
|
|
|
|
+// doHookOnNDial(CALLOWNER.WALLPAD, strTXT_PSTNNO);
|
|
|
|
+// updateScreen();
|
|
|
|
+// String strPSTNInfo = CALLTYPE.PSTN.toString() + ":" + strTXT_PSTNNO;
|
|
|
|
+ //Global.make1stCallHistoryInfo(strPSTNInfo, strPSTNInfo, CALLDIRECTION.OUT, CALLACTION.TALK, CALLRESULT.OUT_TALK);
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1159,7 +1159,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
|
|
|
|
|
|
LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "]");
|
|
LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "]");
|
|
if (eMType == CALLTYPE.PSTN && eMStatus == CALLSTATUS.CALLED) {
|
|
if (eMType == CALLTYPE.PSTN && eMStatus == CALLSTATUS.CALLED) {
|
|
- Global.replace1stBy2ndCallHistory();
|
|
|
|
|
|
+ //Global.replace1stBy2ndCallHistory();
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
|
|
// 멀티콜 수락 (통화시작)
|
|
// 멀티콜 수락 (통화시작)
|
|
super.setFinishTimerDestroy();
|
|
super.setFinishTimerDestroy();
|