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

This commit is contained in:
tongchenfei
2020-09-03 15:46:54 +08:00
157 changed files with 11198 additions and 14 deletions

View File

@@ -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));
}