Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsCardCoverHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
+import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
@@ -9,8 +10,6 @@ import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -53,22 +52,21 @@ public class ContentsCardCoverHolder extends ContentsHolder<ContentsItemBean> {
   protected void bindInternal() {
     imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     Glide.with(imageViewCardListicleCover)
-      //.asBitmap()
-      .asGif()
-      .transition(new DrawableTransitionOptions().crossFade(100))
+      //    .asBitmap()
+      //    .transition(new BitmapTransitionOptions().crossFade(100))
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
-      .apply(new RequestOptions().skipMemoryCache(true))
       // 커버에는 placeholder 없음.
 //      .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewCardListicleCover.getContext(), R.drawable.image_loading_full)))
       .load(bean.getImageUrl())
-      .listener(new RequestListener<GifDrawable>() {
+      .apply(new RequestOptions().skipMemoryCache(true))
+      .listener(new RequestListener<Drawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dimTop, dimBottom);
           imageViewCardListicleCover.setImageResource(0);
           imageViewCardListicleCover.setScaleType(ImageView.ScaleType.CENTER_CROP);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsCardHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
+import android.graphics.drawable.Drawable;
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
@@ -11,7 +12,6 @@ import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -59,18 +59,19 @@ public class ContentsCardHolder extends ContentsHolder<ContentsItemBean> {
 
     // 기본 이미지
     Glide.with(imageViewCardListicleCover)
-      .asGif().load(bean.getImageUrl())
+      //.asBitmap()
+      .load(bean.getImageUrl())
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().skipMemoryCache(true))
       .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewCardListicleCover.getContext(), R.drawable.image_loading_full)))
-      .listener(new RequestListener<GifDrawable>() {
+      .listener(new RequestListener<Drawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dim0, dim1);
           return false;
         }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsListicleCoverHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
+import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
@@ -8,8 +9,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -75,21 +74,21 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsItemBean
 
     imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     Glide.with(imageViewBackground)
-      //.asBitmap().load(bean.getImageUrl())
-      .asGif().load(bean.getImageUrl())
-      .transition(new DrawableTransitionOptions().crossFade(100))
+      //.asBitmap()
+      .load(bean.getImageUrl())
+      //.transition(new BitmapTransitionOptions().crossFade(100))
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().skipMemoryCache(true))
       // 커버에는 placeholder 없음.
 //      .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewBackground.getContext(), R.drawable.image_loading_full)))
-      .listener(new RequestListener<GifDrawable>() {
+      .listener(new RequestListener<Drawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dim);
           imageViewBackground.setImageResource(0);
           imageViewBackground.setScaleType(ImageView.ScaleType.CENTER_CROP);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/view/ListicleImageViewHolder.java

@@ -51,13 +51,14 @@ public class ListicleImageViewHolder extends RecyclerView.ViewHolder {
   public void bind(ContentsDetailImageBean bean, IEventListener listener) {
     this.bean = bean;
     this.listener = listener;
-
     Glide.with(imageViewBackground)
-      .asGif()
+      //     .asBitmap()
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
+      .load(bean.getImageUrl())
       .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewBackground.getContext(), R.drawable.image_loading_full)))
       .apply(new RequestOptions().skipMemoryCache(true))
-      .load(bean.getImageUrl()).into(imageViewBackground);
+      .into(imageViewBackground);
+
 
     if (null != bean.getCopyright()) {
       textViewCopyRight.setText(bean.getCopyright());

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

@@ -5,6 +5,7 @@ package kr.co.zumo.app.lifeplus.view.screen.main;
 
 import android.content.Context;
 import android.graphics.Matrix;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
@@ -17,7 +18,6 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -351,23 +351,23 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
     int overrideHeight = maskHeight + ResourceUtil.dpToPx(50);
 
     Glide.with(imageView)
-      .asGif()
+//      .asBitmap()
       .load(url)
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
 //      .apply(new RequestOptions().skipMemoryCache(true))
 //      .apply(new RequestOptions().centerCrop())
       .apply(new RequestOptions().placeholder((ResourceUtil.getDrawable(imageView.getContext(), R.drawable.image_loading_main))))
       .apply(new RequestOptions().override(/*maskWidth + ResourceUtil.dpToPx(200)*/ overrideWidth, overrideHeight))
-      .listener(new RequestListener<GifDrawable>() {
+      .listener(new RequestListener<Drawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
           showFlag();
 
           return false;
         }
 
         @Override
-        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
           imageWidth = overrideWidth;
           imageHeight = overrideHeight;
 
@@ -383,7 +383,6 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
 
           return false;
         }
-
       })
       .into(imageView);
   }