pull/144/head
21561 1 year ago
parent 10253f127e
commit 2d1931dc23
  1. 3
      app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
  2. 3
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  3. 2
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  4. 1
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  5. 4
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  6. 2
      app/src/main/java/com/github/tvbox/osc/util/LOG.java

@ -316,7 +316,6 @@ public class ApiConfig {
}
boolean isJarInImg = jarUrl.startsWith("img+");
LOG.i("echo---jar_start");
jarUrl = jarUrl.replace("img+", "");
OkGo.<File>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 = "";

@ -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;
}

@ -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))

@ -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);

@ -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);
}

@ -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);

Loading…
Cancel
Save