|
@@ -520,7 +520,15 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
((MainActivity) mContext).sendHandlerMsg(MainActivity.HANDLERMSG.SET_TEMPSYSTEM_VOLUME, 0, 0);// 통화 중 임의 볼륨값 설정 seulki
|
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, false);
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_LOBBY);
|
|
|
+ //MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
|
|
|
+ if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
+ {
|
|
|
+ MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
|
|
|
+ }
|
|
|
+ else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
+ {
|
|
|
+ MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHND101_LOBBY);
|
|
|
+ }
|
|
|
}
|
|
|
else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
|
|
@@ -1001,6 +1009,10 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
try {
|
|
|
LOG_INFO("[doTalk] eCallOwner [" + eCallOwner + "], nSelectedFilter [" + nSelectedFilter + "]" + "RemoteIDInfo.strIP [" + RemoteIDInfo.strIP + "]");
|
|
|
if ((MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED) || (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING)) {
|
|
|
+ enableEndBTN(false);
|
|
|
+ enableOpenDoorBTN(false);
|
|
|
+ sendHandlerMsgDelayed(TalkLobby.HANDLERMSG.ENABLE_END_BTN, 0, 0, null, 2000);
|
|
|
+ sendHandlerMsgDelayed(TalkLobby.HANDLERMSG.ENABLE_OPENDOOR_BTN, 0, 0, null, 2000);
|
|
|
send_start_talking_request(RemoteIDInfo.strIP);
|
|
|
//MainActivity.mCallController.acceptMoIPCall(false);
|
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
@@ -1095,6 +1107,7 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
if (MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLED || MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.CALLING) {
|
|
|
Global.stopMelodyRepeat();
|
|
|
// Global.changeVolumeMoIPMode(CALLTYPE.NONE);
|
|
|
+
|
|
|
if (!send_lobby_open_request(RemoteIDInfo.strIP)) {
|
|
|
MainActivity.mSound.Play(SND.setting.RETRY_ACTION);
|
|
|
}
|
|
@@ -1515,6 +1528,8 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
LOG_INFO("[send_lobby_open_request] strTargetIP [" + strTargetIP + "]");
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.NORMAL);
|
|
|
nCurrentMicGain = MainActivity.mIOInterface.getMICGain();
|
|
|
+
|
|
|
+ ((MainActivity) mContext).Device_DoorOpen(19); //16 address start
|
|
|
try {
|
|
|
bSentiMAP = true;
|
|
|
Request_lobby_open lobby_open = new Request_lobby_open(mContext);
|
|
@@ -1934,6 +1949,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
LOG("[ctrlVolume] eCallStatus [" + eCallStatus + "]");
|
|
|
if (eCallStatus == CALLSTATUS.TALKING) {
|
|
|
Global.setV40WallPadVolume_LOBBY(nCurrentVolume);
|
|
|
+ if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I))
|
|
|
+ {
|
|
|
+ Global.setV40WallPadMicGain("0x0200");
|
|
|
+ }
|
|
|
+ else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
+ {
|
|
|
+ //Global.setV40WallPadMicGain("0x0080");
|
|
|
+ }
|
|
|
}
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|