From 2d1931dc2396d5872fb9c12d7b3a5b50fb8fa7f2 Mon Sep 17 00:00:00 2001 From: 21561 <215613905@qq.com> Date: Sat, 15 Mar 2025 19:34:03 +0800 Subject: [PATCH] fix bug; --- app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java | 3 +-- .../com/github/tvbox/osc/player/controller/VodController.java | 3 +-- .../java/com/github/tvbox/osc/ui/activity/DetailActivity.java | 2 +- .../java/com/github/tvbox/osc/ui/activity/PlayActivity.java | 1 - .../java/com/github/tvbox/osc/ui/fragment/PlayFragment.java | 4 ++-- app/src/main/java/com/github/tvbox/osc/util/LOG.java | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java index 65129871..52a5ee71 100644 --- a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java +++ b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java @@ -316,7 +316,6 @@ public class ApiConfig { } boolean isJarInImg = jarUrl.startsWith("img+"); - LOG.i("echo---jar_start"); jarUrl = jarUrl.replace("img+", ""); OkGo.get(jarUrl) .headers("User-Agent", userAgent) @@ -362,6 +361,7 @@ public class ApiConfig { if (file != null && file.exists()) { try { if (jarLoader.load(file.getAbsolutePath())) { + LOG.i("echo---load-jar-success"); callback.success(); } else { LOG.e("echo---jar Loader returned false"); @@ -389,7 +389,6 @@ public class ApiConfig { } private void parseJson(String apiUrl, File f) throws Throwable { - System.out.println("从本地缓存加载" + f.getAbsolutePath()); BufferedReader bReader = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8")); StringBuilder sb = new StringBuilder(); String s = ""; diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index 1547b67c..1935e762 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -1094,11 +1094,10 @@ public class VodController extends BaseController { int playerType= mPlayerConfig.getInt("pl"); int p_type = (playerType == 1) ? playerType + 1 : (playerType == 2) ? playerType - 1 : playerType; if (p_type != playerType) { - LOG.i("echo-切换播放器"+(p_type==1?"IJK":"exo")); + Toast.makeText(getContext(), "切换到"+(p_type==1?"IJK":"EXO")+"播放器重试", Toast.LENGTH_SHORT).show(); mPlayerConfig.put("pl", p_type); updatePlayerCfgView(); listener.updatePlayerCfg(); -// listener.replay(false); }else { return true; } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index 3bfc3eb2..ce26eebe 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -630,7 +630,7 @@ public class DetailActivity extends BaseActivity { if (!TextUtils.isEmpty(mVideo.pic)) { Picasso.get() .load(DefaultConfig.checkReplaceProxy(mVideo.pic)) - .transform(new RoundTransformation(MD5.string2MD5(mVideo.pic + mVideo.name)) + .transform(new RoundTransformation(MD5.string2MD5(mVideo.pic)) .centerCorp(true) .override(AutoSizeUtils.mm2px(mContext, 300), AutoSizeUtils.mm2px(mContext, 400)) .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL)) 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 f3607da3..bb19d65f 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 @@ -212,7 +212,6 @@ public class PlayActivity extends BaseActivity { @Override public void replay(boolean replay) { - LOG.i("echo-replay"); autoRetryCount = 0; if(replay){ play(true); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java index 06ddd422..542468a7 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java @@ -161,10 +161,10 @@ public class PlayFragment extends BaseLazyFragment { try { rec = Long.parseLong((String) theCache); } catch (NumberFormatException e) { - System.out.println("String value is not a valid long."); + LOG.i("echo-String value is not a valid long."); } } else { - System.out.println("Value cannot be converted to long."); + LOG.i("echo-Value cannot be converted to long."); } return Math.max(rec, skip); } diff --git a/app/src/main/java/com/github/tvbox/osc/util/LOG.java b/app/src/main/java/com/github/tvbox/osc/util/LOG.java index c904d3de..03cb2529 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/LOG.java +++ b/app/src/main/java/com/github/tvbox/osc/util/LOG.java @@ -8,7 +8,7 @@ import android.util.Log; * @description: */ public class LOG { - private static String TAG = "TVBox"; + private static String TAG = "TVBox-runtime"; public static void e(String msg) { Log.e(TAG, "" + msg);