From f3eaa3252bf7b5b28b759b949c42571fca7e4a5c Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 17 Sep 2020 15:31:07 +0800
Subject: [PATCH] opt

---
 .../res/drawable/tanlu_alert_window_bg.xml    | 38 +++++++++++++++++
 .../tanlu_item_main_media_recycler_new.xml    |  3 +-
 .../layout/tanlu_main_media_recycler_new.xml  |  6 +--
 .../src/main/res/values-mdpi/dimens.xml       |  3 +-
 .../res/values-xhdpi-1920x1000/dimens.xml     |  7 ++--
 .../src/main/res/values-xhdpi/dimens.xml      | 13 +++---
 .../src/main/res/values/dimens.xml            |  3 +-
 .../drawable/tanlu_alert_window_bg_light.xml  | 41 +++++++++++++++++++
 8 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml

diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
new file mode 100644
index 0000000000..7ae04a2bed
--- /dev/null
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_30" />
+            <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-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
index 622a231939..d814bc3f20 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
@@ -2,8 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/tanlu_module_card_height">
+    android:layout_height="wrap_content">
     <!--    android:background="@drawable/tanlu_gradual_change_bg"-->
+
     <com.mogo.module.tanlu.view.RoundLayout
         android:id="@+id/media_layout"
         android:layout_width="@dimen/tanlu_module_card_video_width"
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml
index 6bafcfdbbb..409302fbaf 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml
@@ -3,14 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="@dimen/tanlu_module_card_height"
     android:layout_alignParentRight="true"
-    android:background="@drawable/tanlu_top_bg">
+    android:background="@drawable/tanlu_alert_window_bg">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/tanlu_rloop_recycleview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        tools:listitem="@layout/tanlu_item_main_media_recycler_new"
         />
-<!--    tools:listitem="@layout/tanlu_item_main_media_recycler_new"-->
 </RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
index 2daeba4505..7716b8ccc7 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
@@ -78,6 +78,7 @@
     <!--new-->
     <dimen name="tanlu_module_card_width">642px</dimen>
     <dimen name="tanlu_module_card_height">186px</dimen>
+    <dimen name="tanlu_module_card_inner_height">176px</dimen>
     <dimen name="tanlu_module_card_video_width">250px</dimen>
     <dimen name="tanlu_module_card_video_height">172px</dimen>
     <dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
 
     <dimen name="tanlu_head_image_size">28px</dimen>
     <dimen name="tanlu_image_size">56px</dimen>
-    <dimen name="tanlu_button_radius_size">3px</dimen>
+    <dimen name="tanlu_button_radius_size">6px</dimen>
     <dimen name="tanlu_normal_image_radius_size">16px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 35ac4ea9c3..4062891c80 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -78,13 +78,14 @@
     <!--new-->
     <dimen name="tanlu_module_card_width">1233px</dimen>
     <dimen name="tanlu_module_card_height">326px</dimen>
+    <dimen name="tanlu_module_card_inner_height">306px</dimen>
     <dimen name="tanlu_module_card_video_width">480px</dimen>
-    <dimen name="tanlu_module_card_video_height">280px</dimen>
+    <dimen name="tanlu_module_card_video_height">290px</dimen>
     <dimen name="tanlu_module_close_height">80px</dimen>
     
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
     <dimen name="tanlu_module_card_margin_left">12px</dimen>
-    <dimen name="tanlu_module_margin_right">12px</dimen>
+    <dimen name="tanlu_module_margin_right">24px</dimen>
     <dimen name="tanlu_module_margin_left">30px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
@@ -92,7 +93,7 @@
 
     <dimen name="tanlu_head_image_size">50px</dimen>
     <dimen name="tanlu_image_size">90px</dimen>
-    <dimen name="tanlu_button_radius_size">6px</dimen>
+    <dimen name="tanlu_button_radius_size">10px</dimen>
     <dimen name="tanlu_normal_image_radius_size">30px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
index 205767293e..88af7354b4 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
@@ -77,22 +77,23 @@
 
     <!--new-->
     <dimen name="tanlu_module_card_width">1060px</dimen>
-    <dimen name="tanlu_module_card_height">326px</dimen>
+    <dimen name="tanlu_module_card_height">330px</dimen>
+    <dimen name="tanlu_module_card_inner_height">306px</dimen>
     <dimen name="tanlu_module_card_video_width">421px</dimen>
-    <dimen name="tanlu_module_card_video_height">280px</dimen>
+    <dimen name="tanlu_module_card_video_height">290px</dimen>
     <dimen name="tanlu_module_close_height">80px</dimen>
 
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
-    <dimen name="tanlu_module_card_margin_left">5px</dimen>
-    <dimen name="tanlu_module_margin_right">0px</dimen>
-    <dimen name="tanlu_module_margin_left">30px</dimen>
+    <dimen name="tanlu_module_card_margin_left">13px</dimen>
+    <dimen name="tanlu_module_margin_right">24px</dimen>
+    <dimen name="tanlu_module_margin_left">15px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
     <dimen name="tanlu_module_button_height">46px</dimen>
 
     <dimen name="tanlu_head_image_size">50px</dimen>
     <dimen name="tanlu_image_size">98px</dimen>
-    <dimen name="tanlu_button_radius_size">6px</dimen>
+    <dimen name="tanlu_button_radius_size">10px</dimen>
     <dimen name="tanlu_normal_image_radius_size">30px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
index 2daeba4505..7716b8ccc7 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -78,6 +78,7 @@
     <!--new-->
     <dimen name="tanlu_module_card_width">642px</dimen>
     <dimen name="tanlu_module_card_height">186px</dimen>
+    <dimen name="tanlu_module_card_inner_height">176px</dimen>
     <dimen name="tanlu_module_card_video_width">250px</dimen>
     <dimen name="tanlu_module_card_video_height">172px</dimen>
     <dimen name="tanlu_module_close_height">45px</dimen>
@@ -92,7 +93,7 @@
 
     <dimen name="tanlu_head_image_size">28px</dimen>
     <dimen name="tanlu_image_size">56px</dimen>
-    <dimen name="tanlu_button_radius_size">3px</dimen>
+    <dimen name="tanlu_button_radius_size">6px</dimen>
     <dimen name="tanlu_normal_image_radius_size">16px</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
new file mode 100644
index 0000000000..afd05b86dd
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:radius="@dimen/dp_30" />
+            <padding
+                android:bottom="10dp"
+                android:left="10dp"
+                android:right="10dp"
+                android:top="10dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file