diff --git a/UPDATE_VERSION.md b/UPDATE_VERSION.md index 044e21350b004b8c43d26583b72416636567a3ae..54699470b9e4479e114e3317d9d03c70369d825e 100644 --- a/UPDATE_VERSION.md +++ b/UPDATE_VERSION.md @@ -1,5 +1,8 @@ ## 下方个版本说明,可以当做简单的wiki使用~,效果可参考DEMO。 +### 1.6.1(2017-03-20) +* setSpeed接口修改为支持播放中设置 + ### 1.6.0 (2017-02-19) * update ijkplayer to 0.7.7.1。 * 增加了弹幕demo,主要演示如何快速集成弹幕功能。 diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index 2ac08b1469f6d4611d5db7d9f367bf867d331371..000b7d7ce22bfcf3ba6e4d340db148e27e2d1c82 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -55,6 +55,7 @@ public class DetailPlayer extends AppCompatActivity { ButterKnife.bind(this); String url = "http://baobab.wdjcdn.com/14564977406580.mp4"; + //String url = "http://hls.ciguang.tv/hdtv/video.m3u8"; //String url = "https://res.exexm.com/cw_145225549855002"; detailPlayer.setUp(url, true, null, "测试视频"); diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java index 1fd387b1cd1466571b25a0a6651e8c8d69031c1f..9c5ae8d2bf1ff9bd1faad5aa3d3a926999ace321 100644 --- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java +++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java @@ -49,7 +49,7 @@ import static com.shuyu.gsyvideoplayer.utils.CommonUtil.hideNavKey; public class StandardGSYVideoPlayer extends GSYVideoPlayer { - protected Timer DISSMISS_CONTROL_VIEW_TIMER; + protected Timer mDismissControlViewTimer; protected ProgressBar mBottomProgressBar; @@ -218,6 +218,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer { switch (mCurrentState) { case CURRENT_STATE_NORMAL: changeUiToNormal(); + cancelDismissControlViewTimer(); break; case CURRENT_STATE_PREPAREING: changeUiToPrepareingShow(); @@ -879,17 +880,19 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer { private void startDismissControlViewTimer() { cancelDismissControlViewTimer(); - DISSMISS_CONTROL_VIEW_TIMER = new Timer(); + mDismissControlViewTimer = new Timer(); mDismissControlViewTimerTask = new DismissControlViewTimerTask(); - DISSMISS_CONTROL_VIEW_TIMER.schedule(mDismissControlViewTimerTask, 2500); + mDismissControlViewTimer.schedule(mDismissControlViewTimerTask, 2500); } private void cancelDismissControlViewTimer() { - if (DISSMISS_CONTROL_VIEW_TIMER != null) { - DISSMISS_CONTROL_VIEW_TIMER.cancel(); + if (mDismissControlViewTimer != null) { + mDismissControlViewTimer.cancel(); + mDismissControlViewTimer = null; } if (mDismissControlViewTimerTask != null) { mDismissControlViewTimerTask.cancel(); + mDismissControlViewTimerTask = null; } }