diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java index 4da724fa37..18e243ccdd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java @@ -103,7 +103,7 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver { LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); } else if (sceneType == 6) {//查看前车直播 V2XVoiceCallLiveBiz.getInstance().getFrontCarLive(); - } else if (sceneType == 7) {//查看前车直播 + } else if (sceneType == 7) {//查看前方路口直播 V2XVoiceCallLiveBiz.getInstance().getOpenRoadCameraLive(); } else if (sceneType == 8) {//触发疲劳驾驶 V2XMessageEntity v2XMessageEntity = diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png new file mode 100644 index 0000000000..95a08f52f4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml index 02c4174e76..e32b21290f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml @@ -16,8 +16,8 @@ android:id="@+id/liveVideoClose" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_20" + android:layout_marginStart="@dimen/module_v2x_event_window_close_distance" + android:layout_marginTop="@dimen/module_v2x_event_window_close_distance" android:clickable="true" android:focusable="true" android:visibility="gone" diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml index e5e04824ef..1978407261 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -18,6 +18,13 @@ 80px + 778px + 687px + 200px + 10px + 487px + 778px + 15px 550px 200px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index b67af50738..8e83da6e51 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -17,6 +17,8 @@ 670px 526px + 20px + 147px 60px 40px