pull/590/head
FongMi 10 months ago
parent be2fcd8f60
commit a0437693dc
  1. 28
      app/src/main/java/com/fongmi/android/tv/Constant.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/bean/History.java
  3. 5
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  4. 3
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
  5. 2
      catvod/src/main/java/com/github/catvod/net/OkHttp.java

@ -1,33 +1,35 @@
package com.fongmi.android.tv;
import java.util.concurrent.TimeUnit;
public class Constant {
//快進時間單位
public static final int INTERVAL_SEEK = 10 * 1000;
public static final long INTERVAL_SEEK = TimeUnit.SECONDS.toMillis(10);
//控件隱藏時間
public static final int INTERVAL_HIDE = 5 * 1000;
public static final long INTERVAL_HIDE = TimeUnit.SECONDS.toMillis(5);
//網路偵測間隔
public static final int INTERVAL_TRAFFIC = 1000;
public static final long INTERVAL_TRAFFIC = TimeUnit.SECONDS.toMillis(1);
//點播爬蟲時間
public static final int TIMEOUT_VOD = 30 * 1000;
public static final long TIMEOUT_VOD = TimeUnit.SECONDS.toMillis(30);
//直播爬蟲時間
public static final int TIMEOUT_LIVE = 30 * 1000;
public static final long TIMEOUT_LIVE = TimeUnit.SECONDS.toMillis(30);
//節目爬蟲時間
public static final int TIMEOUT_EPG = 5 * 1000;
public static final long TIMEOUT_EPG = TimeUnit.SECONDS.toMillis(5);
//節目爬蟲時間
public static final int TIMEOUT_XML = 15 * 1000;
public static final long TIMEOUT_XML = TimeUnit.SECONDS.toMillis(15);
//播放超時時間
public static final int TIMEOUT_PLAY = 15 * 1000;
public static final long TIMEOUT_PLAY = TimeUnit.SECONDS.toMillis(15);
//彈幕超時時間
public static final int TIMEOUT_DANMAKU = 30 * 1000;
public static final long TIMEOUT_DANMAKU = TimeUnit.SECONDS.toMillis(30);
//解析預設時間
public static final int TIMEOUT_PARSE_DEF = 15 * 1000;
public static final long TIMEOUT_PARSE_DEF = TimeUnit.SECONDS.toMillis(15);
//嗅探超時時間
public static final int TIMEOUT_PARSE_WEB = 15 * 1000;
public static final long TIMEOUT_PARSE_WEB = TimeUnit.SECONDS.toMillis(15);
//直播解析時間
public static final int TIMEOUT_PARSE_LIVE = 10 * 1000;
public static final long TIMEOUT_PARSE_LIVE = TimeUnit.SECONDS.toMillis(10);
//同步超時時間
public static final int TIMEOUT_SYNC = 2 * 1000;
public static final long TIMEOUT_SYNC = TimeUnit.SECONDS.toMillis(2);
//主要線程數量
public static final int THREAD_POOL = 10;

@ -263,7 +263,7 @@ public class History {
private void merge(List<History> items, boolean force) {
for (History item : items) {
if (getDuration() > 0 && item.getDuration() > 0 && Math.abs(getDuration() - item.getDuration()) > 10 * 60 * 1000) continue;
if (getDuration() > 0 && item.getDuration() > 0 && Math.abs(getDuration() - item.getDuration()) > TimeUnit.MINUTES.toMillis(10)) continue;
if (!force && getKey().equals(item.getKey())) continue;
checkParam(item);
item.delete();

@ -63,6 +63,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import master.flame.danmaku.ui.widget.DanmakuView;
@ -264,11 +265,11 @@ public class Players implements Player.Listener, ParseCallback {
}
public boolean isLive() {
return getDuration() < 60 * 1000 || exoPlayer.isCurrentMediaItemLive();
return getDuration() < TimeUnit.MINUTES.toMillis(1) || exoPlayer.isCurrentMediaItemLive();
}
public boolean isVod() {
return getDuration() > 60 * 1000 && !exoPlayer.isCurrentMediaItemLive();
return getDuration() > TimeUnit.MINUTES.toMillis(1) && !exoPlayer.isCurrentMediaItemLive();
}
public boolean isHard() {

@ -62,6 +62,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import okhttp3.Call;
import okhttp3.Headers;
@ -153,7 +154,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
}
private void updateHot() {
App.post(mRunnable, 10 * 1000);
App.post(mRunnable, TimeUnit.SECONDS.toMillis(10));
if (mHots.isEmpty() || mHots.size() < 10) return;
mBinding.hot.setText(mHots.get(new Random().nextInt(11)));
}

@ -34,7 +34,7 @@ import okhttp3.logging.HttpLoggingInterceptor;
public class OkHttp {
private static final int TIMEOUT = 30 * 1000;
private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30);
private static final ProxySelector defaultSelector;
private ResponseInterceptor responseInterceptor;

Loading…
Cancel
Save