|
@@ -135,6 +135,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
int m_nIDCnt_type = 0;
|
|
int m_nIDCnt_type = 0;
|
|
boolean m_bCallStateThreadStop = true;
|
|
boolean m_bCallStateThreadStop = true;
|
|
|
|
|
|
|
|
+ Thread m_butUIThread = null;
|
|
|
|
+
|
|
class TextResources {
|
|
class TextResources {
|
|
static final String strDong = "동";
|
|
static final String strDong = "동";
|
|
static final String strHo = "호";
|
|
static final String strHo = "호";
|
|
@@ -280,14 +282,14 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
// ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
// ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
// }
|
|
// }
|
|
//
|
|
//
|
|
- TXT_RESIDENCEINFO = new WpadTextView(context, false, 292, 284, Gravity.LEFT, context.getResources().getColor(R.color.orange), Common.fontsize._46, false, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.RESIDENCEINFO);
|
|
|
|
- ViewRegistration(layout, TXT_RESIDENCEINFO, Common.ImgPosition.GetX(155), Common.ImgPosition.GetY(111));
|
|
|
|
- TXT_RESIDENCEINFO.setText(strTXT_RESIDENCEINFO);
|
|
|
|
- //TXT_RESIDENCEINFO.setVisibility(View.GONE);
|
|
|
|
-
|
|
|
|
- TXT_INSTRUCTION = new WpadTextView(context, false, 317, 364, Gravity.CENTER, context.getResources().getColor(R.color.orange), Common.fontsize._52, true, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.INSTRUCTION);
|
|
|
|
- ViewRegistration(layout, TXT_INSTRUCTION, Common.ImgPosition.GetX(142), Common.ImgPosition.GetY(255));
|
|
|
|
- TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
|
|
|
+// TXT_RESIDENCEINFO = new WpadTextView(context, false, 292, 284, Gravity.LEFT, context.getResources().getColor(R.color.orange), Common.fontsize._46, false, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.RESIDENCEINFO);
|
|
|
|
+// ViewRegistration(layout, TXT_RESIDENCEINFO, Common.ImgPosition.GetX(155), Common.ImgPosition.GetY(111));
|
|
|
|
+// TXT_RESIDENCEINFO.setText(strTXT_RESIDENCEINFO);
|
|
|
|
+// //TXT_RESIDENCEINFO.setVisibility(View.GONE);
|
|
|
|
+//
|
|
|
|
+// TXT_INSTRUCTION = new WpadTextView(context, false, 317, 364, Gravity.CENTER, context.getResources().getColor(R.color.orange), Common.fontsize._52, true, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.INSTRUCTION);
|
|
|
|
+// ViewRegistration(layout, TXT_INSTRUCTION, Common.ImgPosition.GetX(142), Common.ImgPosition.GetY(255));
|
|
|
|
+// TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
//TXT_INSTRUCTION.setVisibility(View.GONE);
|
|
//TXT_INSTRUCTION.setVisibility(View.GONE);
|
|
|
|
|
|
displayScreenValues();
|
|
displayScreenValues();
|
|
@@ -322,7 +324,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(false, false);
|
|
if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(false, false);
|
|
|
|
|
|
- MainActivity.mCallController.mVideoJNI.setDecoderInfo_V40(116, 85, 576, 405); // 세대통화시 영상 좌표 재설정
|
|
|
|
|
|
+ //MainActivity.mCallController.mVideoJNI.setDecoderInfo_V40(116, 85, 576, 405); // 세대통화시 영상 좌표 재설정
|
|
//MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 세대통화 시작시 초기화
|
|
//MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 세대통화 시작시 초기화
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -360,7 +362,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
}
|
|
}
|
|
mbCallState = false;
|
|
mbCallState = false;
|
|
|
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
|
|
+ //MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
MainActivity.mCallController.releaseCallEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
((MainActivity) mContext).releaseMainEventListener();
|
|
@@ -677,7 +679,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
doEnd();
|
|
doEnd();
|
|
LOG_INFO("[onCallEvent] eCallType none END");
|
|
LOG_INFO("[onCallEvent] eCallType none END");
|
|
}
|
|
}
|
|
- }, 1000);
|
|
|
|
|
|
+ }, 0);
|
|
|
|
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -738,8 +740,9 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
if (strRemoteIP.equals(strEndIP[i])) {
|
|
if (strRemoteIP.equals(strEndIP[i])) {
|
|
|
|
|
|
CallStateThread nr = new CallStateThread(i) ;
|
|
CallStateThread nr = new CallStateThread(i) ;
|
|
- Thread t = new Thread(nr) ;
|
|
|
|
- t.start() ;
|
|
|
|
|
|
+ m_butUIThread = new Thread(nr) ;
|
|
|
|
+ m_butUIThread.start() ;
|
|
|
|
+
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -747,6 +750,11 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
m_bCallStateThreadStop = false;
|
|
m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ //m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
|
|
((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
@@ -797,18 +805,30 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
}
|
|
}
|
|
else if (eCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
else if (eCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
LOG_WARN("[onCallEvent] MOBILE HOMEVIEW!!!!");
|
|
LOG_WARN("[onCallEvent] MOBILE HOMEVIEW!!!!");
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
// [방문객원격통화] 모바일에서 홈뷰어 요청 -> 모바일 기기로 월패드카메라 인코딩 영상 전송
|
|
// [방문객원격통화] 모바일에서 홈뷰어 요청 -> 모바일 기기로 월패드카메라 인코딩 영상 전송
|
|
((MainActivity) mContext).showRemoteCallNoticeText(true); // 방문객원격통화 팝업 삭제 -> 상단 문구로 대체
|
|
((MainActivity) mContext).showRemoteCallNoticeText(true); // 방문객원격통화 팝업 삭제 -> 상단 문구로 대체
|
|
// ((MainActivity) mContext).StartPopup(ID.POPUP.POPUP_NOTICE_REMOTECALL);
|
|
// ((MainActivity) mContext).StartPopup(ID.POPUP.POPUP_NOTICE_REMOTECALL);
|
|
prepareMyVideo(true);
|
|
prepareMyVideo(true);
|
|
((MainActivity) mContext).showMyVideo(true, true);
|
|
((MainActivity) mContext).showMyVideo(true, true);
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(true, true, true);
|
|
|
|
|
|
+ //MainActivity.mCallController.mSIPInterface.videoSet(true, true, true);
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnRESIDENCE); // 홈뷰어 타이머 3분
|
|
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) {
|
|
else if (eCallStatus == CALLSTATUS.END) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
bRemoteVideoShow = false;
|
|
bRemoteVideoShow = false;
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ //m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
prepareMyVideo(false);
|
|
prepareMyVideo(false);
|
|
}
|
|
}
|
|
@@ -832,6 +852,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
} else if (eCallStatus == CALLSTATUS.REJECT) {
|
|
} else if (eCallStatus == CALLSTATUS.REJECT) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
|
|
+
|
|
if(mbCallState)
|
|
if(mbCallState)
|
|
{
|
|
{
|
|
String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
@@ -866,6 +893,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
bRemoteVideoShow = false;
|
|
bRemoteVideoShow = false;
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
prepareMyVideo(false);
|
|
prepareMyVideo(false);
|
|
}
|
|
}
|
|
@@ -889,6 +923,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
} else if (eCallStatus == CALLSTATUS.CANCEL) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
bRemoteVideoShow = false;
|
|
bRemoteVideoShow = false;
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
prepareMyVideo(false);
|
|
prepareMyVideo(false);
|
|
}
|
|
}
|
|
@@ -908,11 +948,24 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
} else if (eCallStatus == CALLSTATUS.FORWARD) {
|
|
} else if (eCallStatus == CALLSTATUS.FORWARD) {
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
bRemoteVideoShow = false;
|
|
bRemoteVideoShow = false;
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.stop1stCallTimer();
|
|
MainActivity.mCallController.stop1stCallTimer();
|
|
tryAutoCall(strMessage);
|
|
tryAutoCall(strMessage);
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_1STCALL) {
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_1STCALL) {
|
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
|
+ if(m_butUIThread != null)
|
|
|
|
+ {
|
|
|
|
+ //m_butUIThread.stop();
|
|
|
|
+ m_butUIThread = null;
|
|
|
|
+ }
|
|
|
|
+
|
|
if(mbCallState)
|
|
if(mbCallState)
|
|
{
|
|
{
|
|
String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
@@ -1215,86 +1268,86 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void onVideoSet(boolean bSet, String strRemoteSIPID) {
|
|
public void onVideoSet(boolean bSet, String strRemoteSIPID) {
|
|
- try {
|
|
|
|
- LOG_INFO("[onVideoSet] bSet [" + bSet + "], strRemoteSIPID [" + strRemoteSIPID + "]");
|
|
|
|
- if (bSet) {
|
|
|
|
- if (!strRemoteSIPID.contains(DEVICENAME.strType_Resi)) {
|
|
|
|
- Log.e(TAG, "[onVideoSet] Device name is not matched!!!");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
|
- Log.i(TAG, "[onVideoSet] ConfigValues.bWallPadCameraEnable [" + ConfigValues.bWallPadCameraEnable + "]");
|
|
|
|
- if (ConfigValues.bWallPadCameraEnable) {
|
|
|
|
- if (!bSet) showMyVideo(bSet);
|
|
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(bSet, bSet, bSet);
|
|
|
|
-// if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
|
-// MainActivity.mCallController.mSIPInterface.videoSet(bSet, bSet, bSet);
|
|
|
|
-// }
|
|
|
|
-// else {
|
|
|
|
-// Log.i(TAG, "[onVideoSet] CallStatus is NOT TALKING!!");
|
|
|
|
-// }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- Log.w(TAG, "[onVideoSet] Wallpad camera is not enabled!!");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- LOG_WARN("[onVideoSet] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
|
- }
|
|
|
|
- } catch (RuntimeException re) {
|
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- Log.e(TAG, "[Exception] onVideoSet(boolean bSet, String strRemoteSIPID)");
|
|
|
|
- //e.printStackTrace();
|
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
- }
|
|
|
|
|
|
+// try {
|
|
|
|
+// LOG_INFO("[onVideoSet] bSet [" + bSet + "], strRemoteSIPID [" + strRemoteSIPID + "]");
|
|
|
|
+// if (bSet) {
|
|
|
|
+// if (!strRemoteSIPID.contains(DEVICENAME.strType_Resi)) {
|
|
|
|
+// Log.e(TAG, "[onVideoSet] Device name is not matched!!!");
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
|
+// Log.i(TAG, "[onVideoSet] ConfigValues.bWallPadCameraEnable [" + ConfigValues.bWallPadCameraEnable + "]");
|
|
|
|
+// if (ConfigValues.bWallPadCameraEnable) {
|
|
|
|
+// if (!bSet) showMyVideo(bSet);
|
|
|
|
+// MainActivity.mCallController.mSIPInterface.videoSet(bSet, bSet, bSet);
|
|
|
|
+//// if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
|
+//// MainActivity.mCallController.mSIPInterface.videoSet(bSet, bSet, bSet);
|
|
|
|
+//// }
|
|
|
|
+//// else {
|
|
|
|
+//// Log.i(TAG, "[onVideoSet] CallStatus is NOT TALKING!!");
|
|
|
|
+//// }
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// Log.w(TAG, "[onVideoSet] Wallpad camera is not enabled!!");
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// LOG_WARN("[onVideoSet] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
|
+// }
|
|
|
|
+// } catch (RuntimeException re) {
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// Log.e(TAG, "[Exception] onVideoSet(boolean bSet, String strRemoteSIPID)");
|
|
|
|
+// //e.printStackTrace();
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
boolean bRemoteVideoShow = false;
|
|
boolean bRemoteVideoShow = false;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void onShowRemoteVideo(boolean bShow) {
|
|
public void onShowRemoteVideo(boolean bShow) {
|
|
- try {
|
|
|
|
- LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40
|
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
|
- bRemoteVideoShow = bShow;
|
|
|
|
- LOG("[onShowRemoteVideo] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
|
-
|
|
|
|
- if (MainActivity.bFFMPEGEnable) {
|
|
|
|
- ((MainActivity)mContext).showRemoteVideo(bShow, true);
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- CALLOWNER eCallOwner = MainActivity.mCallController.mCallInfo.getCallOwner();
|
|
|
|
- CALLSTATUS eMultiCallStatus = MainActivity.mCallController.mCallInfo.getMultiCallStatus();
|
|
|
|
- LOG("[onShowRemoteVideo] eCallOwner [" + eCallOwner + "], eMultiCallStatus [" + eMultiCallStatus + "]");
|
|
|
|
- if (eCallOwner == CALLOWNER.WALLPAD) {
|
|
|
|
- if (eMultiCallStatus == CALLSTATUS.IDLE) {
|
|
|
|
- LOG("[onShowRemoteVideo] =========== POPUP X =========== (display remote video)");
|
|
|
|
- ctrlAlphaBlending(bShow); // 팝업(서브폰통화, 멀티콜)이 떠있지 않는 경우만 원격지 영상 출력-> 팝업 짤림 (02.12.01 seulki)
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- LOG_WARN("[onShowRemoteVideo] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
|
- }
|
|
|
|
- } catch (RuntimeException re) {
|
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- Log.e(TAG, "[Exception] onShowRemoteVideo(boolean bShow)");
|
|
|
|
- //e.printStackTrace();
|
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
- }
|
|
|
|
|
|
+// try {
|
|
|
|
+// LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
|
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40
|
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
|
+// bRemoteVideoShow = bShow;
|
|
|
|
+// LOG("[onShowRemoteVideo] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
|
+//
|
|
|
|
+// if (MainActivity.bFFMPEGEnable) {
|
|
|
|
+// ((MainActivity)mContext).showRemoteVideo(bShow, true);
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// CALLOWNER eCallOwner = MainActivity.mCallController.mCallInfo.getCallOwner();
|
|
|
|
+// CALLSTATUS eMultiCallStatus = MainActivity.mCallController.mCallInfo.getMultiCallStatus();
|
|
|
|
+// LOG("[onShowRemoteVideo] eCallOwner [" + eCallOwner + "], eMultiCallStatus [" + eMultiCallStatus + "]");
|
|
|
|
+// if (eCallOwner == CALLOWNER.WALLPAD) {
|
|
|
|
+// if (eMultiCallStatus == CALLSTATUS.IDLE) {
|
|
|
|
+// LOG("[onShowRemoteVideo] =========== POPUP X =========== (display remote video)");
|
|
|
|
+// ctrlAlphaBlending(bShow); // 팝업(서브폰통화, 멀티콜)이 떠있지 않는 경우만 원격지 영상 출력-> 팝업 짤림 (02.12.01 seulki)
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// LOG_WARN("[onShowRemoteVideo] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
|
+// }
|
|
|
|
+// } catch (RuntimeException re) {
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// Log.e(TAG, "[Exception] onShowRemoteVideo(boolean bShow)");
|
|
|
|
+// //e.printStackTrace();
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1308,7 +1361,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
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");
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
|
|
+ //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) {
|
|
@@ -1489,8 +1542,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
bshowMyVideo = false;
|
|
bshowMyVideo = false;
|
|
prepareMyVideo(false);
|
|
prepareMyVideo(false);
|
|
showMyVideo(false);
|
|
showMyVideo(false);
|
|
- MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
- MainActivity.mCallController.mVideoJNI.encoderStopOperation();
|
|
|
|
|
|
+ //MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
|
+ //MainActivity.mCallController.mVideoJNI.encoderStopOperation();
|
|
} else {
|
|
} else {
|
|
LOG_INFO("[doEnd] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getRESI() + "]");
|
|
LOG_INFO("[doEnd] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getRESI() + "]");
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
@@ -2013,65 +2066,65 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
private void updateResidenceInfo() {
|
|
private void updateResidenceInfo() {
|
|
try {
|
|
try {
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
|
- if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
|
|
- if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
- // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
- RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
- RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
- }
|
|
|
|
- strTXT_RESIDENCEINFO = RemoteIDInfo.strDong;
|
|
|
|
- } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO) {
|
|
|
|
- if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
- // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
- RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
- RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
- }
|
|
|
|
- strTXT_RESIDENCEINFO = RemoteIDInfo.strDong + TextResources.strDong;
|
|
|
|
-
|
|
|
|
- if (RemoteIDInfo.strHo.length() > 0) {
|
|
|
|
- // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
- RemoteIDInfo.nHo = Integer.parseInt(RemoteIDInfo.strHo);
|
|
|
|
- RemoteIDInfo.strHo = Integer.toString(RemoteIDInfo.nHo);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (ConfigValues.bEnableHouseDivision && RemoteIDInfo.bRentRoomSelected)
|
|
|
|
- strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + "-" + RemoteIDInfo.nHo_Extension;
|
|
|
|
- else strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo;
|
|
|
|
- } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
|
|
- if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
- // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
- RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
- RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
- }
|
|
|
|
- strTXT_RESIDENCEINFO = RemoteIDInfo.strDong + TextResources.strDong;
|
|
|
|
-
|
|
|
|
- if (RemoteIDInfo.strHo.length() > 0) {
|
|
|
|
- // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
- RemoteIDInfo.nHo = Integer.parseInt(RemoteIDInfo.strHo);
|
|
|
|
- RemoteIDInfo.strHo = Integer.toString(RemoteIDInfo.nHo);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (ConfigValues.bEnableHouseDivision && RemoteIDInfo.bRentRoomSelected)
|
|
|
|
- strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + "-" + RemoteIDInfo.nHo_Extension + TextResources.strHo;
|
|
|
|
- else strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + TextResources.strHo;
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- LOG_WARN("[updateResidenceInfo] Call Status is not IDLE!!!");
|
|
|
|
- strTXT_RESIDENCEINFO = RemoteIDInfo.strName;
|
|
|
|
- }
|
|
|
|
|
|
+// if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
|
+// if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
|
|
+// if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
+// // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
+// RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
+// RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
+// }
|
|
|
|
+// strTXT_RESIDENCEINFO = RemoteIDInfo.strDong;
|
|
|
|
+// } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO) {
|
|
|
|
+// if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
+// // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
+// RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
+// RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
+// }
|
|
|
|
+// strTXT_RESIDENCEINFO = RemoteIDInfo.strDong + TextResources.strDong;
|
|
|
|
+//
|
|
|
|
+// if (RemoteIDInfo.strHo.length() > 0) {
|
|
|
|
+// // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
+// RemoteIDInfo.nHo = Integer.parseInt(RemoteIDInfo.strHo);
|
|
|
|
+// RemoteIDInfo.strHo = Integer.toString(RemoteIDInfo.nHo);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (ConfigValues.bEnableHouseDivision && RemoteIDInfo.bRentRoomSelected)
|
|
|
|
+// strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + "-" + RemoteIDInfo.nHo_Extension;
|
|
|
|
+// else strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo;
|
|
|
|
+// } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
|
|
+// if (RemoteIDInfo.strDong.length() > 0) {
|
|
|
|
+// // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
+// RemoteIDInfo.nDong = Integer.parseInt(RemoteIDInfo.strDong);
|
|
|
|
+// RemoteIDInfo.strDong = Integer.toString(RemoteIDInfo.nDong);
|
|
|
|
+// }
|
|
|
|
+// strTXT_RESIDENCEINFO = RemoteIDInfo.strDong + TextResources.strDong;
|
|
|
|
+//
|
|
|
|
+// if (RemoteIDInfo.strHo.length() > 0) {
|
|
|
|
+// // 첫자리에 "0"이 출력되지 않도록 숫자로 변경하면서 "0"을 제거하고, 다시 String으로 변환한다.
|
|
|
|
+// RemoteIDInfo.nHo = Integer.parseInt(RemoteIDInfo.strHo);
|
|
|
|
+// RemoteIDInfo.strHo = Integer.toString(RemoteIDInfo.nHo);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (ConfigValues.bEnableHouseDivision && RemoteIDInfo.bRentRoomSelected)
|
|
|
|
+// strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + "-" + RemoteIDInfo.nHo_Extension + TextResources.strHo;
|
|
|
|
+// else strTXT_RESIDENCEINFO += "\n" + RemoteIDInfo.strHo + TextResources.strHo;
|
|
|
|
+// }
|
|
|
|
+// } else {
|
|
|
|
+// LOG_WARN("[updateResidenceInfo] Call Status is not IDLE!!!");
|
|
|
|
+// strTXT_RESIDENCEINFO = RemoteIDInfo.strName;
|
|
|
|
+// }
|
|
|
|
|
|
// 2017.11.16 SEULKI
|
|
// 2017.11.16 SEULKI
|
|
// '세대정보를 입력하세요.' 화면에서 동/호 입력한 경우, 동/호 텍스트만 나오게
|
|
// '세대정보를 입력하세요.' 화면에서 동/호 입력한 경우, 동/호 텍스트만 나오게
|
|
- if (!strTXT_RESIDENCEINFO.equals("") && (strTXT_INSTRUCTION.equals(TextResources.strInputResidenceInfo)))
|
|
|
|
- strTXT_INSTRUCTION = "";
|
|
|
|
|
|
+ //if (!strTXT_RESIDENCEINFO.equals("") && (strTXT_INSTRUCTION.equals(TextResources.strInputResidenceInfo)))
|
|
|
|
+ // strTXT_INSTRUCTION = "";
|
|
|
|
|
|
// 동/호 텍스트 지웠을 경우, 다시 '세대정보를 입력하세요.' 텍스트 나오게
|
|
// 동/호 텍스트 지웠을 경우, 다시 '세대정보를 입력하세요.' 텍스트 나오게
|
|
- if (strTXT_RESIDENCEINFO.equals("") && (strTXT_INSTRUCTION.equals("")))
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strInputResidenceInfo;
|
|
|
|
|
|
+ //if (strTXT_RESIDENCEINFO.equals("") && (strTXT_INSTRUCTION.equals("")))
|
|
|
|
+ //strTXT_INSTRUCTION = TextResources.strInputResidenceInfo;
|
|
|
|
|
|
- TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
|
- TXT_RESIDENCEINFO.setText(strTXT_RESIDENCEINFO);
|
|
|
|
|
|
+ //TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
|
+ //TXT_RESIDENCEINFO.setText(strTXT_RESIDENCEINFO);
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -2115,27 +2168,32 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
private void updateInstruction() {
|
|
private void updateInstruction() {
|
|
try {
|
|
try {
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strInputResidenceInfo;
|
|
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TRYING_CALL) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strTryingResidence;
|
|
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.WAITNG_INVITE_ACK) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strCallingResidence;
|
|
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLING) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strCallingResidence;
|
|
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLED) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strCalledResidence;
|
|
|
|
|
|
+// if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strInputResidenceInfo;
|
|
|
|
+// } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TRYING_CALL) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strTryingResidence;
|
|
|
|
+// } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.WAITNG_INVITE_ACK) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strCallingResidence;
|
|
|
|
+// } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLING) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strCallingResidence;
|
|
|
|
+// } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLED) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strCalledResidence;
|
|
|
|
+// Global.TargetInputStep = TARGETINFOINPUTSTEP.DONE;
|
|
|
|
+// } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
|
+// strTXT_INSTRUCTION = TextResources.strTalkingResidence;
|
|
|
|
+// if (MainActivity.mCallController.bTalkTestModeEnable) {
|
|
|
|
+// strTXT_INSTRUCTION = strTXT_INSTRUCTION + " [음량 " + Global.getWallPadMoIPVolume() + "]";
|
|
|
|
+// }
|
|
|
|
+// } else {
|
|
|
|
+// strTXT_INSTRUCTION = "";
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// //TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
|
+
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLED) {
|
|
|
|
+ //strTXT_INSTRUCTION = TextResources.strCalledResidence;
|
|
Global.TargetInputStep = TARGETINFOINPUTSTEP.DONE;
|
|
Global.TargetInputStep = TARGETINFOINPUTSTEP.DONE;
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
|
- strTXT_INSTRUCTION = TextResources.strTalkingResidence;
|
|
|
|
- if (MainActivity.mCallController.bTalkTestModeEnable) {
|
|
|
|
- strTXT_INSTRUCTION = strTXT_INSTRUCTION + " [음량 " + Global.getWallPadMoIPVolume() + "]";
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- strTXT_INSTRUCTION = "";
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
- TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -2180,14 +2238,14 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
// }
|
|
// }
|
|
|
|
|
|
// 통화상대 정보
|
|
// 통화상대 정보
|
|
- ((MainActivity) mContext).displayRemoteID(null);
|
|
|
|
|
|
+ //((MainActivity) mContext).displayRemoteID(null);
|
|
} else {
|
|
} else {
|
|
// 세대정보/안내문구
|
|
// 세대정보/안내문구
|
|
|
|
|
|
if(MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE)
|
|
if(MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE)
|
|
{
|
|
{
|
|
- TXT_RESIDENCEINFO.setVisibility(View.INVISIBLE);
|
|
|
|
- TXT_INSTRUCTION.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
+ //TXT_RESIDENCEINFO.setVisibility(View.INVISIBLE);
|
|
|
|
+ //TXT_INSTRUCTION.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
@@ -2213,10 +2271,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
// if(BTN_TENKEY[i]!=null)
|
|
// if(BTN_TENKEY[i]!=null)
|
|
// BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
// BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
// }
|
|
// }
|
|
- IMG_VIDEO_MODULE.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
+ //IMG_VIDEO_MODULE.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
// 통화상대 정보
|
|
// 통화상대 정보
|
|
- ((MainActivity) mContext).displayRemoteID(null);
|
|
|
|
|
|
+ //((MainActivity) mContext).displayRemoteID(null);
|
|
}
|
|
}
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -2228,35 +2286,35 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
}
|
|
}
|
|
|
|
|
|
private void showMyVideo(boolean bShow) {
|
|
private void showMyVideo(boolean bShow) {
|
|
- try {
|
|
|
|
- LOG_INFO("[showMyVideo] bShow [" + bShow + "]");
|
|
|
|
-
|
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) {
|
|
|
|
- LOG_INFO("[showMyVideo] CallStatus is NOT TALKING!!");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (BTN_PORTRAIT != null) {
|
|
|
|
- bshowMyVideo = bShow;
|
|
|
|
- LOG_INFO("[showMyVideo] bshowMyVideo [" + bshowMyVideo + "]");
|
|
|
|
- ((MainActivity) mContext).showMyVideo(bshowMyVideo, false);
|
|
|
|
- if (bShow) {
|
|
|
|
- BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_selected);
|
|
|
|
- } else {
|
|
|
|
- BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_normal3);
|
|
|
|
- }
|
|
|
|
- //MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- LOG_WARN("[showMyVideo] BTN_PORTRAIT is null!!");
|
|
|
|
- }
|
|
|
|
- } catch (RuntimeException re) {
|
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- Log.e(TAG, "[Exception] showMyVideo(boolean bShow)");
|
|
|
|
- //e.printStackTrace();
|
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
- }
|
|
|
|
|
|
+// try {
|
|
|
|
+// LOG_INFO("[showMyVideo] bShow [" + bShow + "]");
|
|
|
|
+//
|
|
|
|
+// if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) {
|
|
|
|
+// LOG_INFO("[showMyVideo] CallStatus is NOT TALKING!!");
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// if (BTN_PORTRAIT != null) {
|
|
|
|
+// bshowMyVideo = bShow;
|
|
|
|
+// LOG_INFO("[showMyVideo] bshowMyVideo [" + bshowMyVideo + "]");
|
|
|
|
+// ((MainActivity) mContext).showMyVideo(bshowMyVideo, false);
|
|
|
|
+// if (bShow) {
|
|
|
|
+// BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_selected);
|
|
|
|
+// } else {
|
|
|
|
+// BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_normal3);
|
|
|
|
+// }
|
|
|
|
+// //MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// LOG_WARN("[showMyVideo] BTN_PORTRAIT is null!!");
|
|
|
|
+// }
|
|
|
|
+// } catch (RuntimeException re) {
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// Log.e(TAG, "[Exception] showMyVideo(boolean bShow)");
|
|
|
|
+// //e.printStackTrace();
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
boolean bMyVideoPrepared = false;
|
|
boolean bMyVideoPrepared = false;
|
|
@@ -2961,6 +3019,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
private void finishWallpadCallApp() {
|
|
private void finishWallpadCallApp() {
|
|
try {
|
|
try {
|
|
doEnd();
|
|
doEnd();
|
|
|
|
+ Thread.sleep(500);
|
|
((MainActivity) mContext).finishWallPadCall();
|
|
((MainActivity) mContext).finishWallPadCall();
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -2970,4 +3029,4 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-}
|
|
|
|
|
|
+}
|