From 5ea48d4f353713e41c1ef665d1ddbcfe4cefff1f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 17 May 2021 14:54:06 +0800 Subject: [PATCH] adjust view of live --- .../v2x/receiver/TestPanelBroadcastReceiver.java | 2 +- .../module_v2x_vr_close.png | Bin 0 -> 2962 bytes .../res/layout/window_see_carlive_video_vr.xml | 4 ++-- .../main/res/values-xhdpi-2560x1600/dimens.xml | 7 +++++++ .../src/main/res/values-xhdpi/dimens.xml | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png 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 0000000000000000000000000000000000000000..95a08f52f4b5f8a91653404d9ed62e438d7084c1 GIT binary patch literal 2962 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 IM6N<$g1paObN~PV literal 0 HcmV?d00001 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