From 28729b7659b497447fc8f0d3245c51eb63350459 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 15 Sep 2020 12:59:44 +0800
Subject: [PATCH] opt ui

---
 .idea/codeStyles/Project.xml                    | 15 +++------------
 .../fragment/recycler/TanluSlideAdapterNew.java | 17 ++++++++---------
 .../tanlu/video/SimpleCoverVideoPlayer.kt       |  6 +++---
 .../tanlu_item_main_media_recycler_new.xml      |  2 +-
 .../src/main/module-v2x-res/values/colors.xml   |  1 -
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937bb..663459aa50 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
     </JetCodeStyleSettings>
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
index d88eb7c9e9..edba6ffed2 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
@@ -333,16 +333,16 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
             RequestOptions requestOptions = new RequestOptions()
                     .placeholder(R.drawable.tanlu_normal_image)
                     .error(R.drawable.tanlu_normal_image);
-            Glide.with(mContext)
-                    .load(mImageUrl)
-                    .apply(requestOptions)
-                    .into(autoZoomInImageView);
-
 //            Glide.with(mContext)
-//                    .asBitmap()
 //                    .load(mImageUrl)
 //                    .apply(requestOptions)
-//                    .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
+//                    .into(autoZoomInImageView);
+
+            Glide.with(mContext)
+                    .asBitmap()
+                    .load(mImageUrl)
+                    .apply(requestOptions)
+                    .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
         }
 
         traceVideoPlayStatusData();
@@ -374,8 +374,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
         //加载图片
         RequestOptions requestOptions = new RequestOptions()
                 .placeholder(R.drawable.tanlu_normal_image)
-                .error(R.drawable.tanlu_normal_image)
-                .fallback(R.drawable.tanlu_normal_image);
+                .error(R.drawable.tanlu_normal_image);
         Glide.with(mContext)
                 .asBitmap()
                 .load(imageUrl)
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
index 95bfc5700e..c66fbead76 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
+import com.mogo.module.common.glide.SkinAbleBitmapTarget
 import com.mogo.module.tanlu.R
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
@@ -59,11 +60,10 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
         val requestOptions = RequestOptions()
                 .placeholder(R.drawable.tanlu_normal_image)
                 .error(R.drawable.tanlu_normal_image)
-        Glide.with(mContext)
+        Glide.with(mContext).asBitmap()
             .load(url)
             .apply(requestOptions)
-            .into(coverImage)
-
+            .into(SkinAbleBitmapTarget(coverImage, requestOptions))
 
     }
 
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 81c7cc2c7d..1bc521c085 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
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            tools:src="@drawable/tanlu_normal_image"
+            android:src="@drawable/tanlu_normal_image"
             android:scaleType="fitXY" />
     </com.mogo.module.tanlu.view.RoundLayout>
 
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index acfa530deb..3e51d334d1 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -8,7 +8,6 @@
     <color name="v2x_white_light">#333333</color>
     <color name="v2x_item_white_light">#FFFFFF</color>
     <color name="v2x_white_refresh_light">#FFFFFF</color>
-    <color name="transparent_white_30_light">#333333</color>
     <color name="share_event_no_more_color_light">#333333</color>
     <color name="v2x_FFF_999_light">#999999</color>
     <color name="v2x_FFF_333_light">#333333</color>