|
@@ -469,6 +469,7 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1000_GUARD);
|
|
MainActivity.mCallController.setTalkPath(CALLPATH.MOIP_IHN1000_GUARD);
|
|
|
|
|
+ mPathCheckHandler.sendEmptyMessage(0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnGUARD);
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.RESIDENCEnGUARD);
|
|
@@ -1795,7 +1796,6 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
|
if (nCurrentVolume != nCtrlLevel) {
|
|
if (nCurrentVolume != nCtrlLevel) {
|
|
|
nCurrentVolume = nCtrlLevel;
|
|
nCurrentVolume = nCtrlLevel;
|
|
|
showVolume(nCurrentVolume);
|
|
showVolume(nCurrentVolume);
|
|
|
-// ctrlVolume(false);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1983,12 +1983,10 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
|
|
|
mPathCheckHandler.removeMessages(1);
|
|
mPathCheckHandler.removeMessages(1);
|
|
|
} else {
|
|
} else {
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD)
|
|
|
|
|
- mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHND101_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(1, 50);
|
|
|
else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
|
|
else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
|
|
|
} else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
} else if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
- if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD)
|
|
|
|
|
- mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
|
|
|
|
|
|
|
+ if (MainActivity.mCallController.getTalkPath() == CALLPATH.MOIP_IHN1000_GUARD) mPathCheckHandler.sendEmptyMessageDelayed(2, 50);
|
|
|
else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
|
|
else mPathCheckHandler.sendEmptyMessageDelayed(0, 50);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|