Remove the Picasso replace Glide

onReach · Aug 28, 2016 · bd870e0 · bd870e0
1 parent a5188e7
commit bd870e0
Show file tree

Hide file tree

Showing 27 changed files with 177 additions and 80 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     compile 'org.jsoup:jsoup:1.8.3'
     //烈焰弹幕库
     compile 'com.github.ctiao:dfm:0.4.1'
-    //Picasso图片加载库
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    //Glide 图片加载库
+    compile 'com.github.bumptech.glide:glide:3.7.0'
     //tabLayout
     compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
     //标签布局

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/ActivityCenterRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/ActivityCenterRecyclerAdapter.java
@@ -7,10 +7,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.recommended.RecommendInfo;
-import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
@@ -49,8 +50,11 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
         if (holder instanceof ItemViewHolder)
         {
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
-            Picasso.with(getContext())
+
+            Glide.with(getContext())
                     .load(activitys.get(position).getCover())
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mVideoImg);
             itemViewHolder.mVideoTitle.setText(activitys.get(position).getTitle());

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BangumiIndexAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BangumiIndexAdapter.java
@@ -7,10 +7,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.BangumiIndex;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +52,13 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
         {
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             BangumiIndex bangumiIndex = bangumiIndexList.get(position);
-            Picasso.with(getContext()).load(bangumiIndex.cover).into(itemViewHolder.mImageView);
+
+            Glide.with(getContext())
+                    .load(bangumiIndex.cover)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
+                    .placeholder(R.drawable.bili_default_image_tv)
+                    .into(itemViewHolder.mImageView);
             itemViewHolder.mTextView.setText(bangumiIndex.title);
         }
         super.onBindViewHolder(holder, position);

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BangumiRecommendRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BangumiRecommendRecyclerAdapter.java
@@ -8,10 +8,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.BangumiRecommend;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,10 +54,12 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
         {
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             BangumiRecommend.RecommendsBean recommendsBean = recommends.get(position);
-            Picasso.with(getContext())
+
+            Glide.with(getContext())
                     .load(recommendsBean.getPic())
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
-                    .error(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mImage);
 
             itemViewHolder.mTitle.setText(recommendsBean.getTitle());

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BiliBiliLiveRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/BiliBiliLiveRecyclerAdapter.java
@@ -10,6 +10,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.liveholder.LiveBannerViewHolder;
 import com.hotbitmapgg.ohmybilibili.adapter.liveholder.LiveEntranceViewHolder;
@@ -20,7 +22,6 @@
 import com.hotbitmapgg.ohmybilibili.entity.live.LiveIndex;
 import com.hotbitmapgg.ohmybilibili.entity.live.PartitionSub;
 import com.hotbitmapgg.ohmybilibili.module.home.live.BiliBiliLivePlayerActivity;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -160,28 +161,38 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position)
             //liveIndex.entranceIcons.get(position).name
             //liveIndex.entranceIcons.get(position).entrance_icon.src
             ((LiveEntranceViewHolder) holder).title.setText(entranceTitles[position]);
