|
@@ -569,15 +569,15 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
|
|
|
Global.setV40WallPadVolume_Front(nCurrentVolume);
|
|
|
}
|
|
|
- else if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
+ }
|
|
|
+ else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
+ //MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
|
|
|
+ if ((Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I_LX2) || (Version.getModelType() == Version.MODEL_TYPE.IHN_1010_I))
|
|
|
{
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.FRONT);
|
|
|
Global.setV40WallPadVolume_Front(nCurrentVolume);
|
|
|
}
|
|
|
}
|
|
|
- else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
- MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1010_LOBBY_GUARD);
|
|
|
- }
|
|
|
else {
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP);
|
|
|
}
|
|
@@ -1529,7 +1529,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
|
|
|
BTN_END.setImageResource(R.drawable.btn_endl_normal);
|
|
|
else BTN_END.setImageResource(R.drawable.btn_lobby_end_normal);
|
|
|
BTN_END.setButtonEventOffDisable();
|
|
|
- ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
|
|
|
+ if(MainActivity.mCallController.mCallInfo.getFRONT() == CALLSTATUS.TALKING)
|
|
|
+ {
|
|
|
+ ((MainActivity) mContext).TopHomeBtn.setButtonEventOffEnable();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ((MainActivity) mContext).TopHomeBtn.setButtonEventOffDisable();
|
|
|
+ }
|
|
|
} else {
|
|
|
// 이벤트 off
|
|
|
if (ConfigValues.bReliefCall)
|