提交 c0ad92c0 编写于 作者: S shuyu

1.5.0 修改了一些bug

上级 e6299e40
......@@ -27,8 +27,12 @@ public class DetailPlayer extends AppCompatActivity {
@BindView(R.id.post_detail_nested_scroll)
NestedScrollView postDetailNestedScroll;
//推荐使用StandardGSYVideoPlayer,功能一致
//CustomGSYVideoPlayer部分功能处于试验阶段
@BindView(R.id.detail_player)
CustomGSYVideoPlayer detailPlayer;
@BindView(R.id.activity_detail_player)
RelativeLayout activityDetailPlayer;
......@@ -66,7 +70,7 @@ public class DetailPlayer extends AppCompatActivity {
detailPlayer.setLockLand(false);
detailPlayer.setShowFullAnimation(false);
detailPlayer.setNeedLockFull(true);
detailPlayer.setOpenPreView(true);
detailPlayer.getFullscreenButton().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......
......@@ -48,11 +48,15 @@ public class SampleVideo extends StandardGSYVideoPlayer {
public SampleVideo(Context context) {
super(context);
initView();
}
public SampleVideo(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
protected void init(Context context) {
super.init(context);
initView();
}
......
......@@ -34,14 +34,17 @@ public class CustomGSYVideoPlayer extends StandardGSYVideoPlayer {
public CustomGSYVideoPlayer(Context context) {
super(context);
initView();
}
public CustomGSYVideoPlayer(Context context, AttributeSet attrs) {
super(context, attrs);
initView();
}
@Override
protected void init(Context context) {
super.init(context);
initView();
}
private void initView() {
mPreviewLayout = (RelativeLayout) findViewById(R.id.preview_layout);
......@@ -100,7 +103,7 @@ public class CustomGSYVideoPlayer extends StandardGSYVideoPlayer {
@Override
public void onProgressChanged(SeekBar seekBar, final int progress, boolean fromUser) {
super.onProgressChanged(seekBar, progress, fromUser);
if (fromUser) {
if (fromUser && mOpenPreView) {
int width = seekBar.getWidth();
int offset = (int) (width - (getResources().getDimension(R.dimen.seek_bar_image) / 2)) / 100 * progress;
......@@ -122,19 +125,25 @@ public class CustomGSYVideoPlayer extends StandardGSYVideoPlayer {
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
super.onStartTrackingTouch(seekBar);
mIsFromUser = true;
mPreviewLayout.setVisibility(VISIBLE);
mPreProgress = -2;
if (mOpenPreView) {
mIsFromUser = true;
mPreviewLayout.setVisibility(VISIBLE);
mPreProgress = -2;
}
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
if (mPreProgress >= 0) {
seekBar.setProgress(mPreProgress);
if (mOpenPreView) {
if (mPreProgress >= 0) {
seekBar.setProgress(mPreProgress);
}
super.onStopTrackingTouch(seekBar);
mIsFromUser = false;
mPreviewLayout.setVisibility(GONE);
} else {
super.onStopTrackingTouch(seekBar);
}
super.onStopTrackingTouch(seekBar);
mIsFromUser = false;
mPreviewLayout.setVisibility(GONE);
}
@Override
......
......@@ -320,7 +320,7 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
@Override
public void showWifiDialog() {
super.showWifiDialog();
if (!mUrl.contains("127.0.0.1") && !NetworkUtils.isAvailable(mContext)) {
if (!NetworkUtils.isAvailable(mContext)) {
Toast.makeText(mContext, getResources().getString(R.string.no_net), Toast.LENGTH_LONG).show();
return;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册