暂时去除base64图片兼容

app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java

@@ -10,7 +10,6 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.bean.Movie;
 import com.github.tvbox.osc.picasso.RoundTransformation;
-import com.github.tvbox.osc.util.Base64Img;
 import com.github.tvbox.osc.util.DefaultConfig;
 import com.github.tvbox.osc.util.MD5;
 import com.squareup.picasso.MemoryPolicy;
@@ -42,21 +41,16 @@ public class GridAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHolder> {
             //由于部分电视机使用glide报错
             if (!TextUtils.isEmpty(item.pic)) {
                 item.pic=item.pic.trim();
-                if(Base64Img.isBase64Image(item.pic)){
+                Picasso.get()
-                    // 如果是 Base64 图片，解码并设置
+                        .load(DefaultConfig.checkReplaceProxy(item.pic))
-                    ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic));
+                        .transform(new RoundTransformation(MD5.string2MD5(item.pic))
-                }else {
+                                .centerCorp(true)
-                    Picasso.get()
+                                .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 320))
-                            .load(DefaultConfig.checkReplaceProxy(item.pic))
+                                .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
-                            .transform(new RoundTransformation(MD5.string2MD5(item.pic))
+                        .placeholder(R.drawable.img_loading_placeholder)
-                                    .centerCorp(true)
+                        .noFade()
-                                    .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 320))
+                        .error(R.drawable.img_loading_placeholder)
-                                    .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
+                        .into(ivThumb);
-                            .placeholder(R.drawable.img_loading_placeholder)
-                            .noFade()
-                            .error(R.drawable.img_loading_placeholder)
-                            .into(ivThumb);
-                }
             } else {
                 ivThumb.setImageResource(R.drawable.img_loading_placeholder);
             }
@@ -98,21 +92,31 @@ public class GridAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHolder> {
         //由于部分电视机使用glide报错
         if (!TextUtils.isEmpty(item.pic)) {
             item.pic=item.pic.trim();
-            if(Base64Img.isBase64Image(item.pic)){
+//            if(Base64Img.isBase64Image(item.pic)){
-                // 如果是 Base64 图片，解码并设置
+//                // 如果是 Base64 图片，解码并设置
-                ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic));
+//                ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic));
-            }else {
+//            }else {
-                Picasso.get()
+//                Picasso.get()
-                        .load(DefaultConfig.checkReplaceProxy(item.pic))
+//                        .load(DefaultConfig.checkReplaceProxy(item.pic))
-                        .transform(new RoundTransformation(MD5.string2MD5(item.pic))
+//                        .transform(new RoundTransformation(MD5.string2MD5(item.pic))
-                                .centerCorp(true)
+//                                .centerCorp(true)
-                                .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 320))
+//                                .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 320))
-                                .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
+//                                .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
-                        .placeholder(R.drawable.img_loading_placeholder)
+//                        .placeholder(R.drawable.img_loading_placeholder)
-                        .noFade()
+//                        .noFade()
-                        .error(R.drawable.img_loading_placeholder)
+//                        .error(R.drawable.img_loading_placeholder)
-                        .into(ivThumb);
+//                        .into(ivThumb);
-            }
+//            }
+            Picasso.get()
+                    .load(DefaultConfig.checkReplaceProxy(item.pic))
+                    .transform(new RoundTransformation(MD5.string2MD5(item.pic))
+                            .centerCorp(true)
+                            .override(AutoSizeUtils.mm2px(mContext, 240), AutoSizeUtils.mm2px(mContext, 320))
+                            .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
+                    .placeholder(R.drawable.img_loading_placeholder)
+                    .noFade()
+                    .error(R.drawable.img_loading_placeholder)
+                    .into(ivThumb);
         } else {
             ivThumb.setImageResource(R.drawable.img_loading_placeholder);
         }

app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java

@@ -1,9 +1,6 @@
 package com.github.tvbox.osc.ui.adapter;
 
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.text.TextUtils;
-import android.util.Base64;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -15,7 +12,6 @@ import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.bean.Movie;
 import com.github.tvbox.osc.picasso.RoundTransformation;
-import com.github.tvbox.osc.util.Base64Img;
 import com.github.tvbox.osc.util.DefaultConfig;
 import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.MD5;
@@ -63,21 +59,16 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
         //由于部分电视机使用glide报错
         if (!TextUtils.isEmpty(item.pic)) {
             item.pic=item.pic.trim();
-            if(Base64Img.isBase64Image(item.pic)){
+            Picasso.get()
-                // 如果是 Base64 图片，解码并设置
+                    .load(DefaultConfig.checkReplaceProxy(item.pic))
-                ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic));
+                    .transform(new RoundTransformation(MD5.string2MD5(item.pic))
-            }else {
+                            .centerCorp(true)
-                Picasso.get()
+                            .override(AutoSizeUtils.mm2px(mContext, 300), AutoSizeUtils.mm2px(mContext, 400))
-                        .load(DefaultConfig.checkReplaceProxy(item.pic))
+                            .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
-                        .transform(new RoundTransformation(MD5.string2MD5(item.pic))
+                    .placeholder(R.drawable.img_loading_placeholder)
-                                .centerCorp(true)
+                    .noFade()
-                                .override(AutoSizeUtils.mm2px(mContext, 300), AutoSizeUtils.mm2px(mContext, 400))
+                    .error(R.drawable.img_loading_placeholder)
-                                .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
+                    .into(ivThumb);
-                        .placeholder(R.drawable.img_loading_placeholder)
-                        .noFade()
-                        .error(R.drawable.img_loading_placeholder)
-                        .into(ivThumb);
-            }
         } else {
             ivThumb.setImageResource(R.drawable.img_loading_placeholder);
         }