Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangcongtao
2020-11-25 21:41:43 +08:00

View File

@@ -25,6 +25,7 @@ import com.shuyu.gsyvideoplayer.utils.GSYVideoType;
import com.shuyu.gsyvideoplayer.video.base.GSYVideoView; import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
import java.util.ArrayList; import java.util.ArrayList;
import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL; import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL;
/** /**
@@ -72,7 +73,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
thumbnailImage = this.findViewById(R.id.thumbnail_image); thumbnailImage = this.findViewById(R.id.thumbnail_image);
simpleCoverVideoPlayer = this.findViewById(R.id.roadVideoView); simpleCoverVideoPlayer = this.findViewById(R.id.roadVideoView);
GSYVideoType.setShowType(SCREEN_MATCH_FULL); GSYVideoType.setShowType(SCREEN_MATCH_FULL);
gsyVideoOptionBuilder.setCacheWithPlay(false);
closeImage = this.findViewById(R.id.roadVideoClose); closeImage = this.findViewById(R.id.roadVideoClose);
closeImage.setOnClickListener(v -> { closeImage.setOnClickListener(v -> {
close(); close();
@@ -152,106 +152,109 @@ public class V2XRoadVideoWindow extends RelativeLayout implements
} }
if (path.contains(".mp4")) { if (path.contains(".mp4")) {
startPlayWithVideoUrl(path); startPlayWithVideoUrl(path);
Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(path);/*获取第一帧图*/ new Thread(new Runnable() {
simpleCoverVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
@Override @Override
public void onAutoComplete(String url, Object... objects) { public void run() {
complete(firstBitmap, path); Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(path);/*获取第一帧图*/
} simpleCoverVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
@Override
public void onAutoComplete(String url, Object... objects) {
complete(firstBitmap, path);
}
@Override @Override
public void onClickResume(String url, Object... objects) { public void onClickResume(String url, Object... objects) {
thumbnailImage.setVisibility(View.GONE); thumbnailImage.setVisibility(View.GONE);
playImageView.setVisibility(View.GONE); playImageView.setVisibility(View.GONE);
} }
@Override @Override
public void onClickStop(String url, Object... objects) { public void onClickStop(String url, Object... objects) {
Log.d(TAG, "onClickStop"); Log.d(TAG, "onClickStop");
} }
@Override @Override
public void onStartPrepared(String url, Object... objects) { public void onStartPrepared(String url, Object... objects) {
Log.d(TAG, "onStartPrepared"); Log.d(TAG, "onStartPrepared");
} }
@Override @Override
public void onPrepared(String url, Object... objects) { public void onPrepared(String url, Object... objects) {
} }
@Override @Override
public void onClickStartIcon(String url, Object... objects) { public void onClickStartIcon(String url, Object... objects) {
} }
@Override @Override
public void onClickStartError(String url, Object... objects) { public void onClickStartError(String url, Object... objects) {
} }
@Override @Override
public void onClickStopFullscreen(String url, Object... objects) { public void onClickStopFullscreen(String url, Object... objects) {
} }
@Override @Override
public void onClickResumeFullscreen(String url, Object... objects) { public void onClickResumeFullscreen(String url, Object... objects) {
} }
@Override @Override
public void onClickSeekbar(String url, Object... objects) { public void onClickSeekbar(String url, Object... objects) {
} }
@Override @Override
public void onClickSeekbarFullscreen(String url, Object... objects) { public void onClickSeekbarFullscreen(String url, Object... objects) {
} }
@Override @Override
public void onEnterFullscreen(String url, Object... objects) { public void onEnterFullscreen(String url, Object... objects) {
} }
@Override @Override
public void onQuitFullscreen(String url, Object... objects) { public void onQuitFullscreen(String url, Object... objects) {
} }
@Override @Override
public void onQuitSmallWidget(String url, Object... objects) { public void onQuitSmallWidget(String url, Object... objects) {
} }
@Override @Override
public void onEnterSmallWidget(String url, Object... objects) { public void onEnterSmallWidget(String url, Object... objects) {
} }
@Override @Override
public void onTouchScreenSeekVolume(String url, Object... objects) { public void onTouchScreenSeekVolume(String url, Object... objects) {
} }
@Override @Override
public void onTouchScreenSeekPosition(String url, Object... objects) { public void onTouchScreenSeekPosition(String url, Object... objects) {
} }
@Override @Override
public void onTouchScreenSeekLight(String url, Object... objects) { public void onTouchScreenSeekLight(String url, Object... objects) {
} }
@Override @Override
public void onPlayError(String url, Object... objects) { public void onPlayError(String url, Object... objects) {
} }
@Override @Override
public void onClickStartThumb(String url, Object... objects) { public void onClickStartThumb(String url, Object... objects) {
} }
@Override @Override
public void onClickBlank(String url, Object... objects) { public void onClickBlank(String url, Object... objects) {
} }
@Override @Override
public void onClickBlankFullscreen(String url, Object... objects) { public void onClickBlankFullscreen(String url, Object... objects) {
Log.d(TAG, "onClickBlankFullscreen"); Log.d(TAG, "onClickBlankFullscreen");
}
});
} }
}); }).start();
} }
} }
} }