hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 直播相关bug修复

Browse Source 
- 嗅探速度优化
- 分类列表页优化
pull/60/head
okjackcaptain 4 years ago
parent b85f62e2b0
commit 9f64453799
7 changed files with 132 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  2. 53
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  3. 19
      app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
  4. 55
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  5. 17
      app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
  6. 2
      app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java
  7. 1
      app/src/main/res/layout/player_vod_control_view.xml

14
app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
Unescape View File

@ -113,14 +113,16 @@ public class VodController extends BaseController {
TextView mNextBtn;
TextView mPreBtn;
TextView mPlayerScaleBtn;
TextView mPlayerSpeedBtn;
public TextView mPlayerSpeedBtn;
TextView mPlayerBtn;
TextView mPlayerIJKBtn;
TextView mPlayerRetry;
TextView mPlayrefresh;
TextView mPlayerTimeStartBtn;
TextView mPlayerTimeSkipBtn;
TextView mPlayerTimeStepBtn;
public TextView mPlayerTimeStartEndText;
public TextView mPlayerTimeStartBtn;
public TextView mPlayerTimeSkipBtn;
public TextView mPlayerTimeStepBtn;
public TextView mPlayerTimeResetBtn;
TextView mPlayPauseTime;
TextView mPlayLoadNetSpeed;
TextView mVideoSize;
@ -179,9 +181,11 @@ public class VodController extends BaseController {
mPlayerSpeedBtn = findViewById(R.id.play_speed);
mPlayerBtn = findViewById(R.id.play_player);
mPlayerIJKBtn = findViewById(R.id.play_ijk);
mPlayerTimeStartEndText = findViewById(R.id.play_time_start_end_text);
mPlayerTimeStartBtn = findViewById(R.id.play_time_start);
mPlayerTimeSkipBtn = findViewById(R.id.play_time_end);
mPlayerTimeStepBtn = findViewById(R.id.play_time_step);
mPlayerTimeResetBtn = findViewById(R.id.play_time_reset);
mPlayPauseTime = findViewById(R.id.tv_sys_time);
mPlayLoadNetSpeed = findViewById(R.id.tv_play_load_net_speed);
mVideoSize = findViewById(R.id.tv_videosize);
@ -463,7 +467,7 @@ public class VodController extends BaseController {
}
});
// 增加播放页面片头片尾时间重置
findViewById(R.id.play_time_reset).setOnClickListener(new OnClickListener() {
mPlayerTimeResetBtn.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
myHandle.removeCallbacks(myRunnable);

53
app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
Unescape View File

@ -111,6 +111,8 @@ public class PlayActivity extends BaseActivity {
private SourceViewModel sourceViewModel;
private Handler mHandler;
private long videoDuration = -1;
@Override
protected int getLayoutResID() {
return R.layout.activity_play;
@ -147,6 +149,11 @@ public class PlayActivity extends BaseActivity {
ProgressManager progressManager = new ProgressManager() {
@Override
public void saveProgress(String url, long progress) {
if (videoDuration != -1) {
if (videoDuration <= 6000) {
return;
}
}
CacheManager.save(MD5.string2MD5(url), progress);
}
@ -223,11 +230,24 @@ public class PlayActivity extends BaseActivity {
@Override
public void prepared() {
initSubtitleView();
initVideoDurationSomeThing();
}
});
mVideoView.setVideoController(mController);
}
void initVideoDurationSomeThing() {
videoDuration = mVideoView.getMediaPlayer().getDuration();
if (videoDuration <= 6000) {
mController.mPlayerSpeedBtn.setVisibility(View.GONE);
mController.mPlayerTimeStartEndText.setVisibility(View.GONE);
mController.mPlayerTimeStartBtn.setVisibility(View.GONE);
mController.mPlayerTimeSkipBtn.setVisibility(View.GONE);
mController.mPlayerTimeStepBtn.setVisibility(View.GONE);
mController.mPlayerTimeResetBtn.setVisibility(View.GONE);
}
}
//设置字幕
void setSubtitle(String path) {
if (path != null && path .length() > 0) {
@ -1360,7 +1380,6 @@ public class PlayActivity extends BaseActivity {
}
WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
LOG.i("shouldInterceptRequest url:" + url);
if (url.endsWith("/favicon.ico")) {
if (url.startsWith("http://127.0.0.1")) {
return new WebResourceResponse("image/x-icon", "UTF-8", null);
@ -1409,11 +1428,19 @@ public class PlayActivity extends BaseActivity {
@Override
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = "";
try {
url = request.getUrl().toString();
} catch (Throwable th) {
String url = request.getUrl().toString();
LOG.i("shouldInterceptRequest url:" + url);
//css与jpg等无效资源避免请求远程直接返回response
String uselessmMimeType = null;
if (url.contains(".css")) {
uselessmMimeType = "text/css";
} else if (url.contains(".jpg")) {
uselessmMimeType = "image/jpeg";
} else if (url.contains(".png")) {
uselessmMimeType = "image/png";
}
if (uselessmMimeType != null && !uselessmMimeType.isEmpty()) {
return new WebResourceResponse(uselessmMimeType, "UTF-8", null);
}
HashMap<String, String> webHeaders = new HashMap<>();
try {
@ -1421,6 +1448,7 @@ public class PlayActivity extends BaseActivity {
for (String k : hds.keySet()) {
if (k.equalsIgnoreCase("user-agent")
|| k.equalsIgnoreCase("referer")
|| k.equalsIgnoreCase("accept")
|| k.equalsIgnoreCase("origin")) {
webHeaders.put(k, hds.get(k));
}
@ -1542,6 +1570,18 @@ public class PlayActivity extends BaseActivity {
}
return null;
}
//css与jpg等无效资源避免请求远程直接返回response
String uselessmMimeType = null;
if (url.contains(".css")) {
uselessmMimeType = "text/css";
} else if (url.contains(".jpg")) {
uselessmMimeType = "image/jpeg";
} else if (url.contains(".png")) {
uselessmMimeType = "image/png";
}
if (uselessmMimeType != null && !uselessmMimeType.isEmpty()) {
return createXWalkWebResourceResponse(uselessmMimeType, "UTF-8", null);
}
boolean ad;
if (!loadedUrls.containsKey(url)) {
ad = AdBlocker.isAd(url);
@ -1557,6 +1597,7 @@ public class PlayActivity extends BaseActivity {
for (String k : hds.keySet()) {
if (k.equalsIgnoreCase("user-agent")
|| k.equalsIgnoreCase("referer")
|| k.equalsIgnoreCase("accept")
|| k.equalsIgnoreCase("origin")) {
webHeaders.put(k, hds.get(k));
}

19
app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
Unescape View File

@ -253,6 +253,14 @@ public class GridFragment extends BaseLazyFragment {
}
page++;
maxPage = absXml.movie.pagecount;
if (page > maxPage) {
gridAdapter.loadMoreEnd();
gridAdapter.setEnableLoadMore(false);
} else {
gridAdapter.loadMoreComplete();
gridAdapter.setEnableLoadMore(true);
}
} else {
if(page == 1){
showEmpty();
@ -260,11 +268,12 @@ public class GridFragment extends BaseLazyFragment {
if(page > maxPage){
Toast.makeText(getContext(), "没有更多了", Toast.LENGTH_SHORT).show();
}
}
if (page > maxPage) {
gridAdapter.loadMoreEnd();
} else {
gridAdapter.loadMoreComplete();
if (page > maxPage) {
gridAdapter.loadMoreEnd();
} else {
gridAdapter.loadMoreComplete();
}
gridAdapter.setEnableLoadMore(false);
}
}
});

55
app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
Unescape View File

@ -111,6 +111,8 @@ public class PlayFragment extends BaseLazyFragment {
private SourceViewModel sourceViewModel;
private Handler mHandler;
private long videoDuration = -1;
@Override
protected int getLayoutResID() {
return R.layout.activity_play;
@ -147,6 +149,11 @@ public class PlayFragment extends BaseLazyFragment {
ProgressManager progressManager = new ProgressManager() {
@Override
public void saveProgress(String url, long progress) {
if (videoDuration != -1) {
if (videoDuration <= 6000) {
return;
}
}
CacheManager.save(MD5.string2MD5(url), progress);
}
@ -223,11 +230,24 @@ public class PlayFragment extends BaseLazyFragment {
@Override
public void prepared() {
initSubtitleView();
initVideoDurationSomeThing();
}
});
mVideoView.setVideoController(mController);
}
void initVideoDurationSomeThing() {
videoDuration = mVideoView.getMediaPlayer().getDuration();
if (videoDuration <= 6000) {
mController.mPlayerSpeedBtn.setVisibility(View.GONE);
mController.mPlayerTimeStartEndText.setVisibility(View.GONE);
mController.mPlayerTimeStartBtn.setVisibility(View.GONE);
mController.mPlayerTimeSkipBtn.setVisibility(View.GONE);
mController.mPlayerTimeStepBtn.setVisibility(View.GONE);
mController.mPlayerTimeResetBtn.setVisibility(View.GONE);
}
}
//设置字幕
void setSubtitle(String path) {
if (path != null && path .length() > 0) {
@ -1384,7 +1404,6 @@ public class PlayFragment extends BaseLazyFragment {
}
WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
LOG.i("shouldInterceptRequest url:" + url);
if (url.endsWith("/favicon.ico")) {
if (url.startsWith("http://127.0.0.1")) {
return new WebResourceResponse("image/x-icon", "UTF-8", null);
@ -1433,11 +1452,19 @@ public class PlayFragment extends BaseLazyFragment {
@Override
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
String url = "";
try {
url = request.getUrl().toString();
} catch (Throwable th) {
String url = request.getUrl().toString();
LOG.i("shouldInterceptRequest url:" + url);
//css与jpg等无效资源避免请求远程直接返回response
String uselessmMimeType = null;
if (url.contains(".css")) {
uselessmMimeType = "text/css";
} else if (url.contains(".jpg")) {
uselessmMimeType = "image/jpeg";
} else if (url.contains(".png")) {
uselessmMimeType = "image/png";
}
if (uselessmMimeType != null && !uselessmMimeType.isEmpty()) {
return new WebResourceResponse(uselessmMimeType, "UTF-8", null);
}
HashMap<String, String> webHeaders = new HashMap<>();
try {
@ -1445,6 +1472,7 @@ public class PlayFragment extends BaseLazyFragment {
for (String k : hds.keySet()) {
if (k.equalsIgnoreCase("user-agent")
|| k.equalsIgnoreCase("referer")
|| k.equalsIgnoreCase("accept")
|| k.equalsIgnoreCase("origin")) {
webHeaders.put(k, hds.get(k));
}
@ -1558,6 +1586,7 @@ public class PlayFragment extends BaseLazyFragment {
@Override
public XWalkWebResourceResponse shouldInterceptLoadRequest(XWalkView view, XWalkWebResourceRequest request) {
String url = request.getUrl().toString();
LOG.i("shouldInterceptLoadRequest url:" + url);
// suppress favicon requests as we don't display them anywhere
if (url.endsWith("/favicon.ico")) {
if (url.startsWith("http://127.0.0.1")) {
@ -1565,7 +1594,18 @@ public class PlayFragment extends BaseLazyFragment {
}
return null;
}
LOG.i("shouldInterceptLoadRequest url:" + url);
//css与jpg等无效资源避免请求远程直接返回response
String uselessmMimeType = null;
if (url.contains(".css")) {
uselessmMimeType = "text/css";
} else if (url.contains(".jpg")) {
uselessmMimeType = "image/jpeg";
} else if (url.contains(".png")) {
uselessmMimeType = "image/png";
}
if (uselessmMimeType != null && !uselessmMimeType.isEmpty()) {
return createXWalkWebResourceResponse(uselessmMimeType, "UTF-8", null);
}
boolean ad;
if (!loadedUrls.containsKey(url)) {
ad = AdBlocker.isAd(url);
@ -1581,6 +1621,7 @@ public class PlayFragment extends BaseLazyFragment {
for (String k : hds.keySet()) {
if (k.equalsIgnoreCase("user-agent")
|| k.equalsIgnoreCase("referer")
|| k.equalsIgnoreCase("accept")
|| k.equalsIgnoreCase("origin")) {
webHeaders.put(k, hds.get(k));
}

17
app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
Unescape View File

@ -109,20 +109,27 @@ public class DefaultConfig {
//增加对flv|avi|mkv|rm|wmv|mpg等几种视频格式的支持
//private static final Pattern snifferMatch = Pattern.compile("http((?!http).){26,}?\\.(m3u8|mp4)\\?.*|http((?!http).){26,}\\.(m3u8|mp4)|http((?!http).){26,}?/m3u8\\?pt=m3u8.*|http((?!http).)*?default\\.ixigua\\.com/.*|http((?!http).)*?cdn-tos[^\\?]*|http((?!http).)*?/obj/tos[^\\?]*|http.*?/player/m3u8play\\.php\\?url=.*|http.*?/player/.*?[pP]lay\\.php\\?url=.*|http.*?/playlist/m3u8/\\?vid=.*|http.*?\\.php\\?type=m3u8&.*|http.*?/download.aspx\\?.*|http.*?/api/up_api.php\\?.*|https.*?\\.66yk\\.cn.*|http((?!http).)*?netease\\.com/file/.*");
private static final Pattern snifferMatch = Pattern.compile("http((?!http).)*?default\\.365yg\\.com/.*|http((?!http).){20,}?/m3u8\\?pt=m3u8.*|http((?!http).)*?default\\.ixigua\\.com/.*|http((?!http).)*?dycdn-tos\\.pstatp[^\\?]*|http.*?/player/m3u8play\\.php\\?url=.*|http.*?/playlist/m3u8/\\?vid=.*|http.*?\\.php\\?type=m3u8&.*|http.*?/download.aspx\\?.*|http.*?/api/up_api.php\\?.*|https.*?\\.66yk\\.cn.*|http((?!http).)*?netease\\.com/file/.*");
private static final Pattern normalSnifferMatch = Pattern.compile("http((?!http).){20,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)\\?.*|http((?!http).){20,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)");
private static final String[] videoSubfix = {"m3u8","mp4","flv","avi","mkv","rm","wmv","mpg"};
public static boolean isVideoFormat(String url) {
if (url.contains("=http")) {
return false;
}
Uri uri = Uri.parse(url);
if (uri.getPath().endsWith(".js") || uri.getPath().endsWith(".css") || uri.getPath().endsWith(".html")) {
String path = uri.getPath();
if (path == null || path.isEmpty()) {
return false;
}
if (uri.getQuery().startsWith("http")) {
if (path.endsWith(".js") || path.endsWith(".css") || path.endsWith(".html")) {
return false;
}
if (normalSnifferMatch.matcher(url).find()) {
return true;
String query = uri.getQuery();
if (query != null && query.startsWith("http")) {
return false;
}
for(String oneSubfix : videoSubfix) {
if (path.endsWith("." + oneSubfix)) {
return true;
}
}
if (snifferMatch.matcher(url).find()) {
return true;

2
app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java
Unescape View File

@ -47,7 +47,7 @@ public class VideoParseRuler {
}
return isVideo;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}

1
app/src/main/res/layout/player_vod_control_view.xml
Unescape View File

@ -254,6 +254,7 @@
android:textSize="@dimen/ts_20" />
<TextView
android:id="@+id/play_time_start_end_text"
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

Write Preview
Loading…
Cancel
Save