Merge remote-tracking branch 'origin/dev' into dev

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java

@@ -19,13 +19,13 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.entity.MarkerExploreWay;
+import com.mogo.module.common.glide.SkinAbleBitmapTarget;
 import com.mogo.module.tanlu.R;
 import com.mogo.module.tanlu.callback.IThumbsUpCallback;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.tanlu.model.TanluModelData;
 import com.mogo.module.tanlu.model.event.CloseWindowInfo;
 import com.mogo.module.tanlu.model.event.ControlClickUpInfo;
-import com.mogo.module.tanlu.model.event.DataErrorInfo;
 import com.mogo.module.tanlu.model.event.StartPlayInfo;
 import com.mogo.module.tanlu.model.event.VoiceControlUpInfo;
 import com.mogo.module.tanlu.util.ChartUtil;
@@ -372,9 +372,10 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
                 .error(R.drawable.tanlu_normal_image)
                 .fallback(R.drawable.tanlu_normal_image);
         Glide.with(mContext)
+                .asBitmap()
                 .load(imageUrl)
                 .apply(requestOptions)
-                .into(autoZoomInImageView);
+                .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
     }
 
 

modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/tanlu_module_card_height"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/tanlu_gradual_change_bg">
 
     <!--视频播放器和图片播放器-->
@@ -37,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:src="@drawable/tanlu_normal_image"
+            tools:src="@drawable/tanlu_normal_image"
             android:scaleType="fitXY" />
     </com.mogo.module.tanlu.view.RoundLayout>