diff --git a/.idea/misc.xml b/.idea/misc.xml index 97edd0fc..b4e56dc6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -12,12 +12,14 @@ + + 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 5655416c..e63b7121 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 @@ -264,7 +264,7 @@ public class ApiConfig { // 需要使用vip解析的flag vipParseFlags = DefaultConfig.safeJsonStringList(infoJson, "flags"); // 解析地址 - parseBeanList = new ArrayList<>(); + parseBeanList.clear(); for (JsonElement opt : infoJson.get("parses").getAsJsonArray()) { JsonObject obj = (JsonObject) opt; ParseBean pb = new ParseBean(); 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 f729e013..6a0cf2d1 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 @@ -124,11 +124,11 @@ public class VodController extends BaseController { @Override public void run() { Date date = new Date(); - SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - mPlayPauseTime.setText(timeFormat.format(date)); + SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); + String speed = PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed()); + mPlayPauseTime.setText(speed + " " + timeFormat.format(date)); mPlayLoadNetSpeed.setText(PlayerHelper.getDisplaySpeed(mControlWrapper.getTcpSpeed())); - String width = Integer.toString(mControlWrapper.getVideoSize()[0]); String height = Integer.toString(mControlWrapper.getVideoSize()[1]); mVideoSize.setText("[ " + width + " X " + height +" ]"); @@ -657,7 +657,7 @@ public class VodController extends BaseController { break; case VideoView.STATE_PREPARING: case VideoView.STATE_BUFFERING: - mPlayLoadNetSpeed.setVisibility(VISIBLE); + if(mProgressRoot.getVisibility()==GONE)mPlayLoadNetSpeed.setVisibility(VISIBLE); break; case VideoView.STATE_PLAYBACK_COMPLETED: listener.playNext(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 60c91563..815f6c45 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 @@ -172,6 +172,7 @@ public class DetailActivity extends BaseActivity { mGridViewFlag.setAdapter(seriesFlagAdapter); isReverse = false; firstReverse = false; + preFlag = ""; if (showPreview) { playFragment = new PlayFragment(); getSupportFragmentManager().beginTransaction().add(R.id.previewPlayer, playFragment).commit(); @@ -343,7 +344,7 @@ public class DetailActivity extends BaseActivity { reload = true; } //解决当前集不刷新的BUG - if (!vodInfo.playFlag.equals(preFlag)) { + if (!preFlag.isEmpty() && !vodInfo.playFlag.equals(preFlag)) { reload = true; } 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 d09c18e3..966f9164 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 @@ -317,11 +317,11 @@ public class PlayActivity extends BaseActivity { } } catch (Throwable th) { // errorWithRetry("获取播放信息错误", true); - Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); +// Toast.makeText(mContext, "获取播放信息错误1", Toast.LENGTH_SHORT).show(); } } else { -// errorWithRetry("获取播放信息错误", true); - Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); + errorWithRetry("获取播放信息错误", true); +// Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); } } }); @@ -474,7 +474,8 @@ public class PlayActivity extends BaseActivity { String playTitleInfo = mVodInfo.name + " " + vs.name; mController.setTitle(playTitleInfo); -// playUrl(null, null); + stopParse(); + if(mVideoView!=null) mVideoView.release(); String progressKey = mVodInfo.sourceKey + mVodInfo.id + mVodInfo.playFlag + mVodInfo.playIndex; //存储播放进度 Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java index 7dcd6d87..47f6291e 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java @@ -61,7 +61,7 @@ public class ApiDialog extends BaseDialog { @Override public void onClick(View v) { String newApi = inputApi.getText().toString().trim(); - if (!newApi.isEmpty() && (newApi.startsWith("http") || newApi.startsWith("clan"))) { + if (!newApi.isEmpty()) { ArrayList history = Hawk.get(HawkConfig.API_HISTORY, new ArrayList()); if (!history.contains(newApi)) history.add(0, newApi); 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 47c06192..f70cb160 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 @@ -315,11 +315,11 @@ public class PlayFragment extends BaseLazyFragment { } } catch (Throwable th) { // errorWithRetry("获取播放信息错误", true); - Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); +// Toast.makeText(mContext, "获取播放信息错误1", Toast.LENGTH_SHORT).show(); } } else { -// errorWithRetry("获取播放信息错误", true); - Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); + errorWithRetry("获取播放信息错误", true); +// Toast.makeText(mContext, "获取播放信息错误", Toast.LENGTH_SHORT).show(); } } }); @@ -486,7 +486,8 @@ public class PlayFragment extends BaseLazyFragment { String playTitleInfo = mVodInfo.name + " " + vs.name; mController.setTitle(playTitleInfo); -// playUrl(null, null); + stopParse(); + if(mVideoView!=null) mVideoView.release(); String progressKey = mVodInfo.sourceKey + mVodInfo.id + mVodInfo.playFlag + mVodInfo.playIndex; //存储播放进度 Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); diff --git a/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java b/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java index ed71514a..65a0a702 100644 --- a/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java +++ b/app/src/main/java/com/github/tvbox/osc/util/PlayerHelper.java @@ -187,9 +187,9 @@ public class PlayerHelper { public static String getDisplaySpeed(long speed) { if(speed > 1048576) - return (speed / 1048576) + "MB/s"; + return (speed / 1048576) + "Mb/s"; else if(speed > 1024) - return (speed / 1024) + "KB/s"; + return (speed / 1024) + "Kb/s"; else return speed > 0?speed + "B/s":""; } diff --git a/app/src/main/res/layout/dialog_grid_filter.xml b/app/src/main/res/layout/dialog_grid_filter.xml index 6b45d2ff..8b80e4e8 100644 --- a/app/src/main/res/layout/dialog_grid_filter.xml +++ b/app/src/main/res/layout/dialog_grid_filter.xml @@ -1,7 +1,7 @@ @@ -629,13 +629,6 @@ android:layout_height="wrap_content" android:layout_weight="1" /> - - @@ -672,13 +665,6 @@ android:layout_height="wrap_content" android:layout_weight="1" /> - - @@ -725,6 +711,13 @@ android:layout_height="wrap_content" android:layout_weight="1" /> + + @@ -761,6 +754,13 @@ android:layout_height="wrap_content" android:layout_weight="1" /> + +