|
@@ -112,11 +112,11 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
|
ViewRegistration(layout, SCREEN_BG, 0, 0);
|
|
ViewRegistration(layout, SCREEN_BG, 0, 0);
|
|
|
|
|
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- IMG_LOBBY_BACKGROUND = new WpadImageView(context, TOUCH_KIND.NONE, 729, 544, R.drawable.bg_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.BACKGROUND);
|
|
|
|
|
- ViewRegistration(layout, IMG_LOBBY_BACKGROUND, Common.ImgPosition.GetX(101), Common.ImgPosition.GetY(110));
|
|
|
|
|
|
|
+ IMG_LOBBY_BACKGROUND = new WpadImageView(context, TOUCH_KIND.NONE, 722, 544, R.drawable.bg_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.BACKGROUND);
|
|
|
|
|
+ ViewRegistration(layout, IMG_LOBBY_BACKGROUND, Common.ImgPosition.GetX(93), Common.ImgPosition.GetY(110));
|
|
|
|
|
|
|
|
- IMG_VIDEO_MODULE = new WpadImageView(context, TOUCH_KIND.NONE, 727, 540, R.drawable.image_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.VIDEO_MODULE);
|
|
|
|
|
- ViewRegistration(layout, IMG_VIDEO_MODULE, Common.ImgPosition.GetX(103), Common.ImgPosition.GetY(112));
|
|
|
|
|
|
|
+ IMG_VIDEO_MODULE = new WpadImageView(context, TOUCH_KIND.NONE, 720, 540, R.drawable.image_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.VIDEO_MODULE);
|
|
|
|
|
+ ViewRegistration(layout, IMG_VIDEO_MODULE, Common.ImgPosition.GetX(95), Common.ImgPosition.GetY(112));
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
IMG_LOBBY_BACKGROUND = new WpadImageView(context, TOUCH_KIND.NONE, 722, 544, R.drawable.bg_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.BACKGROUND);
|
|
IMG_LOBBY_BACKGROUND = new WpadImageView(context, TOUCH_KIND.NONE, 722, 544, R.drawable.bg_lobby, 0, ID.SCREEN.TALKLOBBY.ELEMENT.IMAGE.BACKGROUND);
|
|
@@ -952,7 +952,10 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
|
if (MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.CALLED) {
|
|
if (MainActivity.mCallController.mCallInfo.getLOBBY() == CALLSTATUS.CALLED) {
|
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
MainActivity.mCallController.onLobbyEvent(CALLEVENTTYPE.CONNECT_CALL, CALLTYPE.LOBBY);
|
|
MainActivity.mCallController.onLobbyEvent(CALLEVENTTYPE.CONNECT_CALL, CALLTYPE.LOBBY);
|
|
|
- MainActivity.mCallController.sendCallStart(CALLTYPE.LOBBY, RemoteIDInfo.nDong, RemoteIDInfo.nHo);
|
|
|
|
|
|
|
+ // 월패드 통화패스 연결시 팝업노이즈로 인해 로비폰 통화시작시 로비폰에서 '삑'하는 노이즈가 출력되는 증상 개선 (Jeff, 2021.12.07)
|
|
|
|
|
+ // - 무인경비쪽으로 통화시작 메시지를 1초 지연 전송하여, 로비폰 통화패스 연결을 지연시켜 증상을 해결
|
|
|
|
|
+ sendHandlerMsgDelayed(HANDLERMSG.SEND_TALK_START, 0, 0, null, 1000);
|
|
|
|
|
+// MainActivity.mCallController.sendCallStart(CALLTYPE.LOBBY, RemoteIDInfo.nDong, RemoteIDInfo.nHo);
|
|
|
enableSavePicBTN(true);
|
|
enableSavePicBTN(true);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -1883,6 +1886,7 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
|
public final static int SHOW_ANALOG_LOBBYVIDEO = 520;
|
|
public final static int SHOW_ANALOG_LOBBYVIDEO = 520;
|
|
|
public final static int CHECK_DOOROPEN_REPLY = 600;
|
|
public final static int CHECK_DOOROPEN_REPLY = 600;
|
|
|
public final static int CALL_END = 610;
|
|
public final static int CALL_END = 610;
|
|
|
|
|
+ public final static int SEND_TALK_START = 620;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Handler TalkLobbyHandler = new Handler(Looper.getMainLooper()) {
|
|
public Handler TalkLobbyHandler = new Handler(Looper.getMainLooper()) {
|
|
@@ -1982,6 +1986,11 @@ public class TalkLobby extends WpadScreen implements CallEventListener, MainEven
|
|
|
((MainActivity) mContext).showFrontVideo(true);
|
|
((MainActivity) mContext).showFrontVideo(true);
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
|
|
+ case HANDLERMSG.SEND_TALK_START:
|
|
|
|
|
+ // 무인경비에 통화시작 메시지 전송을 위해 무인경비 드라이버쪽에 BR을 전송한다.
|
|
|
|
|
+ MainActivity.mCallController.sendCallStart(CALLTYPE.LOBBY, RemoteIDInfo.nDong, RemoteIDInfo.nHo);
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
default:
|
|
default:
|
|
|
break;
|
|
break;
|
|
|
|
|
|