-            Picasso.with(context)
+
+            Glide.with(context)
                     .load(entranceIconRes[position])
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .into(((LiveEntranceViewHolder) holder).image);
+
         } else if (holder instanceof LiveItemViewHolder)
         {
             try
             {
                 item = liveIndex.partitions.get(partitionCol(position))
                         .lives.get(position - 1 - entranceSize - partitionCol(position) * 5);
 
-                Picasso.with(context)
+                Glide.with(context)
                         .load(item.cover.src)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
                         .placeholder(R.drawable.bili_default_image_tv)
                         .into(((LiveItemViewHolder) holder).itemLiveCover);
 
                 ((LiveItemViewHolder) holder).itemLiveTitle.setText(item.title);
                 ((LiveItemViewHolder) holder).itemLiveUser.setText(item.owner.name);
 
-                Picasso.with(context)
+                Glide.with(context)
                         .load(item.owner.face)
+                        .centerCrop()
+                        .dontAnimate()
+                        .placeholder(R.drawable.ico_user_default)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
                         .into(((LiveItemViewHolder) holder).itemLiveUserCover);
-                ((LiveItemViewHolder) holder).itemLiveCount.setText(item.online + "");
+
+
+                ((LiveItemViewHolder) holder).itemLiveCount.setText(String.valueOf(item.online));
                 ((LiveItemViewHolder) holder).itemLiveLayout.setOnClickListener(new View.OnClickListener()
                 {
 
@@ -206,8 +217,10 @@ public void onClick(View v)
         } else if (holder instanceof LivePartitionViewHolder)
         {
             partition = liveIndex.partitions.get(partitionCol(position)).partition;
-            Picasso.with(context)
+
+            Glide.with(context)
                     .load(partition.sub_icon.src)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .into(((LivePartitionViewHolder) holder).itemIcon);
 
             ((LivePartitionViewHolder) holder).itemTitle.setText(partition.name);

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/GameCentreAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/GameCentreAdapter.java
@@ -9,11 +9,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.game.GameItem;
 import com.hotbitmapgg.ohmybilibili.module.common.WebActivity;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,10 +54,12 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
         {
             ItemViewHolder mHolder = (ItemViewHolder) holder;
             final GameItem gameItem = games.get(position);
-            Picasso.with(getContext())
+
+            Glide.with(getContext())
                     .load(gameItem.imageRes)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
-                    .error(R.drawable.bili_default_image_tv)
                     .into(mHolder.mImageView);
 
             mHolder.mTitle.setText(gameItem.name);

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/HotVideoIndexRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/HotVideoIndexRecyclerAdapter.java
@@ -8,10 +8,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.video.VideoItemInfo;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,10 +57,11 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             itemViewHolder.mVideoPlayNum.setText(videoItemInfo.play);
             itemViewHolder.mVideoReviewCount.setText(String.valueOf(videoItemInfo.video_review));
 
-            Picasso.with(getContext())
+            Glide.with(getContext())
                     .load(Uri.parse(videoItemInfo.pic))
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
-                    .error(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mVideoImg);
         }
         super.onBindViewHolder(holder, position);

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/PartitionMoreRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/PartitionMoreRecyclerAdapter.java
@@ -8,10 +8,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.partition.PartitionMoreVideoItem;
-import com.squareup.picasso.Picasso;
 
 import java.util.List;
 
@@ -49,10 +50,11 @@ public void onBindViewHolder(AbsRecyclerViewAdapter.ClickableViewHolder holder,
                 PartitionMoreVideoItem videoItemInfo = mList.get(position);
                 mHolder.mTitleView.setText(videoItemInfo.title == null ? "" : videoItemInfo.title);
 
-                Picasso.with(getContext())
+                Glide.with(getContext())
                         .load(Uri.parse(videoItemInfo.pic))
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .centerCrop()
                         .placeholder(R.drawable.bili_default_image_tv)
-                        .error(R.drawable.bili_default_image_tv)
                         .into(mHolder.mPreviewImage);
 
                 String play = videoItemInfo.play;

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/SpecialVideoRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/SpecialVideoRecyclerAdapter.java
@@ -9,10 +9,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.SpecialTopic;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,9 +56,10 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             SpecialTopic.Item item = spItems.get(position);
             itemViewHolder.mSpNum.setText("第" + item.episode + "话");
-            String cover = item.cover;
-            Picasso.with(getContext())
-                    .load(Uri.parse(cover))
+
+            Glide.with(getContext())
+                    .load(Uri.parse(item.cover))
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .placeholder(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mPreviewImage);
         }

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/TwoDimensionalRecyclerAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/TwoDimensionalRecyclerAdapter.java
@@ -7,10 +7,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.bangumi.TwoDimensional;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,10 +53,10 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             TwoDimensional.ListBean listBean = twoDimensionals.get(position);
 
-            Picasso.with(getContext())
+            Glide.with(getContext())
                     .load(listBean.getCover())
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .placeholder(R.drawable.bili_default_image_tv)
-                    .error(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mImage);
 
             itemViewHolder.mTitle.setText(listBean.getTitle());

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UpMoreCoverAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UpMoreCoverAdapter.java
@@ -7,11 +7,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.user.UserUpVideoInfo;
 import com.hotbitmapgg.ohmybilibili.network.auxiliary.UrlHelper;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,10 +54,11 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             UserUpVideoInfo.VlistBean vlistBean = userVideoList.get(position);
 
-            Picasso.with(getContext())
+            Glide.with(getContext())
                     .load(UrlHelper.getClearVideoPreviewUrl(vlistBean.getPic()))
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
-                    .error(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mVideoPic);
 
             itemViewHolder.mVideoTitle.setText(vlistBean.getTitle());

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UserFansAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UserFansAdapter.java
@@ -6,11 +6,12 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.user.UserFans;
 import com.hotbitmapgg.ohmybilibili.widget.CircleImageView;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,11 +56,15 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             itemViewHolder mHolder = (itemViewHolder) holder;
             UserFans.FansInfo fansInfo = infos.get(position);
 
-            Picasso.with(getContext())
+            Glide.with(getContext())
                     .load(fansInfo.face)
+                    .centerCrop()
+                    .dontAnimate()
                     .placeholder(R.drawable.ico_user_default)
-                    .error(R.drawable.bili_default_image_tv)
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
                     .into(mHolder.mUserAvatar);
+
+
             mHolder.mUserName.setText(fansInfo.uname);
         }
     }

diff --git a/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UserUpVideoAdapter.java b/app/src/main/java/com/hotbitmapgg/ohmybilibili/adapter/UserUpVideoAdapter.java
@@ -7,11 +7,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.hotbitmapgg.ohmybilibili.R;
 import com.hotbitmapgg.ohmybilibili.adapter.base.AbsRecyclerViewAdapter;
 import com.hotbitmapgg.ohmybilibili.entity.user.UserUpVideoInfo;
 import com.hotbitmapgg.ohmybilibili.network.auxiliary.UrlHelper;
-import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,11 +54,14 @@ public void onBindViewHolder(ClickableViewHolder holder, int position)
             ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
             UserUpVideoInfo.VlistBean vlistBean = parts.get(position);
 
-            Picasso.with(getContext())
+            Glide.with(getContext())
                     .load(UrlHelper.getClearVideoPreviewUrl(vlistBean.getPic()))
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .centerCrop()
                     .placeholder(R.drawable.bili_default_image_tv)
                     .into(itemViewHolder.mVideoPic);
 
+
             itemViewHolder.mVideoTitle.setText(vlistBean.getTitle());
             itemViewHolder.mVideoPlayNum.setText(String.valueOf(vlistBean.getPlay()));
             itemViewHolder.mVideoReviewNum.setText(String.valueOf(vlistBean.getVideo_review()));