|
@@ -176,8 +176,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
SEEKBAR_VOLUME.setMax(100);
|
|
SEEKBAR_VOLUME.setMax(100);
|
|
|
SEEKBAR_VOLUME.setOnSeekBarChangeListener(mOnVolumeChangeListener);
|
|
SEEKBAR_VOLUME.setOnSeekBarChangeListener(mOnVolumeChangeListener);
|
|
|
layout.addView(volumeLayout);
|
|
layout.addView(volumeLayout);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
|
LinearLayout volumeLayout = (LinearLayout) inflater.inflate(R.layout.volume_seekbar, null);
|
|
LinearLayout volumeLayout = (LinearLayout) inflater.inflate(R.layout.volume_seekbar, null);
|
|
|
LayoutParams volumeParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
|
LayoutParams volumeParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
|
@@ -216,8 +215,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
BTN_PORTRAIT = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 181, R.drawable.btn_residence_me_normal3, R.drawable.btn_residence_me_pressed3, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.PORTRAIT_3);
|
|
BTN_PORTRAIT = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 181, R.drawable.btn_residence_me_normal3, R.drawable.btn_residence_me_pressed3, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.PORTRAIT_3);
|
|
|
ViewRegistration(layout, BTN_PORTRAIT, Common.ImgPosition.GetX(908), Common.ImgPosition.GetY(473));
|
|
ViewRegistration(layout, BTN_PORTRAIT, Common.ImgPosition.GetX(908), Common.ImgPosition.GetY(473));
|
|
|
BTN_PORTRAIT.setButtonEventOffEnable(R.drawable.btn_residence_me_disabled3);
|
|
BTN_PORTRAIT.setButtonEventOffEnable(R.drawable.btn_residence_me_disabled3);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
BTN_TALK = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 272, R.drawable.btn_residence_call_normal2, R.drawable.btn_residence_call_pressed2, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2);
|
|
BTN_TALK = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 272, R.drawable.btn_residence_call_normal2, R.drawable.btn_residence_call_pressed2, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2);
|
|
|
ViewRegistration(layout, BTN_TALK, Common.ImgPosition.GetX(908), Common.ImgPosition.GetY(110));
|
|
ViewRegistration(layout, BTN_TALK, Common.ImgPosition.GetX(908), Common.ImgPosition.GetY(110));
|
|
|
|
|
|
|
@@ -259,7 +257,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
protected void Initialize() {
|
|
protected void Initialize() {
|
|
|
try {
|
|
try {
|
|
|
LOG_INFO("[Initialize]");
|
|
LOG_INFO("[Initialize]");
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.IDLE) ((MainActivity) mContext).setMenuBTNEnable(false);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.IDLE)
|
|
|
|
|
+ ((MainActivity) mContext).setMenuBTNEnable(false);
|
|
|
else ((MainActivity) mContext).setMenuBTNEnable(true);
|
|
else ((MainActivity) mContext).setMenuBTNEnable(true);
|
|
|
|
|
|
|
|
MainActivity.mCallController.setCallEventListener(this);
|
|
MainActivity.mCallController.setCallEventListener(this);
|
|
@@ -273,7 +272,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
|
|
getVolume();
|
|
getVolume();
|
|
|
|
|
|
|
|
- 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); // 세대통화 시작시 초기화
|
|
@@ -300,7 +299,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
super.onClose();
|
|
super.onClose();
|
|
|
try {
|
|
try {
|
|
|
LOG_INFO("[onClose]");
|
|
LOG_INFO("[onClose]");
|
|
|
- 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);
|
|
|
mPathCheckHandler.removeMessages(1);
|
|
mPathCheckHandler.removeMessages(1);
|
|
@@ -341,48 +341,46 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2 <= nID && nID <= ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_HO) {
|
|
if (ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2 <= nID && nID <= ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_HO) {
|
|
|
if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2 || nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_3) {
|
|
if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_2 || nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TALK_3) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
doTalk(CALLOWNER.WALLPAD);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
MainActivity.mSound.Play(SND.setting.RETRY_INPUT);
|
|
MainActivity.mSound.Play(SND.setting.RETRY_INPUT);
|
|
|
initCallVariables();
|
|
initCallVariables();
|
|
|
updateScreen();
|
|
updateScreen();
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.END_2 || nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.END_3) {
|
|
|
|
|
|
|
+ } else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.END_2 || nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.END_3) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
doEnd();
|
|
doEnd();
|
|
|
- }
|
|
|
|
|
- else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.PORTRAIT_3) {
|
|
|
|
|
|
|
+ } else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.PORTRAIT_3) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
showMyVideo(!bshowMyVideo);
|
|
showMyVideo(!bshowMyVideo);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onTouchEvent] Call Status is not TALKING!!!");
|
|
LOG_WARN("[onTouchEvent] Call Status is not TALKING!!!");
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE) {
|
|
|
|
|
|
|
+ } else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
deleteResiInfo();
|
|
deleteResiInfo();
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onTouchEvent] Call Status is not IDLE!!!");
|
|
LOG_WARN("[onTouchEvent] Call Status is not IDLE!!!");
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DIVISION) {
|
|
|
|
|
|
|
+ } else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DIVISION) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
if (ConfigValues.bEnableHouseDivision) {
|
|
if (ConfigValues.bEnableHouseDivision) {
|
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
@@ -397,15 +395,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
RemoteIDInfo.nHo_Extension = 1;
|
|
RemoteIDInfo.nHo_Extension = 1;
|
|
|
Global.TargetInputStep = TARGETINFOINPUTSTEP.HO;
|
|
Global.TargetInputStep = TARGETINFOINPUTSTEP.HO;
|
|
|
updateResidenceInfo();
|
|
updateResidenceInfo();
|
|
|
- }
|
|
|
|
|
- else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO || Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
|
|
|
|
|
+ } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO || Global.TargetInputStep == TARGETINFOINPUTSTEP.DONE) {
|
|
|
RemoteIDInfo.bRentRoomSelected = true;
|
|
RemoteIDInfo.bRentRoomSelected = true;
|
|
|
RemoteIDInfo.nHo_Extension = 1;
|
|
RemoteIDInfo.nHo_Extension = 1;
|
|
|
updateResidenceInfo();
|
|
updateResidenceInfo();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 <= nID && nID <= ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_09) {
|
|
|
|
|
|
|
+ } else if (ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 <= nID && nID <= ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_09) {
|
|
|
int nPressedNum = nID - KEYBALANCE;
|
|
int nPressedNum = nID - KEYBALANCE;
|
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
|
RemoteIDInfo.strDong += nPressedNum;
|
|
RemoteIDInfo.strDong += nPressedNum;
|
|
@@ -474,13 +470,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
LOG("[onTouchEvent] nID [" + nID + "], nEvent [" + nEvent + "]");
|
|
LOG("[onTouchEvent] nID [" + nID + "], nEvent [" + nEvent + "]");
|
|
|
if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE) {
|
|
if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE) {
|
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
// 통화중에 버튼 터치음을 발생시키면, 통화 상대방에게 터치음이 전달되므로 통화중에는 터치음을 출력하지 않는다.(JEFF, 2019.12.24)
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ MainActivity.mSound.Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE) {
|
|
|
initCallVariables();
|
|
initCallVariables();
|
|
|
updateScreen();
|
|
updateScreen();
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onTouchEvent] Call Status is not IDLE!!!");
|
|
LOG_WARN("[onTouchEvent] Call Status is not IDLE!!!");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -497,7 +493,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
try {
|
|
try {
|
|
|
LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "]");
|
|
LOG_INFO("[onMainTouchEvent] eEvent [" + eEvent + "]");
|
|
|
if (eEvent == MAINEVENT.BTN_HOME) {
|
|
if (eEvent == MAINEVENT.BTN_HOME) {
|
|
|
- if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING) Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.mCallInfo.getRESI() != CALLSTATUS.TALKING)
|
|
|
|
|
+ Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
finishWallpadCallApp();
|
|
finishWallpadCallApp();
|
|
|
} else if (eEvent == MAINEVENT.BTN_HOME_MOBILE) {
|
|
} else if (eEvent == MAINEVENT.BTN_HOME_MOBILE) {
|
|
|
finishWallpadCallApp();
|
|
finishWallpadCallApp();
|
|
@@ -536,8 +533,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.WAITNG_INVITE_ACK);
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.WAITNG_INVITE_ACK);
|
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
|
|
|
- }
|
|
|
|
|
- else if (eCallStatus == CALLSTATUS.CALLING) {
|
|
|
|
|
|
|
+ } else if (eCallStatus == CALLSTATUS.CALLING) {
|
|
|
bRcvEnd = false;
|
|
bRcvEnd = false;
|
|
|
Global.playMelodyRepeat(eCallType);
|
|
Global.playMelodyRepeat(eCallType);
|
|
|
super.setFinishTimerDestroy();
|
|
super.setFinishTimerDestroy();
|
|
@@ -559,13 +555,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
super.setFinishTimerDestroy();
|
|
super.setFinishTimerDestroy();
|
|
|
if (Global.getKitchenTVIdx(eCallOwner) >= 0 || Global.getBathPhoneIdx(eCallOwner) >= 0 || Global.getBathTVIdx(eCallOwner) >= 0 || eCallOwner == CALLOWNER.SUB_WALLPAD) {
|
|
if (Global.getKitchenTVIdx(eCallOwner) >= 0 || Global.getBathPhoneIdx(eCallOwner) >= 0 || Global.getBathTVIdx(eCallOwner) >= 0 || eCallOwner == CALLOWNER.SUB_WALLPAD) {
|
|
|
MainActivity.mSubPhoneController.sendACKNewCall(eCallOwner, eCallType, strRemoteIP, null);
|
|
MainActivity.mSubPhoneController.sendACKNewCall(eCallOwner, eCallType, strRemoteIP, null);
|
|
|
- ((MainActivity)(getContext())).StartPopup(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
|
|
|
|
+ ((MainActivity) (getContext())).StartPopup(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
}
|
|
}
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
|
updateScreen();
|
|
updateScreen();
|
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
- }
|
|
|
|
|
- else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
|
|
|
|
|
+ } else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
|
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
|
|
@@ -577,9 +572,9 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (eCallOwner != CALLOWNER.WALLPAD) {
|
|
if (eCallOwner != CALLOWNER.WALLPAD) {
|
|
|
((MainActivity) mContext).StartPopup(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
((MainActivity) mContext).StartPopup(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.SUBPHONE_MOIP);
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.SUBPHONE_MOIP);
|
|
|
- if (eCallOwner == CALLOWNER.SUB_WALLPAD) MainActivity.mCallController.setSubWallPadAudioPath();
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ if (eCallOwner == CALLOWNER.SUB_WALLPAD)
|
|
|
|
|
+ MainActivity.mCallController.setSubWallPadAudioPath();
|
|
|
|
|
+ } else {
|
|
|
((MainActivity) mContext).sendHandlerMsg(MainActivity.HANDLERMSG.SET_TEMPSYSTEM_VOLUME, 0, 0);// 통화 중 임의 볼륨값 설정 seulki
|
|
((MainActivity) mContext).sendHandlerMsg(MainActivity.HANDLERMSG.SET_TEMPSYSTEM_VOLUME, 0, 0);// 통화 중 임의 볼륨값 설정 seulki
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_V40_RESIDENCE);
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_V40_RESIDENCE);
|
|
|
}
|
|
}
|
|
@@ -588,8 +583,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
updateInstruction();
|
|
updateInstruction();
|
|
|
Global.change1stCallLogAction(CALLACTION.TALK);
|
|
Global.change1stCallLogAction(CALLACTION.TALK);
|
|
|
Global.add1stCallHistoryInfoFinal();
|
|
Global.add1stCallHistoryInfoFinal();
|
|
|
- }
|
|
|
|
|
- else if (eCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
|
|
|
|
|
+ } else if (eCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
|
LOG_WARN("[onCallEvent] MOBILE HOMEVIEW!!!!");
|
|
LOG_WARN("[onCallEvent] MOBILE HOMEVIEW!!!!");
|
|
|
// [방문객원격통화] 모바일에서 홈뷰어 요청 -> 모바일 기기로 월패드카메라 인코딩 영상 전송
|
|
// [방문객원격통화] 모바일에서 홈뷰어 요청 -> 모바일 기기로 월패드카메라 인코딩 영상 전송
|
|
|
((MainActivity) mContext).showRemoteCallNoticeText(true); // 방문객원격통화 팝업 삭제 -> 상단 문구로 대체
|
|
((MainActivity) mContext).showRemoteCallNoticeText(true); // 방문객원격통화 팝업 삭제 -> 상단 문구로 대체
|
|
@@ -599,8 +593,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
//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;
|
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
@@ -647,8 +640,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
Global.change1stCallLogAction(CALLACTION.REJECT);
|
|
Global.change1stCallLogAction(CALLACTION.REJECT);
|
|
|
showMyVideo(false);
|
|
showMyVideo(false);
|
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
- }
|
|
|
|
|
- else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
|
|
|
|
|
+ } else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
|
Global.stopMelodyRepeat();
|
|
Global.stopMelodyRepeat();
|
|
|
bRemoteVideoShow = false;
|
|
bRemoteVideoShow = false;
|
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
@@ -708,6 +700,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ doEnd();
|
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
MainActivity.mCallController.quitMoIPCall();
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
|
|
|
MainActivity.mCallController.stop1stCallTimer();
|
|
MainActivity.mCallController.stop1stCallTimer();
|
|
@@ -754,8 +747,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (eResidenceCallStatus == CALLSTATUS.CALLING || eResidenceCallStatus == CALLSTATUS.CALLED || eResidenceCallStatus == CALLSTATUS.TALKING || eResidenceCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
if (eResidenceCallStatus == CALLSTATUS.CALLING || eResidenceCallStatus == CALLSTATUS.CALLED || eResidenceCallStatus == CALLSTATUS.TALKING || eResidenceCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
|
if (eCallOwner == CALLOWNER.WALLPAD || eCallOwner == CALLOWNER.NONE) {
|
|
if (eCallOwner == CALLOWNER.WALLPAD || eCallOwner == CALLOWNER.NONE) {
|
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_NOTICE);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_NOTICE);
|
|
|
- }
|
|
|
|
|
- else if (eCallOwner == CALLOWNER.MOBILE) {
|
|
|
|
|
|
|
+ } else if (eCallOwner == CALLOWNER.MOBILE) {
|
|
|
// 모바일로 홈뷰어 실행 중 멀티콜 오는 경우 통화중 처리
|
|
// 모바일로 홈뷰어 실행 중 멀티콜 오는 경우 통화중 처리
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
|
MainActivity.mIOInterface.ctrlFrontCamPower(false);
|
|
MainActivity.mIOInterface.ctrlFrontCamPower(false);
|
|
@@ -764,9 +756,9 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
((MainActivity) mContext).ctrlSmartIOTCamStatusMode(SmartRFCamStatusMode.STATUS_OFF);
|
|
((MainActivity) mContext).ctrlSmartIOTCamStatusMode(SmartRFCamStatusMode.STATUS_OFF);
|
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF);
|
|
((MainActivity) mContext).ctrlSmartIOTCamLEDMode(SmartRFCamLEDMode.LED_OFF);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ if (MainActivity.mPSTNController != null)
|
|
|
|
|
+ MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
|
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
|
|
@@ -778,12 +770,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
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
|
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
LOG("[onMultiCallEvent] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onMultiCallEvent] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
- if (bRemoteVideoShow) ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
|
|
|
|
+ if (bRemoteVideoShow)
|
|
|
|
|
+ ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
else ctrlAlphaBlending(false);
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -797,15 +789,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
// } else {
|
|
// } else {
|
|
|
// LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
// LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
|
// }
|
|
// }
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
// 멀티콜 있음
|
|
// 멀티콜 있음
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.OFF_FRONT, 0, 0, 2000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.OFF_FRONT, 0, 0, 2000);
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (eCallType == CALLTYPE.LOBBY || eCallType == CALLTYPE.GUARD || eCallType == CALLTYPE.RESIDENCE) {
|
|
|
|
|
|
|
+ } else if (eCallType == CALLTYPE.LOBBY || eCallType == CALLTYPE.GUARD || eCallType == CALLTYPE.RESIDENCE) {
|
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallStatus() == CALLSTATUS.IDLE) {
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallStatus() == CALLSTATUS.IDLE) {
|
|
|
// 멀티콜 없음
|
|
// 멀티콜 없음
|
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
MultiCallInfo MCInfo = new MultiCallInfo();
|
|
@@ -822,14 +812,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (eResidenceCallStatus == CALLSTATUS.CALLING || eResidenceCallStatus == CALLSTATUS.CALLED || eResidenceCallStatus == CALLSTATUS.TALKING || eResidenceCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
if (eResidenceCallStatus == CALLSTATUS.CALLING || eResidenceCallStatus == CALLSTATUS.CALLED || eResidenceCallStatus == CALLSTATUS.TALKING || eResidenceCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
|
if (eCallOwner == CALLOWNER.WALLPAD || eCallOwner == CALLOWNER.NONE) {
|
|
if (eCallOwner == CALLOWNER.WALLPAD || eCallOwner == CALLOWNER.NONE) {
|
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_NOTICE);
|
|
((MainActivity) (getContext())).startMultiCallPopup(ID.POPUP.POPUP_MULTICALL_NOTICE);
|
|
|
- }
|
|
|
|
|
- else if (eCallOwner == CALLOWNER.MOBILE) {
|
|
|
|
|
|
|
+ } else if (eCallOwner == CALLOWNER.MOBILE) {
|
|
|
// 모바일로 홈뷰어 실행 중 멀티콜 오는 경우 통화중 처리
|
|
// 모바일로 홈뷰어 실행 중 멀티콜 오는 경우 통화중 처리
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(eCallType, CALLSTATUS.IDLE);
|
|
|
MainActivity.mCallController.rejectMoIPCall();
|
|
MainActivity.mCallController.rejectMoIPCall();
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
- if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ if (MainActivity.mPSTNController != null)
|
|
|
|
|
+ MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
doMultiCallReject();
|
|
|
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
|
|
@@ -841,12 +830,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
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
|
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
LOG("[onMultiCallEvent] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onMultiCallEvent] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
- if (bRemoteVideoShow) ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
|
|
|
|
+ if (bRemoteVideoShow)
|
|
|
|
|
+ ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
else ctrlAlphaBlending(false);
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
LOG_WARN("[onMultiCallEvent] Invalid eResidenceCallStatus [" + eResidenceCallStatus + "]");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1023,12 +1012,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
// else {
|
|
// else {
|
|
|
// Log.i(TAG, "[onVideoSet] CallStatus is NOT TALKING!!");
|
|
// Log.i(TAG, "[onVideoSet] CallStatus is NOT TALKING!!");
|
|
|
// }
|
|
// }
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
Log.w(TAG, "[onVideoSet] Wallpad camera is not enabled!!");
|
|
Log.w(TAG, "[onVideoSet] Wallpad camera is not enabled!!");
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onVideoSet] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
LOG_WARN("[onVideoSet] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1049,9 +1036,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
LOG("[onShowRemoteVideo] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onShowRemoteVideo] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
|
|
|
|
|
if (MainActivity.bFFMPEGEnable) {
|
|
if (MainActivity.bFFMPEGEnable) {
|
|
|
- ((MainActivity)mContext).showRemoteVideo(bShow, true);
|
|
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ ((MainActivity) mContext).showRemoteVideo(bShow, true);
|
|
|
|
|
+ } else {
|
|
|
CALLOWNER eCallOwner = MainActivity.mCallController.mCallInfo.getCallOwner();
|
|
CALLOWNER eCallOwner = MainActivity.mCallController.mCallInfo.getCallOwner();
|
|
|
CALLSTATUS eMultiCallStatus = MainActivity.mCallController.mCallInfo.getMultiCallStatus();
|
|
CALLSTATUS eMultiCallStatus = MainActivity.mCallController.mCallInfo.getMultiCallStatus();
|
|
|
LOG("[onShowRemoteVideo] eCallOwner [" + eCallOwner + "], eMultiCallStatus [" + eMultiCallStatus + "]");
|
|
LOG("[onShowRemoteVideo] eCallOwner [" + eCallOwner + "], eMultiCallStatus [" + eMultiCallStatus + "]");
|
|
@@ -1059,17 +1045,14 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (eMultiCallStatus == CALLSTATUS.IDLE) {
|
|
if (eMultiCallStatus == CALLSTATUS.IDLE) {
|
|
|
LOG("[onShowRemoteVideo] =========== POPUP X =========== (display remote video)");
|
|
LOG("[onShowRemoteVideo] =========== POPUP X =========== (display remote video)");
|
|
|
ctrlAlphaBlending(bShow); // 팝업(서브폰통화, 멀티콜)이 떠있지 않는 경우만 원격지 영상 출력-> 팝업 짤림 (02.12.01 seulki)
|
|
ctrlAlphaBlending(bShow); // 팝업(서브폰통화, 멀티콜)이 떠있지 않는 경우만 원격지 영상 출력-> 팝업 짤림 (02.12.01 seulki)
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
LOG("[onShowRemoteVideo] =========== POPUP O =========== (do not display remote video)");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[onShowRemoteVideo] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
LOG_WARN("[onShowRemoteVideo] Not Supported BOARD_TYPE!! [" + ConfigValues.DEVICE_BOARDTYPE + "]");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1094,7 +1077,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
doMultiCallAccept();
|
|
doMultiCallAccept();
|
|
|
} else if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT) {
|
|
} else if (nID == ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT) {
|
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT");
|
|
LOG_INFO("[onPopupResult] ID.POPUP.MUTICALL.ELEMENT.BUTTON.REJECT");
|
|
|
- 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.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
|
|
@@ -1106,7 +1090,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
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
|
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
- if (bRemoteVideoShow) ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
|
|
|
|
+ if (bRemoteVideoShow)
|
|
|
|
|
+ ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
else ctrlAlphaBlending(false);
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1133,7 +1118,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
* JEFF, 2020.01.01
|
|
* JEFF, 2020.01.01
|
|
|
* 모든 통화에서 멀티콜을 막음
|
|
* 모든 통화에서 멀티콜을 막음
|
|
|
*/
|
|
*/
|
|
|
- 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.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
|
|
@@ -1145,7 +1131,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
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
|
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
- if (bRemoteVideoShow) ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
|
|
|
|
+ if (bRemoteVideoShow)
|
|
|
|
|
+ ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
else ctrlAlphaBlending(false);
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1172,7 +1159,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
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
|
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|| ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
LOG("[onPopupResult] bRemoteVideoShow [" + bRemoteVideoShow + "]");
|
|
|
- if (bRemoteVideoShow) ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
|
|
|
|
+ if (bRemoteVideoShow)
|
|
|
|
|
+ ctrlAlphaBlending(true); // 세대 월패드에서 내모습 보이기 출력중인 경우 멀티콜 거절시(팝업 종료시) 세대영상 출력
|
|
|
else ctrlAlphaBlending(false);
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1206,9 +1194,9 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
if (RemoteIDInfo.bRentRoomSelected)
|
|
if (RemoteIDInfo.bRentRoomSelected)
|
|
|
- RemoteIDInfo.strIP = Global.makeIPAddress(DeviceType.RENTRESIDENCE, String.valueOf(RemoteIDInfo.nDong), String.valueOf(RemoteIDInfo.nHo));
|
|
|
|
|
|
|
+ RemoteIDInfo.strIP = Global.makeIPAddress(DeviceType.RENTRESIDENCE, String.valueOf(RemoteIDInfo.nDong), String.valueOf(RemoteIDInfo.nHo));
|
|
|
else
|
|
else
|
|
|
- RemoteIDInfo.strIP = Global.makeIPAddress(DeviceType.RESIDENCE, String.valueOf(RemoteIDInfo.nDong), String.valueOf(RemoteIDInfo.nHo));
|
|
|
|
|
|
|
+ RemoteIDInfo.strIP = Global.makeIPAddress(DeviceType.RESIDENCE, String.valueOf(RemoteIDInfo.nDong), String.valueOf(RemoteIDInfo.nHo));
|
|
|
|
|
|
|
|
RemoteIDInfo.strSIPID = MainActivity.mCallController.makeSIPID(RemoteIDInfo.strIP);
|
|
RemoteIDInfo.strSIPID = MainActivity.mCallController.makeSIPID(RemoteIDInfo.strIP);
|
|
|
|
|
|
|
@@ -1243,15 +1231,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
*/
|
|
*/
|
|
|
//MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
//MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
//MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.TRYING_CALL);
|
|
//MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.TRYING_CALL);
|
|
|
- }
|
|
|
|
|
- else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLED) {
|
|
|
|
|
|
|
+ } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.CALLED) {
|
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
MainActivity.mCallController.onResidenceEvent(CALLEVENTTYPE.CONNECT_CALL, CALLTYPE.RESIDENCE);
|
|
MainActivity.mCallController.onResidenceEvent(CALLEVENTTYPE.CONNECT_CALL, CALLTYPE.RESIDENCE);
|
|
|
MainActivity.mCallController.sendCallStart(CALLTYPE.RESIDENCE, Integer.parseInt(RemoteIDInfo.strDong), Integer.parseInt(RemoteIDInfo.strHo));
|
|
MainActivity.mCallController.sendCallStart(CALLTYPE.RESIDENCE, Integer.parseInt(RemoteIDInfo.strDong), Integer.parseInt(RemoteIDInfo.strHo));
|
|
|
//MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
//MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
//MainActivity.mCallController.acceptMoIPCall(false);
|
|
//MainActivity.mCallController.acceptMoIPCall(false);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_INFO("[doTalk] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getRESI() + "]");
|
|
LOG_INFO("[doTalk] Invalid CALLSTATUS [" + MainActivity.mCallController.mCallInfo.getRESI() + "]");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1288,7 +1274,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
//MainActivity.mCallController.quitMoIPCall();
|
|
//MainActivity.mCallController.quitMoIPCall();
|
|
|
MainActivity.mCallController.sendCallEnd(CALLTYPE.RESIDENCE, Integer.parseInt(RemoteIDInfo.strDong), Integer.parseInt(RemoteIDInfo.strHo));
|
|
MainActivity.mCallController.sendCallEnd(CALLTYPE.RESIDENCE, Integer.parseInt(RemoteIDInfo.strDong), Integer.parseInt(RemoteIDInfo.strHo));
|
|
|
MainActivity.mCallController.onResidenceEvent(CALLEVENTTYPE.TERMINATE_CALL, CALLTYPE.RESIDENCE);
|
|
MainActivity.mCallController.onResidenceEvent(CALLEVENTTYPE.TERMINATE_CALL, CALLTYPE.RESIDENCE);
|
|
|
- } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.HOMEVIEW) {
|
|
|
|
|
|
|
+ } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.HOMEVIEW) {
|
|
|
//MainActivity.mRemoteCallController.sendCloseRemoteCall();
|
|
//MainActivity.mRemoteCallController.sendCloseRemoteCall();
|
|
|
//MainActivity.mCallController.MultiCallScenarioManager();
|
|
//MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
bshowMyVideo = false;
|
|
bshowMyVideo = false;
|
|
@@ -1409,7 +1395,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
|
|
if (MainActivity.mCallController.mCallInfo.getMultiCallAccept()) {
|
|
|
// 멀티콜 수락 (통화시작)
|
|
// 멀티콜 수락 (통화시작)
|
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
|
- if (ConfigValues.bWallPadCameraEnable) BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled3);
|
|
|
|
|
|
|
+ if (ConfigValues.bWallPadCameraEnable)
|
|
|
|
|
+ BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled3);
|
|
|
else BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled2);
|
|
else BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled2);
|
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
|
prepareMyVideo(true);
|
|
prepareMyVideo(true);
|
|
@@ -1543,14 +1530,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (bON) {
|
|
if (bON) {
|
|
|
IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back);
|
|
IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back);
|
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(116, 85, 240, 160);
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(116, 85, 240, 160);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
IMG_VIDEO_MODULE.setImageResource(R.drawable.image_neig);
|
|
IMG_VIDEO_MODULE.setImageResource(R.drawable.image_neig);
|
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(0, 0, 0, 0);
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(0, 0, 0, 0);
|
|
|
}
|
|
}
|
|
|
MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bON, bshowMyVideo);
|
|
MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bON, bshowMyVideo);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
Log.w(TAG, "[ctrlAlphaBlending] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
|
|
Log.w(TAG, "[ctrlAlphaBlending] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1835,8 +1820,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_normal3);
|
|
BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_normal3);
|
|
|
}
|
|
}
|
|
|
MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
LOG_WARN("[showMyVideo] BTN_PORTRAIT is null!!");
|
|
LOG_WARN("[showMyVideo] BTN_PORTRAIT is null!!");
|
|
|
}
|
|
}
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1983,12 +1967,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
bStatusFlickeringCallLED = !bStatusFlickeringCallLED;
|
|
bStatusFlickeringCallLED = !bStatusFlickeringCallLED;
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.FLICKER_LED_CALL, 0, 0, 1000);
|
|
sendHandlerMsgDelayed(HANDLERMSG.FLICKER_LED_CALL, 0, 0, 1000);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
|
|
|
|
+ } else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.TALKING) {
|
|
|
bStatusFlickeringCallLED = true;
|
|
bStatusFlickeringCallLED = true;
|
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
|
- }
|
|
|
|
|
- else {
|
|
|
|
|
|
|
+ } else {
|
|
|
bStatusFlickeringCallLED = false;
|
|
bStatusFlickeringCallLED = false;
|
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
MainActivity.mIOInterface.ctrlWallPadLED_Call(bStatusFlickeringCallLED);
|
|
|
LOG_INFO("[ctrlCallLED] bFlickeringCallLED [" + bFlickeringCallLED + "], bStatusFlickeringCallLED [" + bStatusFlickeringCallLED + "]");
|
|
LOG_INFO("[ctrlCallLED] bFlickeringCallLED [" + bFlickeringCallLED + "], bStatusFlickeringCallLED [" + bStatusFlickeringCallLED + "]");
|
|
@@ -2074,8 +2056,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (SEEKBAR_VOLUME != null) {
|
|
if (SEEKBAR_VOLUME != null) {
|
|
|
SEEKBAR_VOLUME.setProgress(ctrlSeekBarThumb(nCurrentVolume));
|
|
SEEKBAR_VOLUME.setProgress(ctrlSeekBarThumb(nCurrentVolume));
|
|
|
showVolume(nCurrentVolume);
|
|
showVolume(nCurrentVolume);
|
|
|
- }
|
|
|
|
|
- else Log.w(TAG, "[drawVolume] SEEKBAR_VOLUME is null!!");
|
|
|
|
|
|
|
+ } else Log.w(TAG, "[drawVolume] SEEKBAR_VOLUME is null!!");
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
Log.e(TAG, "[Exception] drawVolume()");
|
|
Log.e(TAG, "[Exception] drawVolume()");
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|