From fc9710eb88579f2bcc0a202e4cae433689c28c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com> Date: Fri, 21 Feb 2025 15:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=92=AD=E6=94=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91,=E5=87=8F=E5=B0=91=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tvbox/osc/ui/activity/PlayActivity.java | 14 +- .../tvbox/osc/ui/adapter/GridAdapter.java | 134 +++++------------- .../osc/ui/adapter/HomeHotVodAdapter.java | 15 +- .../tvbox/osc/ui/fragment/PlayFragment.java | 17 ++- 4 files changed, 62 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java index 169584fc..18e346a9 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java @@ -215,7 +215,11 @@ public class PlayActivity extends BaseActivity { @Override public void replay(boolean replay) { autoRetryCount = 0; - play(replay); + if(replay){ + play(true); + }else { + playUrl(webPlayUrl,webHeaderMap); + } } @Override @@ -850,9 +854,15 @@ public class PlayActivity extends BaseActivity { } if (autoRetryCount < 2) { + if(autoRetryCount==1){ + //第二次重试时重新调用接口 + play(false); + }else { + //第一次重试直接带着原地址继续播放 + playUrl(webPlayUrl, webHeaderMap); + } autoRetryCount++; // play(false); - playUrl(webPlayUrl, webHeaderMap); return true; } else { autoRetryCount = 0; diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java index 317d8071..efaabba0 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/GridAdapter.java @@ -1,69 +1,51 @@ 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.ImageView; import android.widget.TextView; -import androidx.collection.LruCache; - import com.chad.library.adapter.base.BaseQuickAdapter; 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; import com.squareup.picasso.Picasso; import java.util.ArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import me.jessyan.autosize.utils.AutoSizeUtils; +/** + * @author pj567 + * @date :2020/12/21 + * @description: + */ public class GridAdapter extends BaseQuickAdapter { private boolean mShowList = false; - // 内存缓存 - private LruCache bitmapCache; - // 线程池 - private ExecutorService executorService; - public GridAdapter(boolean l) { - super(l ? R.layout.item_list : R.layout.item_grid, new ArrayList<>()); + super( l ? R.layout.item_list:R.layout.item_grid, new ArrayList<>()); this.mShowList = l; - - // 初始化内存缓存，缓存大小为运行内存的 1/8 - int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 8); - bitmapCache = new LruCache(cacheSize) { - @Override - protected int sizeOf(String key, Bitmap value) { - return value.getByteCount(); - } - }; - - // 初始化线程池 - executorService = Executors.newFixedThreadPool(5); // 可根据需要调整线程数量 } @Override protected void convert(BaseViewHolder helper, Movie.Video item) { - if (this.mShowList) { + if(this.mShowList) { helper.setText(R.id.tvNote, item.note); helper.setText(R.id.tvName, item.name); ImageView ivThumb = helper.getView(R.id.ivThumb); - + //由于部分电视机使用glide报错 if (!TextUtils.isEmpty(item.pic)) { - item.pic = item.pic.trim(); - if (isBase64Image(item.pic)) { - // 异步加载 Base64 图片 - loadBase64ImageAsync(item.pic, ivThumb); - } else { - // 加载网络图片 + item.pic=item.pic.trim(); + if(Base64Img.isBase64Image(item.pic)){ + // 如果是 Base64 图片，解码并设置 + ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic)); + }else { Picasso.get() .load(DefaultConfig.checkReplaceProxy(item.pic)) .transform(new RoundTransformation(MD5.string2MD5(item.pic)) @@ -81,7 +63,6 @@ public class GridAdapter extends BaseQuickAdapter { return; } - // 处理列表模式的其他逻辑 TextView tvYear = helper.getView(R.id.tvYear); if (item.year <= 0) { tvYear.setVisibility(View.GONE); @@ -91,9 +72,20 @@ public class GridAdapter extends BaseQuickAdapter { } TextView tvLang = helper.getView(R.id.tvLang); tvLang.setVisibility(View.GONE); + /*if (TextUtils.isEmpty(item.lang)) { + tvLang.setVisibility(View.GONE); + } else { + tvLang.setText(item.lang); + tvLang.setVisibility(View.VISIBLE); + }*/ TextView tvArea = helper.getView(R.id.tvArea); tvArea.setVisibility(View.GONE); - + /*if (TextUtils.isEmpty(item.area)) { + tvArea.setVisibility(View.GONE); + } else { + tvArea.setText(item.area); + tvArea.setVisibility(View.VISIBLE); + }*/ if (TextUtils.isEmpty(item.note)) { helper.setVisible(R.id.tvNote, false); } else { @@ -103,12 +95,13 @@ public class GridAdapter extends BaseQuickAdapter { helper.setText(R.id.tvName, item.name); helper.setText(R.id.tvActor, item.actor); ImageView ivThumb = helper.getView(R.id.ivThumb); - + //由于部分电视机使用glide报错 if (!TextUtils.isEmpty(item.pic)) { - item.pic = item.pic.trim(); - if (isBase64Image(item.pic)) { - loadBase64ImageAsync(item.pic, ivThumb); - } else { + item.pic=item.pic.trim(); + if(Base64Img.isBase64Image(item.pic)){ + // 如果是 Base64 图片，解码并设置 + ivThumb.setImageBitmap(Base64Img.decodeBase64ToBitmap(item.pic)); + }else { Picasso.get() .load(DefaultConfig.checkReplaceProxy(item.pic)) .transform(new RoundTransformation(MD5.string2MD5(item.pic)) @@ -124,63 +117,4 @@ public class GridAdapter extends BaseQuickAdapter { ivThumb.setImageResource(R.drawable.img_loading_placeholder); } } - - private boolean isBase64Image(String picUrl) { - return picUrl.startsWith("data:image"); - } - - private void loadBase64ImageAsync(String base64Str, ImageView imageView) { - Bitmap cachedBitmap = bitmapCache.get(base64Str); - if (cachedBitmap != null) { - // 如果缓存中有，直接加载 - imageView.setImageBitmap(cachedBitmap); - } else { - // 异步加载 - executorService.execute(() -> { - Bitmap bitmap = decodeBase64ToBitmap(base64Str); - if (bitmap != null) { - // 存入缓存 - bitmapCache.put(base64Str, bitmap); - // 更新 UI - imageView.post(() -> imageView.setImageBitmap(bitmap)); - } - }); - } - } - - private Bitmap decodeBase64ToBitmap(String base64Str) { - try { - // 提取 Base64 数据部分 - String base64Data = base64Str.substring(base64Str.indexOf(",") + 1); - byte[] decodedBytes = Base64.decode(base64Data, Base64.DEFAULT); - - // 限制解码图片尺寸，防止内存过高 - BitmapFactory.Options options = new BitmapFactory.Options(); - options.inJustDecodeBounds = true; // 只解析尺寸 - BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length, options); - - options.inSampleSize = calculateInSampleSize(options, 180, 260); // 设置缩放比例 - options.inJustDecodeBounds = false; - return BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length, options); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) { - int height = options.outHeight; - int width = options.outWidth; - int inSampleSize = 1; - - if (height > reqHeight || width > reqWidth) { - final int halfHeight = height / 2; - final int halfWidth = width / 2; - - while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) { - inSampleSize *= 2; - } - } - return inSampleSize; - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java index f44e9e40..65c67b00 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java @@ -15,6 +15,7 @@ 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; @@ -62,9 +63,9 @@ public class HomeHotVodAdapter extends BaseQuickAdapter