From fb862aeb57bcae89e89ca96bbad8c900f5b634d2 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 23 Dec 2020 16:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=A0=94=E5=9C=B0=E5=9B=BE:=20v2x?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86=E5=9B=BE=E6=A0=87=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9,=E8=A7=86=E9=A2=91=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?,=E8=A7=86=E9=A2=91=E8=83=8C=E6=99=AF=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_common_icon_close_vr.png              | Bin 0 -> 2733 bytes
 .../drawable/module_common_close_selector_vr.xml |   6 ++++++
 .../main/res/drawable/v2x_bg_video_tip_vr.xml    |   9 +++++++++
 .../main/res/layout/item_v2x_event_detail_vr.xml |  10 +++++-----
 .../main/res/layout/item_v2x_live_video_vr.xml   |   2 +-
 .../res/layout/window_road_video_layout_vr.xml   |   6 +++---
 6 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png
 create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_video_tip_vr.xml

diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_vr.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6335d823fbf2e810cf156f9c859235a2ac460e7
GIT binary patch
literal 2733
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

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml
new file mode 100644
index 0000000000..46ace8dfc8
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector_vr.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_common_icon_close_vr" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_close_vr" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_close_vr" />
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_video_tip_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_video_tip_vr.xml
new file mode 100644
index 0000000000..3d287b5ac1
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_video_tip_vr.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="#141C35" android:startColor="#344687" />
+            <corners android:radius="@dimen/dp_20" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 847361a586..2e010d7624 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -119,8 +119,8 @@
 
         <ImageView
             android:id="@+id/ivEventLive"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail_vr"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail_vr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_10"
             android:padding="@dimen/dp_15"
             android:src="@drawable/selector_live_btn_vr"
@@ -156,10 +156,10 @@
 
         <ImageView
             android:id="@+id/ivEventCallChart"
-            android:layout_width="@dimen/module_v2x_event_button_size_detail_vr"
-            android:layout_height="@dimen/module_v2x_event_button_size_detail_vr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:padding="@dimen/dp_15"
-            android:src="@drawable/selector_talk_btn"
+            android:src="@drawable/selector_talk_btn_vr"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
             app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video_vr.xml
index 0ba4a3a72e..94c85ca29c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video_vr.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30" />
+        app:roundLayoutRadius="@dimen/dp_20" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivReportHead"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout_vr.xml
index d502ef6947..83891cf1a4 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout_vr.xml
@@ -6,12 +6,12 @@
     android:layout_height="@dimen/dp_394"
     android:layout_alignParentRight="true"
     android:layout_margin="@dimen/dp_3"
-    android:background="@drawable/v2x_alert_window_bg">
+    android:background="@drawable/v2x_bg_video_tip_vr">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:roundLayoutRadius="@dimen/dp_26">
+        app:roundLayoutRadius="@dimen/dp_20">
 
         <com.mogo.module.v2x.view.SimpleCoverVideoPlayer
             android:id="@+id/roadVideoView"
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_20"
             android:layout_marginTop="@dimen/dp_20"
-            android:src="@drawable/module_common_close_selector" />
+            android:src="@drawable/module_common_close_selector_vr" />
     </com.mogo.module.v2x.view.RoundLayout>
 
 </RelativeLayout>