|
@@ -2069,7 +2069,8 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
|
int AUDIO_MODE_IN_VOICE_DOOR = 10;
|
|
|
int AUDIO_MODE_IN_DOORWALLPADMUSIC = 10;
|
|
|
int AUDIO_MODE_MOIP_RESIDENCE = 11;
|
|
|
- int AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010 = 12;
|
|
|
+ int AUDIO_MODE_MOIP_LOBBY_IHN1010 = 12;
|
|
|
+ int AUDIO_MODE_MOIP_GUARD_IHN1010 = 13;
|
|
|
int AUDIO_MODE_MOIP_LOBBY_IHND101 = 12;
|
|
|
int AUDIO_MODE_MOIP_GUARD_IHND101 = 13;
|
|
|
int AUDIO_MODE_IN_DOOR_COMMUNICATION_V40 = 15;
|
|
@@ -2139,8 +2140,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
|
MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
|
|
|
sendHandlerMsg(HANDLERMSG.SETMODE_AUDIO_MOIP_GUARD_WALLPAD, 0, 0);
|
|
|
}
|
|
|
- else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY_GUARD) {
|
|
|
- MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010);
|
|
|
+ else if (eCallPath == CALLPATH.MOIP_IHN1010_LOBBY) {
|
|
|
+ MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_LOBBY_IHN1010);
|
|
|
+ MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
|
|
|
+ }
|
|
|
+ else if (eCallPath == CALLPATH.MOIP_IHN1010_GUARD) {
|
|
|
+ MainActivity.mAudioManager.setMode(AUDIO_MODE_MOIP_GUARD_IHN1010);
|
|
|
MainActivity.mIOInterface.ctrlAudioSwitch34118(true);
|
|
|
}
|
|
|
else if (eCallPath == CALLPATH.PSTN) {
|
|
@@ -2338,11 +2343,19 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
|
else if (nMode == AUDIO_MODE_MOIP_RESIDENCE) {
|
|
|
return CALLPATH.MOIP_V40_RESIDENCE;
|
|
|
}
|
|
|
- else if (nMode == AUDIO_MODE_MOIP_LOBBY_GUARD_IHN1010) {
|
|
|
+ else if (nMode == AUDIO_MODE_MOIP_LOBBY_IHN1010) {
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) return CALLPATH.MOIP_IHND101_LOBBY;
|
|
|
- else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_LOBBY_GUARD;
|
|
|
+ else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_LOBBY;
|
|
|
else return CALLPATH.NONE;
|
|
|
}
|
|
|
+ else if (nMode == AUDIO_MODE_MOIP_GUARD_IHN1010) {
|
|
|
+ if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) return CALLPATH.MOIP_IHND101_GUARD;
|
|
|
+ else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) return CALLPATH.MOIP_IHN1010_GUARD;
|
|
|
+ else return CALLPATH.NONE;
|
|
|
+ }
|
|
|
+ else if (nMode == AUDIO_MODE_MOIP_LOBBY_IHND101) {
|
|
|
+ return CALLPATH.MOIP_IHND101_LOBBY;
|
|
|
+ }
|
|
|
else if (nMode == AUDIO_MODE_MOIP_GUARD_IHND101) {
|
|
|
return CALLPATH.MOIP_IHND101_GUARD;
|
|
|
}
|