提交 20e6abd6 编写于 作者: S shuyu

v1.5.1 全屏滑动弹出虚拟按键会影响进度问题,优化了滑动的弹出dialog

上级 f5f6c0a5
......@@ -67,8 +67,6 @@ public class GSYVideoManager implements IMediaPlayer.OnPreparedListener, IMediaP
private Context context;
private MediaMetadataRetriever mediaMetadataRetriever;//获取帧预览图片
private int currentVideoWidth = 0; //当前播放的视频宽的高
private int currentVideoHeight = 0; //当前播放的视屏的高
......@@ -233,10 +231,6 @@ public class GSYVideoManager implements IMediaPlayer.OnPreparedListener, IMediaP
if (proxy != null) {
proxy.unregisterCacheListener(GSYVideoManager.this);
}
if (mediaMetadataRetriever != null) {
mediaMetadataRetriever.release();
mediaMetadataRetriever = null;
}
buffterPoint = 0;
break;
}
......@@ -266,9 +260,6 @@ public class GSYVideoManager implements IMediaPlayer.OnPreparedListener, IMediaP
mediaPlayer.setOnVideoSizeChangedListener(GSYVideoManager.this);
mediaPlayer.prepareAsync();
mediaMetadataRetriever = new MediaMetadataRetriever();
mediaMetadataRetriever.setDataSource(((GSYModel) msg.obj).getUrl(), ((GSYModel) msg.obj).getMapHeadData());
} catch (Exception e) {
e.printStackTrace();
}
......@@ -468,10 +459,6 @@ public class GSYVideoManager implements IMediaPlayer.OnPreparedListener, IMediaP
return mediaPlayer;
}
public MediaMetadataRetriever getMediaMetadataRetriever() {
return mediaMetadataRetriever;
}
public int getCurrentVideoWidth() {
return currentVideoWidth;
}
......
......@@ -104,6 +104,8 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View.
protected int mSeekTimePosition; //手动改变滑动的位置
protected int mSeekEndOffset; //手动滑动的起始偏移位置
protected long mSeekOnStart = -1; //从哪个开始播放
protected long mPauseTime; //保存暂停时的时间
......@@ -178,6 +180,8 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View.
mScreenWidth = getContext().getResources().getDisplayMetrics().widthPixels;
mScreenHeight = getContext().getResources().getDisplayMetrics().heightPixels;
mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
mSeekEndOffset = CommonUtil.dip2px(getContext(), 50);
}
/**
......@@ -552,8 +556,12 @@ public abstract class GSYVideoPlayer extends GSYBaseVideoPlayer implements View.
if (absDeltaX > mThreshold || absDeltaY > mThreshold) {
cancelProgressTimer();
if (absDeltaX >= mThreshold) {
mChangePosition = true;
mDownPosition = getCurrentPositionWhenPlaying();
//防止全屏虚拟按键
int screenWidth = CommonUtil.getScreenWidth(getContext());
if (Math.abs(screenWidth - mDownX) > mSeekEndOffset) {
mChangePosition = true;
mDownPosition = getCurrentPositionWhenPlaying();
}
} else {
if (mFirstTouch) {
mBrightness = mDownX < mScreenWidth * 0.5f;
......
......@@ -381,11 +381,14 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
*/
public void clearFullscreenLayout() {
mIfCurrentIsFullscreen = false;
int delay = mOrientationUtils.backToProtVideo();
mOrientationUtils.setEnable(false);
int delay = 0;
if (mOrientationUtils != null) {
mOrientationUtils.releaseListener();
mOrientationUtils = null;
delay = mOrientationUtils.backToProtVideo();
mOrientationUtils.setEnable(false);
if (mOrientationUtils != null) {
mOrientationUtils.releaseListener();
mOrientationUtils = null;
}
}
mHandler.postDelayed(new Runnable() {
@Override
......@@ -393,6 +396,7 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
backToNormal();
}
}, delay);
}
/**
......
......@@ -679,6 +679,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
super.dismissProgressDialog();
if (mProgressDialog != null) {
mProgressDialog.dismiss();
mProgressDialog = null;
}
}
......@@ -719,6 +720,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
super.dismissVolumeDialog();
if (mVolumeDialog != null) {
mVolumeDialog.dismiss();
mVolumeDialog = null;
}
}
......@@ -755,6 +757,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
super.dismissVolumeDialog();
if (mBrightnessDialog != null) {
mBrightnessDialog.dismiss();
mBrightnessDialog = null;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册