From a22d9671c64f3eb10b1b7e5ac64fde627c66dde3 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 29 Oct 2020 20:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=ADUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/v2x_alert_window_live_bg.xml | 28 +++++++++++++++++++
 .../main/res/layout/item_v2x_live_video.xml   | 10 +++----
 .../res/layout/item_v2x_push_live_video.xml   |  6 ++--
 .../layout/item_v2x_road_live_car_detail.xml  |  9 +++---
 .../res/layout/view_video_layout_normal.xml   |  4 +--
 .../src/main/res/values-ldpi/dimens.xml       |  2 +-
 .../src/main/res/values-mdpi/dimens.xml       |  2 +-
 .../src/main/res/values-xhdpi/dimens.xml      |  2 +-
 .../v2x_alert_window_live_bg_light.xml        | 28 +++++++++++++++++++
 9 files changed, 74 insertions(+), 17 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_live_bg.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_live_bg_light.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_live_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_live_bg.xml
new file mode 100644
index 0000000000..676812c88a
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_live_bg.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_26" />
+            <gradient
+                android:angle="135"
+                android:endColor="#3F4057"
+                android:startColor="#5E6079"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
index 40b58102cf..cfbd596344 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -3,18 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/v2x_video_window_height"
-    android:background="@drawable/v2x_alert_window_bg">
+    android:layout_height="match_parent"
+    android:background="@drawable/v2x_alert_window_live_bg"
+    android:padding="@dimen/dp_20">
 
     <com.mogo.module.v2x.view.V2XLiveGSYVideoView
         android:id="@+id/videoPlayer"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_live_window_height"
+        android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivReportHead"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
index 31bafe07bd..5bd9f831bd 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
@@ -2,14 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rlRoadEventDetail"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/module_v2x_event_window_height"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:clipToPadding="false">
 
     <include
         android:id="@+id/liveVideo"
         layout="@layout/item_v2x_live_video"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="match_parent" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
index c6c5b0a658..ec94255986 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
@@ -5,14 +5,15 @@
     android:id="@+id/rlRoadEventDetail"
     android:layout_width="match_parent"
     android:layout_height="@dimen/v2x_video_window_height"
-    android:background="@drawable/v2x_alert_window_bg"
-    android:layout_marginLeft="@dimen/v2x_right_context_magin"
-    android:layout_marginTop="@dimen/dp_22">
+    android:background="@drawable/v2x_alert_window_live_bg"
+    android:layout_marginLeft="@dimen/v2x_right_context_margin"
+    android:layout_marginRight="@dimen/dp_20"
+    android:layout_marginTop="@dimen/dp_30">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvRoadEventList"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="horizontal"
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
index 99bb075aaf..1922ebf2e4 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_live_window_height">
+    android:layout_height="match_parent">
 
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/txcVideoView"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_live_window_height"
+        android:layout_height="@dimen/v2x_video_window_height"
         android:gravity="center" />
 
     <androidx.core.widget.ContentLoadingProgressBar
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 5e45fa03a7..275e7b99c6 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -104,7 +104,7 @@
     <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
 
     <!---->
-    <dimen name="v2x_right_context_magin">460px</dimen>
+    <dimen name="v2x_right_context_margin">460px</dimen>
     <dimen name="v2x_video_window_height">474px</dimen>
     
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 625976b887..f3a326f52a 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -105,7 +105,7 @@
     <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
 
     <!---->
-    <dimen name="v2x_right_context_magin">460px</dimen>
+    <dimen name="v2x_right_context_margin">460px</dimen>
     <dimen name="v2x_video_window_height">474px</dimen>
 
 </resources>
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 0ce4540ea4..f3f01b22e6 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
@@ -102,7 +102,7 @@
     <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
 
     <!--适配直播框-->
-    <dimen name="v2x_right_context_magin">820px</dimen>
+    <dimen name="v2x_right_context_margin">830px</dimen>
     <dimen name="v2x_video_window_height">674px</dimen>
 
 
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_live_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_live_bg_light.xml
new file mode 100644
index 0000000000..1fb3c3e3f0
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_live_bg_light.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#0DCCCCCC" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#26CCCCCC" />
+            <corners android:radius="@dimen/dp_26" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_26" />
+            <gradient
+                android:angle="135"
+                android:endColor="#F5F5F5"
+                android:startColor="#FFFFFF"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file