Parcourir la source

2021.11.18 VIP wallpadCall 통화 merge
history, 사진 저장시 Database 사용 부분 삭제

DESKTOP-UNEGUH3\MadeinLab_SW_02 il y a 3 ans
Parent
commit
e093bfac9e

+ 17 - 17
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkFront.java

@@ -334,7 +334,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
             MainActivity.mCallController.releaseCallEventListener();
             ((MainActivity) mContext).releaseMainEventListener();
             MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
-            Global.add1stCallHistoryInfoFinal();
+            //Global.add1stCallHistoryInfoFinal();
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {
@@ -462,10 +462,10 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     super.setFinishTimerDestroy();
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
                     ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
-                    Global.make1stCallHistoryInfo(CALLTYPE.FRONT.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                    //Global.make1stCallHistoryInfo(CALLTYPE.FRONT.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                     // 부재중인 경우를 대비하여 임시저장 (외출방범 설정중에도 통화 부재중과 동일한 방식으로 처리한다. jeff, 2021.07.26)
-                    sendHandlerMsgDelayed(TalkFront.HANDLERMSG.TAKE_VISITORPICTURE, 0, 0, strRemoteSIPID, 5000);   // 5초
+                    //sendHandlerMsgDelayed(TalkFront.HANDLERMSG.TAKE_VISITORPICTURE, 0, 0, strRemoteSIPID, 5000);   // 5초
                     if (ConfigValues.bUnoccupiedMode) {
                         sendHandlerMsgDelayed(TalkFront.HANDLERMSG.CALL_FORWARD, 0, 0, null, 15000);   // 15초
                     }
@@ -565,7 +565,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     MainActivity.mCallController.stop2ndCallTimer();
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
                     Global.change1stCallLogAction(CALLACTION.REJECT);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -614,7 +614,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     initCallVariables();
                     ((MainActivity) mContext).displayRemoteID(null);
                     Global.change1stCallLogAction(CALLACTION.CANCEL);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -649,7 +649,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "현관", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         CALLSTATUS eLobbyCallStatus = MainActivity.mCallController.mCallInfo.getFRONT();
 
@@ -703,7 +703,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                         MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)),
                                 Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
                         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);
 
                         CALLSTATUS eLobbyCallStatus = MainActivity.mCallController.mCallInfo.getFRONT();
                         /**
@@ -757,7 +757,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                             MultiCallInfo MCInfo = new MultiCallInfo();
                             MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                             MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                            Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                            //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
                             ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
                         }
                     } else {
@@ -771,13 +771,13 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                         MainActivity.mCallController.mCallInfo.setCallStatus(eMulticallType, CALLSTATUS.IDLE);
                         MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                         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!!");
 
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                     }
@@ -792,14 +792,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                 if (MainActivity.mCallController.mCallInfo.getMultiCallType() == eCallType) {
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 } else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
             } else if (eCallStatus == CALLSTATUS.CANCEL) {
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 MainActivity.mCallController.stop2ndCallTimer();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
             } else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
                 // 거동수상자 녹화기능 수정중 (추후 동작상태보고 수정)
@@ -818,7 +818,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
 //                    ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
 //                }
                 doMultiCallReject();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
@@ -1039,7 +1039,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     MainActivity.mCallController.stop2ndCallTimer();
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
                     Global.change1stCallLogAction(CALLACTION.REJECT);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -1211,7 +1211,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
             LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "], CallOwner [" + eCallOwner + "]");
             if (eMType == CALLTYPE.FRONT && eMStatus == CALLSTATUS.CALLED) {
                 RemoteIDInfo.strIP = MainActivity.mCallController.mCallInfo.getMultiCall_IP();
-                Global.replace1stBy2ndCallHistory();
+                //Global.replace1stBy2ndCallHistory();
                 if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
                     // 멀티콜 수락 (통화시작)
                     bMultiCallAccept = true;
@@ -2135,7 +2135,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     break;
 
                 case TalkFront.HANDLERMSG.SAVE_VISITORPICTURE:
-                    if (bEnableVisitorPic) startSaveVisitorPicture(CALLTYPE.FRONT, MainActivity.mCallController.mCallInfo.getFRONT());
+                    //if (bEnableVisitorPic) startSaveVisitorPicture(CALLTYPE.FRONT, MainActivity.mCallController.mCallInfo.getFRONT());
                     break;
 
                 case TalkFront.HANDLERMSG.CALL_FORWARD:
@@ -2158,7 +2158,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
                     break;
 
                 case TalkFront.HANDLERMSG.TAKE_VISITORPICTURE:
-                    if (bEnableVisitorPic) startTakeVisitorPicture((String) msg.obj);
+                    //if (bEnableVisitorPic) startTakeVisitorPicture((String) msg.obj);
                     break;
 
                 case TalkFront.HANDLERMSG.FLICKER_LED_CALL:

+ 13 - 13
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java

@@ -306,7 +306,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
             MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
             MainActivity.mCallController.releaseCallEventListener();
             ((MainActivity) mContext).releaseMainEventListener();
-            Global.add1stCallHistoryInfoFinal();
+            //Global.add1stCallHistoryInfoFinal();
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {
@@ -460,7 +460,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     }
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.WAITNG_INVITE_ACK);
                     ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
                 } else if (eCallStatus == CALLSTATUS.CALLING) {
                     bRcvEnd = false;
                     Global.playMelodyRepeat(eCallType);
@@ -478,7 +478,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
 
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLING);
                     ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
                 } else if (eCallStatus == CALLSTATUS.CALLED) {
                     bRcvEnd = false;
                     Global.playMelodyRepeat(eCallType);
@@ -486,7 +486,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                     MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.GUARD, false);
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
                     ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
                 } else if (eCallStatus == CALLSTATUS.TALKING) {
                     Global.stopMelodyRepeat();
                     if (eCallOwner == CALLOWNER.MOBILE) {
@@ -653,7 +653,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.GUARD, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         CALLSTATUS eGuardCallStatus = MainActivity.mCallController.mCallInfo.getGUARD();
 
@@ -710,7 +710,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.GUARD, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)), Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
                         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);
 
                         CALLSTATUS eGuardCallStatus = MainActivity.mCallController.mCallInfo.getGUARD();
 
@@ -768,7 +768,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                             MultiCallInfo MCInfo = new MultiCallInfo();
                             MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                             MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                            Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                            //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
                             ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
                         }
                     } else {
@@ -783,13 +783,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                         MainActivity.mCallController.mCallInfo.setCallStatus(eMulticallType, CALLSTATUS.IDLE);
                         MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                         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!!");
 
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.GUARD, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                     }
@@ -804,14 +804,14 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
                 if (MainActivity.mCallController.mCallInfo.getMultiCallType() == eCallType) {
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 } else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
             } else if (eCallStatus == CALLSTATUS.CANCEL) {
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 MainActivity.mCallController.stop2ndCallTimer();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
             } else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
                 // 거동수상자 녹화기능 수정중 (추후 동작상태보고 수정)
@@ -831,7 +831,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
 //                    ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
 //                }
                 doMultiCallReject();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
@@ -1193,7 +1193,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
             LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "]");
 
             if (eMType == CALLTYPE.GUARD && eMStatus == CALLSTATUS.CALLED) {
-                Global.replace1stBy2ndCallHistory();
+                //Global.replace1stBy2ndCallHistory();
                 if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
                     // 멀티콜 수락 (통화시작)
                     super.setFinishTimerDestroy();

+ 18 - 18
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkLobby.java

@@ -327,7 +327,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
             MainActivity.mCallController.releaseCallEventListener();
             ((MainActivity) mContext).releaseMainEventListener();
             MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
-            Global.add1stCallHistoryInfoFinal();
+            //Global.add1stCallHistoryInfoFinal();
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {
@@ -458,10 +458,10 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     super.setFinishTimerDestroy();
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
                     ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                     // 부재중인 경우를 대비하여 임시저장 (외출방범 설정중에도 통화 부재중과 동일한 방식으로 처리한다. jeff, 2021.07.26)
-                    sendHandlerMsgDelayed(HANDLERMSG.TAKE_VISITORPICTURE, 0, 0, strRemoteSIPID, 5000);   // 5초
+                    //sendHandlerMsgDelayed(HANDLERMSG.TAKE_VISITORPICTURE, 0, 0, strRemoteSIPID, 5000);   // 5초
                     if (ConfigValues.bUnoccupiedMode) {
                         sendHandlerMsgDelayed(HANDLERMSG.CALL_FORWARD, 0, 0, null, 15000);   // 15초
                     }
@@ -547,7 +547,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     MainActivity.mCallController.stop2ndCallTimer();
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
                     Global.change1stCallLogAction(CALLACTION.REJECT);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -597,7 +597,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     initCallVariables();
                     ((MainActivity) mContext).displayRemoteID(null);
                     Global.change1stCallLogAction(CALLACTION.CANCEL);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -632,7 +632,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.LOBBY, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         CALLSTATUS eLobbyCallStatus = MainActivity.mCallController.mCallInfo.getLOBBY();
 
@@ -686,7 +686,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                         MCInfo.setMulticallInfo(CALLTYPE.LOBBY, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)),
                                 Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
                         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);
 
                         CALLSTATUS eLobbyCallStatus = MainActivity.mCallController.mCallInfo.getLOBBY();
                         /**
@@ -740,7 +740,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                             MultiCallInfo MCInfo = new MultiCallInfo();
                             MCInfo.setMulticallInfo(CALLTYPE.FRONT, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                             MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                            Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                            //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
                             ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
                         }
                     } else {
@@ -754,13 +754,13 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                         MainActivity.mCallController.mCallInfo.setCallStatus(eMulticallType, CALLSTATUS.IDLE);
                         MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                         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!!");
 
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.LOBBY, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                     }
@@ -769,20 +769,20 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                 }
             } else if (eCallStatus == CALLSTATUS.CALLERID) {
                 MainActivity.mCallController.mCallInfo.updateMultiCallName(strRemoteSIPID);
-                Global.change2ndCallLogSIPID(CALLTYPE.PSTN.toString() + ":" + strRemoteSIPID);
+                //Global.change2ndCallLogSIPID(CALLTYPE.PSTN.toString() + ":" + strRemoteSIPID);
             } else if (eCallStatus == CALLSTATUS.END) {
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 if (MainActivity.mCallController.mCallInfo.getMultiCallType() == eCallType) {
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 } else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
             } else if (eCallStatus == CALLSTATUS.CANCEL) {
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 MainActivity.mCallController.stop2ndCallTimer();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
             } else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
                 // 거동수상자 녹화기능 수정중 (추후 동작상태보고 수정)
@@ -801,7 +801,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
 //                    ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
 //                }
                 doMultiCallReject();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
@@ -1008,7 +1008,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     MainActivity.mCallController.stop2ndCallTimer();
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
                     Global.change1stCallLogAction(CALLACTION.REJECT);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     nSelectedFilter = 0;
                     sendReliefFilterSelectBR(nSelectedFilter);
                     MainActivity.mCallController.MultiCallScenarioManager();
@@ -1182,7 +1182,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
             LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "], CallOwner [" + eCallOwner + "]");
             if (eMType == CALLTYPE.LOBBY && eMStatus == CALLSTATUS.CALLED) {
                 RemoteIDInfo.strIP = MainActivity.mCallController.mCallInfo.getMultiCall_IP();
-                Global.replace1stBy2ndCallHistory();
+                //Global.replace1stBy2ndCallHistory();
                 if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
                     // 멀티콜 수락 (통화시작)
                     bMultiCallAccept = true;
@@ -2080,7 +2080,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     break;
 
                 case HANDLERMSG.SAVE_VISITORPICTURE:
-                    if (bEnableVisitorPic) startSaveVisitorPicture(CALLTYPE.LOBBY, MainActivity.mCallController.mCallInfo.getLOBBY());
+                    //if (bEnableVisitorPic) startSaveVisitorPicture(CALLTYPE.LOBBY, MainActivity.mCallController.mCallInfo.getLOBBY());
                     break;
 
                 case HANDLERMSG.CALL_FORWARD:
@@ -2096,7 +2096,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
                     break;
 
                 case HANDLERMSG.TAKE_VISITORPICTURE:
-                    if (bEnableVisitorPic) startTakeVisitorPicture((String) msg.obj);
+                    //if (bEnableVisitorPic) startTakeVisitorPicture((String) msg.obj);
                     break;
 
                 case HANDLERMSG.FLICKER_LED_CALL:

+ 36 - 36
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkPSTN.java

@@ -280,7 +280,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
             MainActivity.mCallController.releaseDTMFEventListener();
             ((MainActivity) mContext).releaseMainEventListener();
             if (!MainActivity.mCallController.mCallInfo.getPSTNCallHold()) MainActivity.mPSTNController.sendHookOff();
-            Global.add1stCallHistoryInfoFinal();
+            //Global.add1stCallHistoryInfoFinal();
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } 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 strTXT_PSTNNO = strRemoteSIPID;
                     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) {
                     super.setFinishTimerDestroy();
@@ -561,7 +561,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                     MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                     initPSTNInfo();
                     updateScreen();
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     setOffCallLED();
                     MainActivity.mCallController.MultiCallScenarioManager();
                 } else if (eCallStatus == CALLSTATUS.CANCEL) {
@@ -620,7 +620,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
                         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);
@@ -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)),
                                 Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
                         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);
                     } else {
                         // 멀티콜 있음
@@ -659,7 +659,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", MainActivity.mCallController.mCallInfo.getMultiCall_Name(), strRemoteIP);
                         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);
                     } else {
                         // 멀티콜 있음
@@ -672,13 +672,13 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                             LOG_WARN("[onMultiCallEvent] Invalid eMulticallType [" + eMulticallType + "]");
                         MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                         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!!");
 
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.PSTN, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", NO_CID, strRemoteIP);
                         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, "");
                     }
@@ -695,7 +695,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                         MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                     ((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 } else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
             } 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.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
                     ((MainActivity) (getContext())).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 }
             } else if (eCallStatus == CALLSTATUS.TIMEOUT_2NDCALL) {
@@ -727,7 +727,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
                 if (MainActivity.mCallController.mPopupEventListener != null)
                     MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                 doMultiCallReject(false);
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 ((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)) {
                 doHookOnNDial(eCallOwner, 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) {
                 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) {
                 doHookOnNDial(eCallOwner, 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) {
                 MainActivity.mSound.StopRepeat();
                 doHookOn(eCallOwner);
@@ -1058,28 +1058,28 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
     private void redialPSTN() {
         try {
             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) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {
@@ -1159,7 +1159,7 @@ public class TalkPSTN extends WpadScreen implements CallEventListener, DTMFEvent
 
             LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "]");
             if (eMType == CALLTYPE.PSTN && eMStatus == CALLSTATUS.CALLED) {
-                Global.replace1stBy2ndCallHistory();
+                //Global.replace1stBy2ndCallHistory();
                 if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
                     // 멀티콜 수락 (통화시작)
                     super.setFinishTimerDestroy();

+ 14 - 14
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkResidence.java

@@ -364,7 +364,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
             ((MainActivity) mContext).releaseMainEventListener();
             MainActivity.mCallController.stop1stCallTimer();
             MainActivity.mCallController.stop2ndCallTimer();
-            Global.add1stCallHistoryInfoFinal();
+            //Global.add1stCallHistoryInfoFinal();
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {
@@ -654,7 +654,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                     }
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLING);
                     updateInstruction();
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
 
                     //strRemoteIP
                     //setTunkeyImage(0);
@@ -683,7 +683,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                     }
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
                     updateScreen();
-                    Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                    //Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
 
 
@@ -720,7 +720,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnRESIDENCE);
                     updateInstruction();
                     Global.change1stCallLogAction(CALLACTION.TALK);
-                    Global.add1stCallHistoryInfoFinal();
+                    //Global.add1stCallHistoryInfoFinal();
                     if(mbCallState)
                     {
                         String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
@@ -749,7 +749,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                     ((MainActivity) mContext).showMyVideo(true, true);
                     MainActivity.mCallController.mSIPInterface.videoSet(true, true, true);
                     MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnRESIDENCE); // 홈뷰어 타이머 3분
-                    Global.make1stCallHistoryInfo("HOMEVIEW", "HOMEVIEW", CALLDIRECTION.OUT, CALLACTION.HOMEVIEW, CALLRESULT.OUT_HONEVIEW); // 통화기록 - 발신:세대:홈뷰어
+                    //Global.make1stCallHistoryInfo("HOMEVIEW", "HOMEVIEW", CALLDIRECTION.OUT, CALLACTION.HOMEVIEW, CALLRESULT.OUT_HONEVIEW); // 통화기록 - 발신:세대:홈뷰어
                 }
                 else if (eCallStatus == CALLSTATUS.END) {
                     Global.stopMelodyRepeat();
@@ -911,7 +911,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.RESIDENCE, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "세대현관", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         CALLSTATUS eResidenceCallStatus = MainActivity.mCallController.mCallInfo.getRESI();
                         LOG("[onMultiCallEvent] eResidenceCallStatus [" + eResidenceCallStatus + "]");
@@ -971,7 +971,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                         MCInfo.setMulticallInfo(CALLTYPE.RESIDENCE, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, Integer.toString(MainActivity.mCallController.getRemoteDong(strRemoteSIPID)),
                                 Integer.toString(MainActivity.mCallController.getRemoteID(strRemoteSIPID)), MainActivity.mCallController.getRemoteName(strRemoteSIPID, strRemoteIP), strRemoteIP);
                         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);
 
                         CALLSTATUS eResidenceCallStatus = MainActivity.mCallController.mCallInfo.getRESI();
                         /**
@@ -1031,7 +1031,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.RESIDENCE, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         ((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL);
                     } else {
@@ -1046,13 +1046,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                         MainActivity.mCallController.mCallInfo.setCallStatus(eMulticallType, CALLSTATUS.IDLE);
                         MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                         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!!");
 
                         MultiCallInfo MCInfo = new MultiCallInfo();
                         MCInfo.setMulticallInfo(CALLTYPE.RESIDENCE, eCallType, eCallStatus, CALLOWNER.NONE, strRemoteSIPID, "", "", "NONE", strRemoteIP);
                         MainActivity.mCallController.mCallInfo.setMultiCallInfo(MCInfo);
-                        Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
+                        //Global.make2ndCallHistoryInfo(eCallType.toString(), "NONE", CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
 
                         MainActivity.mCallController.mPopupEventListener.onMulticallChange(eCallType, eCallStatus, "");
                     }
@@ -1067,14 +1067,14 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
                 if (MainActivity.mCallController.mCallInfo.getMultiCallType() == eCallType) {
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                     MainActivity.mCallController.stop2ndCallTimer();
-                    Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                    //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                     ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
                 } else LOG_WARN("[onMultiCallEvent] Invalid CallType [" + eCallType + "]");
             } else if (eCallStatus == CALLSTATUS.CANCEL) {
                 MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
                 MainActivity.mCallController.stop2ndCallTimer();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_REJECT);
                 ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
             } else if (eCallStatus == CALLSTATUS.FORWARD) {
                 Global.stopMelodyRepeat();
@@ -1097,7 +1097,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
 //                    ((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_MULTICALL);
 //                }
                 doMultiCallReject();
-                Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
+                //Global.add2ndCallHistoryInfo(CALLRESULT.IN_MISS);
                 if(MainActivity.mCallController.mCallInfo!=null)
                     MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
                 if(MainActivity.mCallController.mCallInfo!=null)
@@ -1581,7 +1581,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
             LOG("[procAddCall] eMType [" + eMType + "], eMStatus [" + eMStatus + "]");
             if (eMType == CALLTYPE.RESIDENCE && eMStatus == CALLSTATUS.CALLED) {
                 MainActivity.mCallController.setRemoteInfo(MainActivity.mCallController.mCallInfo.getMultiCall_ID(), MainActivity.mCallController.mCallInfo.getMultiCall_IP());
-                Global.replace1stBy2ndCallHistory();
+                //Global.replace1stBy2ndCallHistory();
                 if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
                     // 멀티콜 수락 (통화시작)
                     ((MainActivity) mContext).setMenuBTNEnable(false);