From 3861f53167a5d36e45799ea0d38744c5b185df82 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 2 Sep 2020 20:23:45 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E7=99=BD+=E9=BB=91=20=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E9=83=A8=E5=88=86?=
 =?UTF-8?q?UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/item_v2x_road_live_car_detail.xml  | 79 ++++++++++---------
 .../res/layout/v2x_network_loading_item.xml   |  2 +-
 .../res/layout/view_video_layout_normal.xml   |  4 +-
 .../src/main/res/values/colors.xml            |  2 +
 .../drawable/v2x_alert_window_bg_light.xml    | 11 +++
 5 files changed, 59 insertions(+), 39 deletions(-)
 create mode 100644 skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml

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 e25e2db5f7..aec79a948f 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
@@ -6,45 +6,52 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvRoadEventList"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:overScrollMode="never"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_v2x_live_video" />
+        android:layout_height="match_parent"
+        app:cardBackgroundColor="#FFFFFF"
+        app:cardCornerRadius="12px"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/tvEventStubClose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_25"
-        android:layout_marginTop="@dimen/dp_20"
-        android:background="@drawable/bg_count_down"
-        android:paddingLeft="@dimen/dp_12"
-        android:paddingTop="@dimen/dp_3"
-        android:paddingRight="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_3"
-        android:text="30s"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_30"
-        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvRoadEventList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:overScrollMode="never"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/item_v2x_live_video" />
 
-    <ImageView
-        android:layout_width="@dimen/dp_130"
-        android:layout_height="@dimen/dp_46"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_28"
-        android:layout_marginEnd="@dimen/dp_28"
-        android:src="@drawable/v2x_icon_event_live_top"
-        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
-        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+        <TextView
+            android:id="@+id/tvEventStubClose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_20"
+            android:background="@drawable/bg_count_down"
+            android:paddingLeft="@dimen/dp_12"
+            android:paddingTop="@dimen/dp_3"
+            android:paddingRight="@dimen/dp_12"
+            android:paddingBottom="@dimen/dp_3"
+            android:text="30s"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/dp_30"
+            app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
+            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
+        <ImageView
+            android:layout_width="@dimen/dp_130"
+            android:layout_height="@dimen/dp_46"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_28"
+            android:layout_marginEnd="@dimen/dp_28"
+            android:src="@drawable/v2x_icon_event_live_top"
+            app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
+            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
+    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index e158e640af..5cc9085387 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -13,7 +13,7 @@
         android:layout_height="200px"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="133px"
+        android:layout_marginTop="60px"
         android:background="@drawable/v_to_x_loading_car0000"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintVertical_bias="0.5"
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 3c5ab90cdd..a44cf3711a 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
@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_20"
             android:text="直播获取失败"
-            android:textColor="#FFFFFFFF"
+            android:textColor="@color/v2x_FFF_333_white"
             android:textSize="@dimen/dp_36"
             app:layout_constraintBottom_toBottomOf="@+id/ivErrorIcon"
             app:layout_constraintStart_toEndOf="@+id/ivErrorIcon"
@@ -60,7 +60,7 @@
             android:paddingEnd="@dimen/dp_135"
             android:paddingBottom="@dimen/dp_25"
             android:text="重试"
-            android:textColor="#FFFFFF"
+            android:textColor="@color/v2x_FFF_333_white"
             android:textSize="@dimen/dp_34"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 827bd35c63..918a85b0b2 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -15,6 +15,8 @@
     <color name="share_event_no_more_color">#99FFFFFF</color>
     <color name="v2x_FFF_999_white">#FFFFFF</color>
     <color name="v2x_FFF_333_white">#FFFFFF</color>
+    <color name="v2x_ff6163_333_white">#ff616381</color>
+    //endColor="#ff616381" android:startColor="#ff48495e"
 
 
 
diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml
new file mode 100644
index 0000000000..a6ee48b155
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_40" />
+    <gradient
+        android:angle="135"
+        android:endColor="#F5F5F5"
+        android:startColor="#FFFFFF"
+        android:type="linear"
+        android:useLevel="true" />
+</shape>
\ No newline at end of file