From cc65631dfe91455a64ed63caf94d8118fde883c5 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 25 Feb 2021 16:49:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=99=A8,=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4:=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/view_video_layout_see_live.xml | 123 ++++++++++--------
 1 file changed, 66 insertions(+), 57 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
index 6a5a50343c..0c2fc98d52 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
@@ -1,71 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.module.v2x.view.RoundLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rlRoadEventList"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-    android:background="@color/live_video_background_color"
-    app:roundLayoutRadius="@dimen/dp_20">
+    android:layout_height="@dimen/v2x_video_window_height_content"
+    android:layout_margin="@dimen/dp_3"
+    android:background="@drawable/v2x_alert_window_bg">
 
-    <SurfaceView
-        android:id="@+id/surfaceView"
+    <com.mogo.module.v2x.view.RoundLayout
         android:layout_width="match_parent"
-        android:background="@drawable/v2x_bg_video_tip_vr"
-        android:layout_height="@dimen/module_v2x_event_see_live_window_height"
-        android:gravity="center" />
+        android:layout_height="match_parent"
+        android:background="@drawable/v2x_alert_window_bg"
+        app:roundLayoutRadius="@dimen/dp_26">
 
-    <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/loading"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:padding="@dimen/dp_15" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clLoadError"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
-        tools:visibility="visible">
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/loading"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />
 
-        <ImageView
-            android:id="@+id/ivErrorIcon"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/clLoadError"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/icon_live_load_error"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            tools:visibility="visible">
 
-        <TextView
-            android:id="@+id/tvErrorContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:text="直播获取失败"
-            android:textColor="#FFFFFFFF"
-            android:textSize="@dimen/dp_36"
-            app:layout_constraintBottom_toBottomOf="@+id/ivErrorIcon"
-            app:layout_constraintStart_toEndOf="@+id/ivErrorIcon"
-            app:layout_constraintTop_toTopOf="@+id/ivErrorIcon" />
+            <ImageView
+                android:id="@+id/ivErrorIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_live_load_error"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tvRefreshButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_40"
-            android:background="@drawable/v2x_refresh_button_bg"
-            android:paddingStart="@dimen/dp_135"
-            android:paddingTop="@dimen/dp_25"
-            android:paddingEnd="@dimen/dp_135"
-            android:paddingBottom="@dimen/dp_25"
-            android:text="重试"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/dp_34"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ivErrorIcon" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <TextView
+                android:id="@+id/tvErrorContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_20"
+                android:text="直播获取失败"
+                android:textColor="#FFFFFFFF"
+                android:textSize="@dimen/dp_36"
+                app:layout_constraintBottom_toBottomOf="@+id/ivErrorIcon"
+                app:layout_constraintStart_toEndOf="@+id/ivErrorIcon"
+                app:layout_constraintTop_toTopOf="@+id/ivErrorIcon" />
 
-</com.mogo.module.v2x.view.RoundLayout>
+            <TextView
+                android:id="@+id/tvRefreshButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_40"
+                android:background="@drawable/v2x_refresh_button_bg"
+                android:paddingStart="@dimen/dp_135"
+                android:paddingTop="@dimen/dp_25"
+                android:paddingEnd="@dimen/dp_135"
+                android:paddingBottom="@dimen/dp_25"
+                android:text="重试"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_34"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ivErrorIcon" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.mogo.module.v2x.view.RoundLayout>
+
+</FrameLayout>

From 5ad58ce05a1dc75a048cdbb58155ced2266d7543 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 25 Feb 2021 17:20:02 +0800
Subject: [PATCH 2/2] no message

---
 .../src/main/res/layout/view_video_layout_see_live.xml     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
index 0c2fc98d52..e25f343eb8 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_see_live.xml
@@ -5,21 +5,18 @@
     android:id="@+id/rlRoadEventList"
     android:layout_width="match_parent"
     android:layout_height="@dimen/v2x_video_window_height_content"
-    android:layout_margin="@dimen/dp_3"
-    android:background="@drawable/v2x_alert_window_bg">
+    android:layout_margin="@dimen/dp_15">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/v2x_alert_window_bg"
         app:roundLayoutRadius="@dimen/dp_26">
 
         <SurfaceView
             android:id="@+id/surfaceView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"
-            android:padding="@dimen/dp_15" />
+            android:gravity="center" />
 
         <androidx.core.widget.ContentLoadingProgressBar
             android:id="@+id/loading"