|
@@ -21,6 +21,7 @@ import android.widget.SeekBar;
|
|
import com.artncore.WallPadDataMgr.wallpaddbmgr;
|
|
import com.artncore.WallPadDataMgr.wallpaddbmgr;
|
|
import com.artncore.WallPadDataMgr.wallpaddbmgr.AddressSet;
|
|
import com.artncore.WallPadDataMgr.wallpaddbmgr.AddressSet;
|
|
import com.artncore.wallpadimap.RetProci;
|
|
import com.artncore.wallpadimap.RetProci;
|
|
|
|
+import com.util.LogUtil;
|
|
|
|
|
|
import kr.co.icontrols.callengine.engine.CallController.CallEventListener;
|
|
import kr.co.icontrols.callengine.engine.CallController.CallEventListener;
|
|
import kr.co.icontrols.callengine.engine.CallManager.CALLEVENTTYPE;
|
|
import kr.co.icontrols.callengine.engine.CallManager.CALLEVENTTYPE;
|
|
@@ -35,6 +36,7 @@ import kr.co.icontrols.wallpadcall.MainActivity.MAINEVENT;
|
|
import kr.co.icontrols.wallpadcall.MainActivity.MainEventListener;
|
|
import kr.co.icontrols.wallpadcall.MainActivity.MainEventListener;
|
|
import kr.co.icontrols.wallpadcall.R;
|
|
import kr.co.icontrols.wallpadcall.R;
|
|
import kr.co.icontrols.wallpadcall.declare.Common;
|
|
import kr.co.icontrols.wallpadcall.declare.Common;
|
|
|
|
+import kr.co.icontrols.wallpadcall.declare.DataClasses;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.MultiCallInfo;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.MultiCallInfo;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.RemoteIDInfo;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.RemoteIDInfo;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.SmartRFCamLEDMode;
|
|
import kr.co.icontrols.wallpadcall.declare.DataClasses.SmartRFCamLEDMode;
|
|
@@ -216,9 +218,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
}
|
|
}
|
|
displayScreenValues();
|
|
displayScreenValues();
|
|
sendHandlerMsg(HANDLERMSG.PROC_ADDCALL, 0, 0);
|
|
sendHandlerMsg(HANDLERMSG.PROC_ADDCALL, 0, 0);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] TalkGuard(Context context, RelativeLayout layout)");
|
|
Log.e(TAG, "[Exception] TalkGuard(Context context, RelativeLayout layout)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -243,9 +248,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(false, false);
|
|
if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(false, false);
|
|
MainActivity.mCallController.mVideoJNI.setDecoderInfo_V40(76, 85, 576, 405); // 영상 좌표 재설정 (세대 통화 멀티콜 이후 상황 대비)
|
|
MainActivity.mCallController.mVideoJNI.setDecoderInfo_V40(76, 85, 576, 405); // 영상 좌표 재설정 (세대 통화 멀티콜 이후 상황 대비)
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] Initialize()");
|
|
Log.e(TAG, "[Exception] Initialize()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -253,9 +261,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
try {
|
|
try {
|
|
RemoteIDInfo.InitVariables();
|
|
RemoteIDInfo.InitVariables();
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.GUARD, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.GUARD, CALLSTATUS.IDLE);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] initCallVariables()");
|
|
Log.e(TAG, "[Exception] initCallVariables()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -264,6 +275,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
super.onClose();
|
|
super.onClose();
|
|
try {
|
|
try {
|
|
LOG_INFO("[onClose]");
|
|
LOG_INFO("[onClose]");
|
|
|
|
+ MainActivity.m_bRejectCall = false;
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
if (MainActivity.mIOInterface != null) MainActivity.mIOInterface.ctrlWallPadLED_Call(false);
|
|
if (mPathCheckHandler != null) {
|
|
if (mPathCheckHandler != null) {
|
|
mPathCheckHandler.removeMessages(0);
|
|
mPathCheckHandler.removeMessages(0);
|
|
@@ -296,9 +308,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
Global.add1stCallHistoryInfoFinal();
|
|
Global.add1stCallHistoryInfoFinal();
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onClose()");
|
|
Log.e(TAG, "[Exception] onClose()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -307,9 +322,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
super.onBrReceive(intent);
|
|
super.onBrReceive(intent);
|
|
try {
|
|
try {
|
|
// LOG_INFO("[onBrReceive] intent : " + intent);
|
|
// LOG_INFO("[onBrReceive] intent : " + intent);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onBrReceive(Intent intent)");
|
|
Log.e(TAG, "[Exception] onBrReceive(Intent intent)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -338,6 +356,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
}
|
|
}
|
|
|
|
+ else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.TALKING) {
|
|
|
|
+ doTalk(CALLOWNER.WALLPAD);
|
|
|
|
+ }
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.MAINGATE) {
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.MAINGATE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
@@ -351,6 +372,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
}
|
|
}
|
|
|
|
+ else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.TALKING) {
|
|
|
|
+ doTalk(CALLOWNER.WALLPAD);
|
|
|
|
+ }
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.SUBGATE) {
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.SUBGATE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
@@ -364,6 +388,10 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
}
|
|
}
|
|
|
|
+ else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.TALKING) {
|
|
|
|
+ doTalk(CALLOWNER.WALLPAD);
|
|
|
|
+ }
|
|
|
|
+
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.OFFICE) {
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.OFFICE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.IDLE) {
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
@@ -377,6 +405,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
} else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.CALLED) {
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
}
|
|
}
|
|
|
|
+ else if (MainActivity.mCallController.mCallInfo.getGUARD() == CALLSTATUS.TALKING) {
|
|
|
|
+ doTalk(CALLOWNER.WALLPAD);
|
|
|
|
+ }
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.TALK) {
|
|
} else if (nID == ID.SCREEN.TALKGUARD.ELEMENT.BUTTON.TALK) {
|
|
Log.d(TAG, "[onTouchEvent] TALK BUTTON");
|
|
Log.d(TAG, "[onTouchEvent] TALK BUTTON");
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
@@ -385,9 +416,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onTouchEvent(View v, MotionEvent event)");
|
|
Log.e(TAG, "[Exception] onTouchEvent(View v, MotionEvent event)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -401,9 +435,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (eEvent == MAINEVENT.BTN_HOME_MOBILE) {
|
|
} else if (eEvent == MAINEVENT.BTN_HOME_MOBILE) {
|
|
finishWallpadCallApp();
|
|
finishWallpadCallApp();
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onMainTouchEvent(MAINEVENT eEvent)");
|
|
Log.e(TAG, "[Exception] onMainTouchEvent(MAINEVENT eEvent)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -426,7 +463,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
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.GUARD) {
|
|
|
|
|
|
+ if(eCallType == CALLTYPE.NONE)
|
|
|
|
+ eCallType = CALLTYPE.GUARD;
|
|
|
|
+
|
|
|
|
+ if(MainActivity.m_bRejectCall)
|
|
|
|
+ eCallType = CALLTYPE.GUARD;
|
|
|
|
+
|
|
|
|
+ if (eCallType == CALLTYPE.GUARD){
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
setBTNStatus(strRemoteIP);
|
|
setBTNStatus(strRemoteIP);
|
|
if (eCallStatus == CALLSTATUS.TRYING_CALL) {
|
|
if (eCallStatus == CALLSTATUS.TRYING_CALL) {
|
|
@@ -614,9 +657,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
onMultiCallEvent(eCallOwner, eCallStatus, eCallType, strRemoteIP, strRemoteSIPID, strMessage);
|
|
onMultiCallEvent(eCallOwner, eCallStatus, eCallType, strRemoteIP, strRemoteSIPID, strMessage);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage)");
|
|
Log.e(TAG, "[Exception] onCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -650,7 +696,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
- if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -707,7 +753,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
- if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -839,9 +885,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
LOG_WARN("[onMultiCallEvent] Invalid CallStatus [" + eCallStatus + "]");
|
|
LOG_WARN("[onMultiCallEvent] Invalid CallStatus [" + eCallStatus + "]");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onMultiCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage)");
|
|
Log.e(TAG, "[Exception] onMultiCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -880,9 +929,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
Log.w(TAG, "[onSubPhoneEvent] Incorrect eCallType!!! eCallType = " + eCallType);
|
|
Log.w(TAG, "[onSubPhoneEvent] Incorrect eCallType!!! eCallType = " + eCallType);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onSubPhoneEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strMessage)");
|
|
Log.e(TAG, "[Exception] onSubPhoneEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strMessage)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -901,9 +953,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (!bSet) ctrlAlphaBlending(bSet);
|
|
if (!bSet) ctrlAlphaBlending(bSet);
|
|
MainActivity.mCallController.mSIPInterface.videoSet(bSet, false, bSet);
|
|
MainActivity.mCallController.mSIPInterface.videoSet(bSet, false, bSet);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onVideoSet(boolean bSet, String strRemoteSIPID)");
|
|
Log.e(TAG, "[Exception] onVideoSet(boolean bSet, String strRemoteSIPID)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -912,9 +967,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
try {
|
|
try {
|
|
LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
if (ConfigValues.bGuardVideoEnable && MainActivity.bFFMPEGEnable) ((MainActivity) mContext).showRemoteVideo(bShow, false);
|
|
if (ConfigValues.bGuardVideoEnable && MainActivity.bFFMPEGEnable) ((MainActivity) mContext).showRemoteVideo(bShow, false);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onShowRemoteVideo(boolean bShow)");
|
|
Log.e(TAG, "[Exception] onShowRemoteVideo(boolean bShow)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -929,9 +987,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (nScreen == ID.POPUP.POPUP_MULTICALL) {
|
|
if (nScreen == ID.POPUP.POPUP_MULTICALL) {
|
|
if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.ACCEPT) {
|
|
if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.ACCEPT) {
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MUTICALL.ELEMENT.BUTTON.ACCEPT");
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MUTICALL.ELEMENT.BUTTON.ACCEPT");
|
|
- if (ConfigValues.bGuardVideoEnable) {
|
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
- }
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) {
|
|
|
|
+ //MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
+ //}
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallAccept();
|
|
doMultiCallAccept();
|
|
} else if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT) {
|
|
} else if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT) {
|
|
@@ -939,10 +997,10 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
- if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
}
|
|
}
|
|
- if (bFinish && ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 팝업 닫히면 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (bFinish && ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 팝업 닫히면 GUI 화면이 아래로(영상이 위로)
|
|
} else if (nScreen == ID.POPUP.POPUP_NOTICE_SUBPHONETALK) {
|
|
} else if (nScreen == ID.POPUP.POPUP_NOTICE_SUBPHONETALK) {
|
|
if (nID == ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END) {
|
|
if (nID == ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END) {
|
|
LOG_INFO("[onPopupResult] ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END");
|
|
LOG_INFO("[onPopupResult] ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END");
|
|
@@ -952,7 +1010,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else if (nScreen == ID.POPUP.POPUP_MULTICALL_NOTICE) {
|
|
} else if (nScreen == ID.POPUP.POPUP_MULTICALL_NOTICE) {
|
|
if (nID == ID.POPUP.MUTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM) {
|
|
if (nID == ID.POPUP.MUTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM) {
|
|
LOG_INFO("[onPopupResult] ID.POPUP.POPUP_MULTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM");
|
|
LOG_INFO("[onPopupResult] ID.POPUP.POPUP_MULTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM");
|
|
- if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 화면이 경비(영상)통화일 경우 멀티콜 알림 팝업 닫힐시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 화면이 경비(영상)통화일 경우 멀티콜 알림 팝업 닫힐시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
/**
|
|
/**
|
|
* JEFF, 2020.01.01
|
|
* JEFF, 2020.01.01
|
|
@@ -961,15 +1019,15 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
- if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable) MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
}
|
|
}
|
|
} else if (nScreen == ID.POPUP.POPUP_MULTICALL_RECORD) {
|
|
} else if (nScreen == ID.POPUP.POPUP_MULTICALL_RECORD) {
|
|
if (nID == ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.OK) {
|
|
if (nID == ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.OK) {
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.OK");
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.OK");
|
|
// [스마트현관카메라] 현재통화 종료 및 영상 녹화 시작
|
|
// [스마트현관카메라] 현재통화 종료 및 영상 녹화 시작
|
|
- if (ConfigValues.bGuardVideoEnable)
|
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable)
|
|
|
|
+ //MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallAccept();
|
|
doMultiCallAccept();
|
|
} else if (nID == ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.CANCEL) {
|
|
} else if (nID == ID.POPUP.MULTICALL_RECORD.ELEMENT.BUTTON.CANCEL) {
|
|
@@ -977,8 +1035,8 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
// [스마트현관카메라] 거동수상자 녹화 취소 및 현재 통화상태 유지
|
|
// [스마트현관카메라] 거동수상자 녹화 취소 및 현재 통화상태 유지
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
- if (ConfigValues.bGuardVideoEnable)
|
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 IHN-1010 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
|
|
|
+ //if (ConfigValues.bGuardVideoEnable)
|
|
|
|
+ // MainActivity.mIOInterface.ctrlPopupGUI(false); // 현재 통화패스가 IHN-1010 경비(영상)통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF); // LED OFF
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF); // LED OFF
|
|
((MainActivity) mContext).ctrlSmartIOTCamStatusMode(SmartRFCamStatusMode.STATUS_OFF); // MODE OFF
|
|
((MainActivity) mContext).ctrlSmartIOTCamStatusMode(SmartRFCamStatusMode.STATUS_OFF); // MODE OFF
|
|
@@ -990,9 +1048,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] onPopupResult(Intent data)");
|
|
Log.e(TAG, "[Exception] onPopupResult(Intent data)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1004,9 +1065,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
LOG_INFO("[doTalk] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getGUARD() + "]");
|
|
LOG_INFO("[doTalk] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getGUARD() + "]");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doTalk()");
|
|
Log.e(TAG, "[Exception] doTalk()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1039,9 +1103,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
RemoteIDInfo.InitVariables();
|
|
RemoteIDInfo.InitVariables();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doEnd() : " + e);
|
|
Log.e(TAG, "[Exception] doEnd() : " + e);
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1058,9 +1125,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
LOG_INFO("[doTalkByBTN] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getGUARD() + "]");
|
|
LOG_INFO("[doTalkByBTN] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getGUARD() + "]");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doTalkByBTN(CALLOWNER eCallOwner)");
|
|
Log.e(TAG, "[Exception] doTalkByBTN(CALLOWNER eCallOwner)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1068,9 +1138,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
try {
|
|
try {
|
|
MainActivity.mCallController.mCallInfo.setMultiCallAcceptFlag(true);
|
|
MainActivity.mCallController.mCallInfo.setMultiCallAcceptFlag(true);
|
|
doEnd();
|
|
doEnd();
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doMultiCallAccept()");
|
|
Log.e(TAG, "[Exception] doMultiCallAccept()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1085,16 +1158,20 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
MainActivity.mCallController.rejectMoIPMultiCall();
|
|
MainActivity.mCallController.rejectMoIPMultiCall();
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eMultiCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eMultiCallType, CALLSTATUS.IDLE);
|
|
} else if (eMultiCallType == CALLTYPE.PSTN) {
|
|
} else if (eMultiCallType == CALLTYPE.PSTN) {
|
|
- MainActivity.mPSTNController.sendReject();
|
|
|
|
|
|
+ if(MainActivity.mPSTNController!=null)
|
|
|
|
+ MainActivity.mPSTNController.sendReject();
|
|
MainActivity.mCallController.onPSTNEvent(CALLEVENTTYPE.CANCEL_CALL, null, null);
|
|
MainActivity.mCallController.onPSTNEvent(CALLEVENTTYPE.CANCEL_CALL, null, null);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eMultiCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eMultiCallType, CALLSTATUS.IDLE);
|
|
} else {
|
|
} else {
|
|
LOG_WARN("[doMultiCallReject] Invalid eMultiCallType [" + eMultiCallType + "]");
|
|
LOG_WARN("[doMultiCallReject] Invalid eMultiCallType [" + eMultiCallType + "]");
|
|
}
|
|
}
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doMultiCallReject()");
|
|
Log.e(TAG, "[Exception] doMultiCallReject()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1114,9 +1191,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
LOG("[doAutoCall] AutoCall is not activated!!");
|
|
LOG("[doAutoCall] AutoCall is not activated!!");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] doAutoCall() : " + e);
|
|
Log.e(TAG, "[Exception] doAutoCall() : " + e);
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1146,9 +1226,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
RemoteIDInfo.strHo = Integer.toString(nHo);
|
|
RemoteIDInfo.strHo = Integer.toString(nHo);
|
|
|
|
|
|
return send_check_sip_activation_request(strGuardIP);
|
|
return send_check_sip_activation_request(strGuardIP);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return false;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] tryGuardCall(CALLOWNER eCallOwner, int nGuardType)");
|
|
Log.e(TAG, "[Exception] tryGuardCall(CALLOWNER eCallOwner, int nGuardType)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(CALLOWNER.NONE);
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(CALLOWNER.NONE);
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
@@ -1157,9 +1241,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
private boolean tryGuardCallBySubPhone() {
|
|
private boolean tryGuardCallBySubPhone() {
|
|
try {
|
|
try {
|
|
return send_check_sip_activation_request(RemoteIDInfo.strIP);
|
|
return send_check_sip_activation_request(RemoteIDInfo.strIP);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return false;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] tryGuardCallBySubPhone()");
|
|
Log.e(TAG, "[Exception] tryGuardCallBySubPhone()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1184,13 +1272,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
setBTNStatus(MainActivity.mCallController.mCallInfo.getMultiCall_IP());
|
|
setBTNStatus(MainActivity.mCallController.mCallInfo.getMultiCall_IP());
|
|
MainActivity.mCallController.set1stCallTimer(eMType, MainActivity.mCallController.mCTT.CALLED);
|
|
MainActivity.mCallController.set1stCallTimer(eMType, MainActivity.mCallController.mCTT.CALLED);
|
|
|
|
|
|
- if (ConfigValues.bGuardVideoEnable) {
|
|
|
|
- if (MainActivity.mCallController.mCallInfo.getCallOwner() != CALLOWNER.WALLPAD) {
|
|
|
|
- MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.LOBBY, false);
|
|
|
|
- }
|
|
|
|
- ctrlAlphaBlending(true);
|
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
|
- }
|
|
|
|
|
|
+// if (ConfigValues.bGuardVideoEnable) {
|
|
|
|
+// if (MainActivity.mCallController.mCallInfo.getCallOwner() != CALLOWNER.WALLPAD) {
|
|
|
|
+// MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.LOBBY, false);
|
|
|
|
+// }
|
|
|
|
+// ctrlAlphaBlending(true);
|
|
|
|
+// MainActivity.mCallController.mSIPInterface.videoSet(true, false, true);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
((MainActivity) mContext).displayRemoteID(MainActivity.mCallController.mCallInfo.getMultiCall_Name());
|
|
((MainActivity) mContext).displayRemoteID(MainActivity.mCallController.mCallInfo.getMultiCall_Name());
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
@@ -1203,9 +1291,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
}
|
|
}
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
MainActivity.mCallController.mCallInfo.resetMultiCallInfo();
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] procAddCall()");
|
|
Log.e(TAG, "[Exception] procAddCall()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1222,42 +1313,54 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF);
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] playFrontCamBell(boolean bBell)");
|
|
Log.e(TAG, "[Exception] playFrontCamBell(boolean bBell)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
private boolean send_check_sip_activation_request(String strTargetIP) {
|
|
private boolean send_check_sip_activation_request(String strTargetIP) {
|
|
try {
|
|
try {
|
|
- Request_check_sip_activation check_sip_activation = new Request_check_sip_activation(mContext);
|
|
|
|
- if (check_sip_activation.send_check_sip_activation(strTargetIP, null)) {
|
|
|
|
- check_sip_activation.setResultCtrl(new RetProci() {
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public void ProcSuccess() {
|
|
|
|
- LOG_INFO("[send_check_sip_activation_request] ProcSuccess()");
|
|
|
|
- MainActivity.mCallController.tryMoIPCall(CALLTYPE.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public void ProcError() {
|
|
|
|
- LOG_INFO("[send_check_sip_activation_request] ProcError()");
|
|
|
|
- MainActivity.mSound.PlayMent(SND.setting.RETRY_ACTION);
|
|
|
|
- MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.GUARD, CALLSTATUS.IDLE);
|
|
|
|
- ((MainActivity) mContext).setMenuBTNEnable(true);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
- public void ProcDoing() {
|
|
|
|
- LOG_INFO("[send_check_sip_activation_request] ProcDoing()");
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
|
|
+ LOG_INFO("[send_check_sip_activation_request] " + RemoteIDInfo.strDong + " " + RemoteIDInfo.strHo);
|
|
|
|
+ MainActivity.mCallController.tryMoIPCall(CALLTYPE.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+// Request_check_sip_activation check_sip_activation = new Request_check_sip_activation(mContext);
|
|
|
|
+// if (check_sip_activation.send_check_sip_activation(strTargetIP, null)) {
|
|
|
|
+// check_sip_activation.setResultCtrl(new RetProci() {
|
|
|
|
+//
|
|
|
|
+// @Override
|
|
|
|
+// public void ProcSuccess() {
|
|
|
|
+// LOG_INFO("[send_check_sip_activation_request] ProcSuccess()");
|
|
|
|
+// MainActivity.mCallController.tryMoIPCall(CALLTYPE.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// @Override
|
|
|
|
+// public void ProcError() {
|
|
|
|
+// LOG_INFO("[send_check_sip_activation_request] ProcError()");
|
|
|
|
+// MainActivity.mCallController.tryMoIPCall(CALLTYPE.GUARD, RemoteIDInfo.strDong, RemoteIDInfo.strHo);
|
|
|
|
+//// MainActivity.mSound.PlayMent(SND.setting.RETRY_ACTION);
|
|
|
|
+//// MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.GUARD, CALLSTATUS.IDLE);
|
|
|
|
+//// ((MainActivity) mContext).setMenuBTNEnable(true);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// @Override
|
|
|
|
+// public void ProcDoing() {
|
|
|
|
+// LOG_INFO("[send_check_sip_activation_request] ProcDoing()");
|
|
|
|
+// }
|
|
|
|
+// });
|
|
|
|
+// return true;
|
|
|
|
+// }
|
|
|
|
+ return true;
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] send_check_sip_activation_request(String strTargetIP, String strMessage)");
|
|
Log.e(TAG, "[Exception] send_check_sip_activation_request(String strTargetIP, String strMessage)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
@@ -1287,9 +1390,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return false;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] tryAutoCall(String strAutoCallInfo)");
|
|
Log.e(TAG, "[Exception] tryAutoCall(String strAutoCallInfo)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1302,13 +1409,16 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
|| BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|| BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
if (bON) IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back_test_4);
|
|
if (bON) IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back_test_4);
|
|
else IMG_VIDEO_MODULE.setImageResource(R.drawable.image_guard);
|
|
else IMG_VIDEO_MODULE.setImageResource(R.drawable.image_guard);
|
|
- MainActivity.mIOInterface.ctrlPopupGUI(!bON);
|
|
|
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI(!bON);
|
|
} else {
|
|
} else {
|
|
Log.w(TAG, "[ctrlAlphaBlending] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
|
|
Log.w(TAG, "[ctrlAlphaBlending] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] ctrlAlphaBlending(boolean bON)");
|
|
Log.e(TAG, "[Exception] ctrlAlphaBlending(boolean bON)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1318,32 +1428,39 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
drawVolume();
|
|
drawVolume();
|
|
getGuardListInfo();
|
|
getGuardListInfo();
|
|
swap5thBTN(true);
|
|
swap5thBTN(true);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] displayScreenValues()");
|
|
Log.e(TAG, "[Exception] displayScreenValues()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
private void getGuardListInfo() {
|
|
private void getGuardListInfo() {
|
|
try {
|
|
try {
|
|
- int nGuardCnt = ConfigValues.mGuardListTable.getCnt();
|
|
|
|
|
|
+ DataClasses.GuardListTable table = ConfigValues.mGuardListTable;
|
|
|
|
+ int nGuardCnt = table.getCnt();
|
|
for (int i = 0; i < nGuardCnt; i++) {
|
|
for (int i = 0; i < nGuardCnt; i++) {
|
|
- String guardName = ConfigValues.mGuardListTable.getGuardInfo(i).NAME();
|
|
|
|
|
|
+ String guardName = table.getGuardInfo(i).NAME();
|
|
Log.d(TAG, "[getGuardListInfo] guardName [" + guardName + "]");
|
|
Log.d(TAG, "[getGuardListInfo] guardName [" + guardName + "]");
|
|
if (guardName.contains("관할") || guardName.equals("경비실")) {
|
|
if (guardName.contains("관할") || guardName.equals("경비실")) {
|
|
- strCONTROLGUARD_IP = ConfigValues.mGuardListTable.getGuardInfo(i).IP();
|
|
|
|
|
|
+ strCONTROLGUARD_IP = table.getGuardInfo(i).IP();
|
|
} else if (guardName.contains("정문")) {
|
|
} else if (guardName.contains("정문")) {
|
|
- strMAINGATEGUARD_IP = ConfigValues.mGuardListTable.getGuardInfo(i).IP();
|
|
|
|
|
|
+ strMAINGATEGUARD_IP = table.getGuardInfo(i).IP();
|
|
} else if (guardName.contains("후문")) {
|
|
} else if (guardName.contains("후문")) {
|
|
- strSUBGATEGUARD_IP = ConfigValues.mGuardListTable.getGuardInfo(i).IP();
|
|
|
|
|
|
+ strSUBGATEGUARD_IP = table.getGuardInfo(i).IP();
|
|
} else if (guardName.equals("관리실")) {
|
|
} else if (guardName.equals("관리실")) {
|
|
- strOFFICEGUARD_IP = ConfigValues.mGuardListTable.getGuardInfo(i).IP();
|
|
|
|
|
|
+ strOFFICEGUARD_IP = table.getGuardInfo(i).IP();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
setGuardBTNEnable(true);
|
|
setGuardBTNEnable(true);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] getGuardListInfo()");
|
|
Log.e(TAG, "[Exception] getGuardListInfo()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1355,6 +1472,9 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
String strResult = Addr.Dong;
|
|
String strResult = Addr.Dong;
|
|
LOG("[getDongString] strResult [" + strResult + "]");
|
|
LOG("[getDongString] strResult [" + strResult + "]");
|
|
return strResult;
|
|
return strResult;
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return null;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] getDongString()");
|
|
Log.e(TAG, "[Exception] getDongString()");
|
|
return null;
|
|
return null;
|
|
@@ -1419,9 +1539,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
}
|
|
}
|
|
swap5thBTN(false);
|
|
swap5thBTN(false);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] changeBTN_Activated(String strRemoteIP)");
|
|
Log.e(TAG, "[Exception] changeBTN_Activated(String strRemoteIP)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1518,9 +1641,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
BTN_SUBGATE.setButtonEventOffEnable(R.drawable.btn_guard_sub_disabled);
|
|
BTN_SUBGATE.setButtonEventOffEnable(R.drawable.btn_guard_sub_disabled);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] changeBTNImage_Selected(String strRemoteIP)");
|
|
Log.e(TAG, "[Exception] changeBTNImage_Selected(String strRemoteIP)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1557,9 +1683,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
setGuardBTNEnable(false);
|
|
setGuardBTNEnable(false);
|
|
setOffCallLED();
|
|
setOffCallLED();
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setBTNStatus(String strRemoteIP)");
|
|
Log.e(TAG, "[Exception] setBTNStatus(String strRemoteIP)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1574,9 +1703,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
} else {
|
|
} else {
|
|
setOffCallLED();
|
|
setOffCallLED();
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setBTNLEDStatus()");
|
|
Log.e(TAG, "[Exception] setBTNLEDStatus()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1607,13 +1739,17 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
BTN_CONTROL.setImageResource(R.drawable.btn_guard_ctrl_normal);
|
|
BTN_CONTROL.setImageResource(R.drawable.btn_guard_ctrl_normal);
|
|
}
|
|
}
|
|
if (strMAINGATEGUARD_IP.equals("NONE"))
|
|
if (strMAINGATEGUARD_IP.equals("NONE"))
|
|
- BTN_MAINGATE.setButtonEventOffEnable(R.drawable.btn_guard_main_disabled);
|
|
|
|
|
|
+ {
|
|
|
|
+ if(BTN_MAINGATE!=null) BTN_MAINGATE.setButtonEventOffEnable(R.drawable.btn_guard_main_disabled);
|
|
|
|
+ }
|
|
else {
|
|
else {
|
|
BTN_MAINGATE.setButtonEventOffDisable();
|
|
BTN_MAINGATE.setButtonEventOffDisable();
|
|
BTN_MAINGATE.setImageResource(R.drawable.btn_guard_main_normal);
|
|
BTN_MAINGATE.setImageResource(R.drawable.btn_guard_main_normal);
|
|
}
|
|
}
|
|
if (strSUBGATEGUARD_IP.equals("NONE"))
|
|
if (strSUBGATEGUARD_IP.equals("NONE"))
|
|
- BTN_SUBGATE.setButtonEventOffEnable(R.drawable.btn_guard_sub_disabled);
|
|
|
|
|
|
+ {
|
|
|
|
+ if(BTN_SUBGATE!=null)BTN_SUBGATE.setButtonEventOffEnable(R.drawable.btn_guard_sub_disabled);
|
|
|
|
+ }
|
|
else {
|
|
else {
|
|
BTN_SUBGATE.setButtonEventOffDisable();
|
|
BTN_SUBGATE.setButtonEventOffDisable();
|
|
BTN_SUBGATE.setImageResource(R.drawable.btn_guard_sub_normal);
|
|
BTN_SUBGATE.setImageResource(R.drawable.btn_guard_sub_normal);
|
|
@@ -1638,9 +1774,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
BTN_TALK.setImageResource(R.drawable.btn_guard_call_disabled);
|
|
BTN_TALK.setImageResource(R.drawable.btn_guard_call_disabled);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setGuardBTNEnable()");
|
|
Log.e(TAG, "[Exception] setGuardBTNEnable()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1667,9 +1806,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
BTN_END.setButtonEventOffEnable(R.drawable.btn_guard_end_disabled);
|
|
BTN_END.setButtonEventOffEnable(R.drawable.btn_guard_end_disabled);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] swap5thBTN(boolean bEND)");
|
|
Log.e(TAG, "[Exception] swap5thBTN(boolean bEND)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1690,9 +1832,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
BTN_END.setButtonEventOffEnable(R.drawable.btn_guard_end_disabled);
|
|
BTN_END.setButtonEventOffEnable(R.drawable.btn_guard_end_disabled);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] enableEndBTN(boolean bEnable)");
|
|
Log.e(TAG, "[Exception] enableEndBTN(boolean bEnable)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1706,9 +1851,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
bFlickeringCallLED = true;
|
|
bFlickeringCallLED = true;
|
|
sendHandlerMsg(HANDLERMSG.FLICKER_LED_CALL, 0, 0);
|
|
sendHandlerMsg(HANDLERMSG.FLICKER_LED_CALL, 0, 0);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] runFlickerCallLED()");
|
|
Log.e(TAG, "[Exception] runFlickerCallLED()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1719,9 +1867,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
bStatusFlickeringCallLED = true;
|
|
bStatusFlickeringCallLED = true;
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setOnCallLED()");
|
|
Log.e(TAG, "[Exception] setOnCallLED()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1735,9 +1886,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setOffCallLED()");
|
|
Log.e(TAG, "[Exception] setOffCallLED()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1764,9 +1918,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
LOG_INFO("[ctrlCallLED] bFlickeringCallLED [" + bFlickeringCallLED + "], bStatusFlickeringCallLED [" + bStatusFlickeringCallLED + "]");
|
|
LOG_INFO("[ctrlCallLED] bFlickeringCallLED [" + bFlickeringCallLED + "], bStatusFlickeringCallLED [" + bStatusFlickeringCallLED + "]");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] ctrlCallLED()");
|
|
Log.e(TAG, "[Exception] ctrlCallLED()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1778,7 +1935,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (nCurrentVolume != nCtrlLevel) {
|
|
if (nCurrentVolume != nCtrlLevel) {
|
|
nCurrentVolume = nCtrlLevel;
|
|
nCurrentVolume = nCtrlLevel;
|
|
showVolume(nCurrentVolume);
|
|
showVolume(nCurrentVolume);
|
|
-// ctrlVolume(false);
|
|
|
|
|
|
+ //ctrlVolume(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1798,9 +1955,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
private void getVolume() {
|
|
private void getVolume() {
|
|
try {
|
|
try {
|
|
nCurrentVolume = Global.getGuardVolume();
|
|
nCurrentVolume = Global.getGuardVolume();
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] getVolume()");
|
|
Log.e(TAG, "[Exception] getVolume()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1809,24 +1969,35 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if (!Global.setGuardVolume(nValue)) {
|
|
if (!Global.setGuardVolume(nValue)) {
|
|
LOG_WARN("[setVolume] Fail to set volume!! nValue [" + nValue + "]");
|
|
LOG_WARN("[setVolume] Fail to set volume!! nValue [" + nValue + "]");
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] setVolume()");
|
|
Log.e(TAG, "[Exception] setVolume()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
private void ctrlVolume(boolean bSave) {
|
|
private void ctrlVolume(boolean bSave) {
|
|
try {
|
|
try {
|
|
if (bSave) setVolume(nCurrentVolume);
|
|
if (bSave) setVolume(nCurrentVolume);
|
|
- CALLSTATUS eCallStatus = MainActivity.mCallController.mCallInfo.getGUARD();
|
|
|
|
|
|
+ CALLSTATUS eCallStatus;
|
|
|
|
+ if(MainActivity.m_bRejectCall)
|
|
|
|
+ eCallStatus = MainActivity.mCallController.mCallInfo.getRESI();
|
|
|
|
+ else
|
|
|
|
+ eCallStatus = MainActivity.mCallController.mCallInfo.getGUARD();
|
|
|
|
+
|
|
LOG("[ctrlVolume] eCallStatus [" + eCallStatus + "]");
|
|
LOG("[ctrlVolume] eCallStatus [" + eCallStatus + "]");
|
|
- if (eCallStatus == CALLSTATUS.TALKING) {
|
|
|
|
|
|
+ if ((eCallStatus == CALLSTATUS.TALKING) || (eCallStatus == CALLSTATUS.TRYING_CALL)) {
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) Global.setV40WallPadVolume(nCurrentVolume);
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) Global.setV40WallPadVolume(nCurrentVolume);
|
|
else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) Global.setV40WallPadVolume_GUARD(nCurrentVolume);
|
|
else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) Global.setV40WallPadVolume_GUARD(nCurrentVolume);
|
|
}
|
|
}
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] ctrlVolume()");
|
|
Log.e(TAG, "[Exception] ctrlVolume()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1835,9 +2006,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
// Log.d(TAG, "[showVolume] nValue [" + nValue + "]");
|
|
// Log.d(TAG, "[showVolume] nValue [" + nValue + "]");
|
|
if (TXT_VOLUME_LEVEL != null) TXT_VOLUME_LEVEL.setText(Integer.toString(nValue));
|
|
if (TXT_VOLUME_LEVEL != null) TXT_VOLUME_LEVEL.setText(Integer.toString(nValue));
|
|
else Log.w(TAG, "[showVolume] TXT_VOLUME_LEVEL is null!!");
|
|
else Log.w(TAG, "[showVolume] TXT_VOLUME_LEVEL is null!!");
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] showVolume(nValue)");
|
|
Log.e(TAG, "[Exception] showVolume(nValue)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1848,9 +2022,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
showVolume(nCurrentVolume);
|
|
showVolume(nCurrentVolume);
|
|
}
|
|
}
|
|
else Log.w(TAG, "[drawVolume] SEEKBAR_VOLUME is null!!");
|
|
else Log.w(TAG, "[drawVolume] SEEKBAR_VOLUME is null!!");
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] drawVolume()");
|
|
Log.e(TAG, "[Exception] drawVolume()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1862,9 +2039,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
if ((nValue % 10) != 0) result++;
|
|
if ((nValue % 10) != 0) result++;
|
|
Log.d(TAG, "[getCtrlLevel] result: " + result);
|
|
Log.d(TAG, "[getCtrlLevel] result: " + result);
|
|
return result;
|
|
return result;
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return 1;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] getCtrlLevel(nValue)");
|
|
Log.e(TAG, "[Exception] getCtrlLevel(nValue)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1877,9 +2058,13 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
else progress = (nValue - 1) * 11;
|
|
else progress = (nValue - 1) * 11;
|
|
|
|
|
|
return progress;
|
|
return progress;
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ return 1;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] ctrlSeekBarThumb()");
|
|
Log.e(TAG, "[Exception] ctrlSeekBarThumb()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1933,9 +2118,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
HandleMsg.arg1 = arg1;
|
|
HandleMsg.arg1 = arg1;
|
|
HandleMsg.arg2 = arg2;
|
|
HandleMsg.arg2 = arg2;
|
|
MainHandler.sendMessage(HandleMsg);
|
|
MainHandler.sendMessage(HandleMsg);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] sendHandlerMsg(msg)");
|
|
Log.e(TAG, "[Exception] sendHandlerMsg(msg)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1947,9 +2135,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
HandleMsg.arg1 = arg1;
|
|
HandleMsg.arg1 = arg1;
|
|
HandleMsg.arg2 = arg2;
|
|
HandleMsg.arg2 = arg2;
|
|
MainHandler.sendMessageDelayed(HandleMsg, delay);
|
|
MainHandler.sendMessageDelayed(HandleMsg, delay);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] sendHandlerMsgDelayed(msg)");
|
|
Log.e(TAG, "[Exception] sendHandlerMsgDelayed(msg)");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2092,9 +2283,12 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
doEnd();
|
|
doEnd();
|
|
if (MainActivity.mCallController.mCallInfo.getPSTNCallHold()) return;
|
|
if (MainActivity.mCallController.mCallInfo.getPSTNCallHold()) return;
|
|
((MainActivity) mContext).finishWallPadCall();
|
|
((MainActivity) mContext).finishWallPadCall();
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
Log.e(TAG, "[Exception] finishWallpadCallApp()");
|
|
Log.e(TAG, "[Exception] finishWallpadCallApp()");
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|