Skip to content

G
GSYVideoPlayer

ac13 / GSYVideoPlayer
与 Fork 源项目一致

从无法访问的项目Fork

通知 7
Star 0
Fork 0
G
GSYVideoPlayer

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 40e3de95 编写于 作者: S shuyu
浏览文件
操作

v1.5.8 

* 修改了锁定屏幕触摸功能再播放结束后的问题。
上级 544c388c
隐藏空白更改
内联 并排
Showing with 50 addition and 21 deletion
gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java
浏览文件 @ 40e3de95
......@@ -155,18 +155,11 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mLockScreen.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (mLockCurScreen) {
mLockScreen.setImageResource(R.drawable.unlock);
mLockCurScreen = false;
if (mOrientationUtils != null)
mOrientationUtils.setEnable(mRotateViewAuto);
} else {
mLockScreen.setImageResource(R.drawable.lock);
mLockCurScreen = true;
if (mOrientationUtils != null)
mOrientationUtils.setEnable(false);
hideAllWidget();
if (mCurrentState == CURRENT_STATE_AUTO_COMPLETE ||
mCurrentState == CURRENT_STATE_ERROR) {
return;
}
lockTouchLogic();
if (mLockClickListener != null) {
mLockClickListener.onClick(v, mLockCurScreen);
}
......@@ -423,7 +416,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.VISIBLE);
mCoverImageView.setVisibility(View.VISIBLE);
......@@ -439,7 +432,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.INVISIBLE);
mLoadingProgressBar.setVisibility(View.VISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
if (enDownloadView.getCurrentState() == ENDownloadView.STATE_PRE) {
((ENDownloadView) mLoadingProgressBar).start();
}
......@@ -468,7 +461,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.INVISIBLE);
mCoverImageView.setVisibility(View.INVISIBLE);
......@@ -490,7 +483,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.INVISIBLE);
//mCoverImageView.setVisibility(View.INVISIBLE);
......@@ -514,7 +507,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.INVISIBLE);
mLoadingProgressBar.setVisibility(View.VISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
if (enDownloadView.getCurrentState() == ENDownloadView.STATE_PRE) {
((ENDownloadView) mLoadingProgressBar).start();
}
......@@ -532,7 +525,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.INVISIBLE);
mLoadingProgressBar.setVisibility(View.VISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
ENDownloadView enDownloadView = (ENDownloadView) mLoadingProgressBar;
if (enDownloadView.getCurrentState() == ENDownloadView.STATE_PRE) {
((ENDownloadView) mLoadingProgressBar).start();
}
......@@ -551,7 +544,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.INVISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.INVISIBLE);
mCoverImageView.setVisibility(View.INVISIBLE);
......@@ -566,7 +559,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.VISIBLE);
mCoverImageView.setVisibility(View.INVISIBLE);
......@@ -582,7 +575,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.VISIBLE);
mCoverImageView.setVisibility(View.INVISIBLE);
......@@ -598,7 +591,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
mStartButton.setVisibility(View.VISIBLE);
mLoadingProgressBar.setVisibility(View.INVISIBLE);
if (mLoadingProgressBar instanceof ENDownloadView) {
((ENDownloadView)mLoadingProgressBar).reset();
((ENDownloadView) mLoadingProgressBar).reset();
}
mThumbImageViewLayout.setVisibility(View.INVISIBLE);
mCoverImageView.setVisibility(View.VISIBLE);
......@@ -785,6 +778,24 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
}
@Override
public void onAutoCompletion() {
super.onAutoCompletion();
if (mLockCurScreen) {
lockTouchLogic();
mLockScreen.setVisibility(GONE);
}
}
@Override
public void onError(int what, int extra) {
super.onError(what, extra);
if (mLockCurScreen) {
lockTouchLogic();
mLockScreen.setVisibility(GONE);
}
}
@Override
public GSYBaseVideoPlayer startWindowFullscreen(Context context, boolean actionBar, boolean statusBar) {
GSYBaseVideoPlayer gsyBaseVideoPlayer = super.startWindowFullscreen(context, actionBar, statusBar);
......@@ -810,6 +821,24 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
return gsyBaseVideoPlayer;
}
/**
* 处理锁屏屏幕触摸逻辑
*/
private void lockTouchLogic() {
if (mLockCurScreen) {
mLockScreen.setImageResource(R.drawable.unlock);
mLockCurScreen = false;
if (mOrientationUtils != null)
mOrientationUtils.setEnable(mRotateViewAuto);
} else {
mLockScreen.setImageResource(R.drawable.lock);
mLockCurScreen = true;
if (mOrientationUtils != null)
mOrientationUtils.setEnable(false);
hideAllWidget();
}
}
/**
* 初始化为正常状态
*/
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或