diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java
index 063e6c25f..7ce25454a 100644
--- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java
+++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java
@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
mJcVideoPlayer.startButton.performClick();
} else {
JCVideoPlayer.IF_RELEASE_WHEN_ON_PAUSE = true;
- JCMediaManager.instance().listener = mJcVideoPlayer;
+ JCMediaManager.instance().setListener(mJcVideoPlayer);
if (CURRENT_STATE == JCVideoPlayer.CURRENT_STATE_PAUSE) {
JCMediaManager.instance().mediaPlayer.seekTo(JCMediaManager.instance().mediaPlayer.getCurrentPosition());
}
diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java
index a41c3150c..5a94a34bd 100644
--- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java
+++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java
@@ -1,7 +1,6 @@
package fm.jiecao.jcvideoplayer_lib;
import android.media.AudioManager;
-import android.media.MediaPlayer;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
@@ -9,10 +8,14 @@
import android.text.TextUtils;
import android.view.Surface;
+import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
+import tv.danmaku.ijk.media.player.IMediaPlayer;
+import tv.danmaku.ijk.media.player.IjkMediaPlayer;
+
/**
* 统一管理MediaPlayer的地方,只有一个mediaPlayer实例，那么不会有多个视频同时播放，也节省资源。
@@ -20,17 +23,15 @@
* Created by Nathen
* On 2015/11/30 15:39
*/
-public class JCMediaManager implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener,
- MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnSeekCompleteListener, MediaPlayer.OnErrorListener,
- MediaPlayer.OnVideoSizeChangedListener, MediaPlayer.OnInfoListener {
+public class JCMediaManager implements IMediaPlayer.OnPreparedListener, IMediaPlayer.OnCompletionListener,
+ IMediaPlayer.OnBufferingUpdateListener, IMediaPlayer.OnSeekCompleteListener, IMediaPlayer.OnErrorListener,
+ IMediaPlayer.OnVideoSizeChangedListener, IMediaPlayer.OnInfoListener {
public static String TAG = JCVideoPlayer.TAG;
- public MediaPlayer mediaPlayer;
+ public IjkMediaPlayer mediaPlayer;
private static JCMediaManager JCMediaManager;
public int currentVideoWidth = 0;
public int currentVideoHeight = 0;
- public JCMediaPlayerListener listener;
- public JCMediaPlayerListener lastListener;
public int lastState;
public static final int HANDLER_PREPARE = 0;
@@ -40,6 +41,36 @@ public class JCMediaManager implements MediaPlayer.OnPreparedListener, MediaPlay
MediaHandler mMediaHandler;
Handler mainThreadHandler;
+ private WeakReference listener;
+ private WeakReference lastListener;
+
+ public JCMediaPlayerListener listener() {
+ if (listener == null)
+ return null;
+ return listener.get();
+ }
+
+ public JCMediaPlayerListener lastListener() {
+ if (lastListener == null)
+ return null;
+ return lastListener.get();
+ }
+
+ public void setListener(JCMediaPlayerListener listener) {
+ if (listener == null)
+ this.listener = null;
+ else
+ this.listener = new WeakReference<>(listener);
+ }
+
+ public void setLastListener(JCMediaPlayerListener lastListener) {
+ if (lastListener == null)
+ this.lastListener = null;
+ else
+ this.lastListener = new WeakReference<>(lastListener);
+ }
+
+
public static JCMediaManager instance() {
if (JCMediaManager == null) {
JCMediaManager = new JCMediaManager();
@@ -48,7 +79,7 @@ public static JCMediaManager instance() {
}
public JCMediaManager() {
- mediaPlayer = new MediaPlayer();
+ mediaPlayer = new IjkMediaPlayer();
mMediaHandlerThread = new HandlerThread(TAG);
mMediaHandlerThread.start();
mMediaHandler = new MediaHandler((mMediaHandlerThread.getLooper()));
@@ -69,10 +100,10 @@ public void handleMessage(Message msg) {
currentVideoWidth = 0;
currentVideoHeight = 0;
mediaPlayer.release();
- mediaPlayer = new MediaPlayer();
+ mediaPlayer = new IjkMediaPlayer();
mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
// mediaPlayer.setDataSource(context, Uri.parse(url), mapHeadData);
- Class clazz = MediaPlayer.class;
+ Class clazz = IjkMediaPlayer.class;
Method method = clazz.getDeclaredMethod("setDataSource", String.class, Map.class);
method.invoke(mediaPlayer, ((FuckBean) msg.obj).url, ((FuckBean) msg.obj).mapHeadData);
mediaPlayer.setLooping(((FuckBean) msg.obj).looping);
@@ -136,60 +167,60 @@ public void setDisplay(Surface holder) {
}
@Override
- public void onPrepared(MediaPlayer mp) {
+ public void onPrepared(IMediaPlayer mp) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onPrepared();
+ listener().onPrepared();
}
}
});
}
@Override
- public void onCompletion(MediaPlayer mp) {
+ public void onCompletion(IMediaPlayer mp) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onAutoCompletion();
+ listener().onAutoCompletion();
}
}
});
}
@Override
- public void onBufferingUpdate(MediaPlayer mp, final int percent) {
+ public void onBufferingUpdate(IMediaPlayer mp, final int percent) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onBufferingUpdate(percent);
+ listener().onBufferingUpdate(percent);
}
}
});
}
@Override
- public void onSeekComplete(MediaPlayer mp) {
+ public void onSeekComplete(IMediaPlayer mp) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onSeekComplete();
+ listener().onSeekComplete();
}
}
});
}
@Override
- public boolean onError(MediaPlayer mp, final int what, final int extra) {
+ public boolean onError(IMediaPlayer mp, final int what, final int extra) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onError(what, extra);
+ listener().onError(what, extra);
}
}
});
@@ -197,12 +228,12 @@ public void run() {
}
@Override
- public boolean onInfo(MediaPlayer mp, final int what, final int extra) {
+ public boolean onInfo(IMediaPlayer mp, final int what, final int extra) {
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onInfo(what, extra);
+ listener().onInfo(what, extra);
}
}
});
@@ -210,14 +241,14 @@ public void run() {
}
@Override
- public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+ public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int sar_num, int sar_den) {
currentVideoWidth = mp.getVideoWidth();
currentVideoHeight = mp.getVideoHeight();
mainThreadHandler.post(new Runnable() {
@Override
public void run() {
if (listener != null) {
- listener.onVideoSizeChanged();
+ listener().onVideoSizeChanged();
}
}
});
diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/Utils.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java
similarity index 98%
rename from jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/Utils.java
rename to jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java
index 94c8bdbea..4d92212b5 100644
--- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/Utils.java
+++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java
@@ -11,7 +11,7 @@
* Created by Nathen
* On 2016/02/21 12:25
*/
-public class Utils {
+public class JCUtils {
public static String stringForTime(int timeMs) {
if (timeMs <= 0 || timeMs >= 24 * 60 * 60 * 1000) {
diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java
index 253b935ca..a560270d9 100644
--- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java
+++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java
@@ -1,9 +1,7 @@
package fm.jiecao.jcvideoplayer_lib;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.graphics.SurfaceTexture;
import android.media.AudioManager;
import android.media.MediaPlayer;
@@ -70,6 +68,8 @@ public abstract class JCVideoPlayer extends FrameLayout implements View.OnClickL
protected Object[] mObjects;
protected Map mMapHeadData = new HashMap<>();
protected boolean mLooping = false;
+ public int seekToInAdvance = -1;
+
protected static Timer UPDATE_PROGRESS_TIMER;
protected ProgressTimerTask mProgressTimerTask;
@@ -134,7 +134,7 @@ protected static void setJcBuriedPoint(JCBuriedPoint jcBuriedPoint) {
}
public boolean setUp(String url, Object... objects) {
- if (JCMediaManager.instance().listener == this &&
+ if (isCurrentMediaListener() &&
(System.currentTimeMillis() - CLICK_QUIT_FULLSCREEN_TIME) < FULL_SCREEN_NORMAL_DELAY)
return false;
mCurrentState = CURRENT_STATE_NORMAL;
@@ -162,7 +162,7 @@ protected void setStateAndUi(int state) {
mCurrentState = state;
switch (mCurrentState) {
case CURRENT_STATE_NORMAL:
- if (JCMediaManager.instance().listener == this) {
+ if (isCurrentMediaListener()) {
cancelProgressTimer();
JCMediaManager.instance().releaseMediaPlayer();
}
@@ -177,7 +177,7 @@ protected void setStateAndUi(int state) {
startProgressTimer();
break;
case CURRENT_STATE_ERROR:
- if (JCMediaManager.instance().listener == this) {
+ if (isCurrentMediaListener()) {
JCMediaManager.instance().releaseMediaPlayer();
}
break;
@@ -199,24 +199,8 @@ public void onClick(View v) {
return;
}
if (mCurrentState == CURRENT_STATE_NORMAL || mCurrentState == CURRENT_STATE_ERROR) {
- if (!Utils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
- AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
- builder.setMessage(getResources().getString(R.string.tips_not_wifi));
- builder.setPositiveButton(getResources().getString(R.string.tips_not_wifi_confirm), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- startButtonLogic();
- WIFI_TIP_DIALOG_SHOWED = true;
- }
- });
- builder.setNegativeButton(getResources().getString(R.string.tips_not_wifi_cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- }
- });
- builder.create().show();
+ if (!mUrl.startsWith("file") && !JCUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+ showWifiDialog();
return;
}
startButtonLogic();
@@ -224,7 +208,7 @@ public void onClick(DialogInterface dialog, int which) {
Log.d(TAG, "pauseVideo [" + this.hashCode() + "] ");
JCMediaManager.instance().mediaPlayer.pause();
setStateAndUi(CURRENT_STATE_PAUSE);
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
if (mIfCurrentIsFullscreen) {
JC_BURIED_POINT.onClickStopFullscreen(mUrl, mObjects);
} else {
@@ -232,7 +216,7 @@ public void onClick(DialogInterface dialog, int which) {
}
}
} else if (mCurrentState == CURRENT_STATE_PAUSE) {
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
if (mIfCurrentIsFullscreen) {
JC_BURIED_POINT.onClickResumeFullscreen(mUrl, mObjects);
} else {
@@ -252,13 +236,13 @@ public void onClick(DialogInterface dialog, int which) {
backFullscreen();
} else {
Log.d(TAG, "toFullscreenActivity [" + this.hashCode() + "] ");
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
JC_BURIED_POINT.onEnterFullscreen(mUrl, mObjects);
}
//to fullscreen
JCMediaManager.instance().setDisplay(null);
- JCMediaManager.instance().lastListener = this;
- JCMediaManager.instance().listener = null;
+ JCMediaManager.instance().setLastListener(this);
+ JCMediaManager.instance().setListener(null);
IF_FULLSCREEN_FROM_NORMAL = true;
IF_RELEASE_WHEN_ON_PAUSE = false;
JCFullScreenActivity.startActivityFromNormal(getContext(), mCurrentState, mUrl, JCVideoPlayer.this.getClass(), this.mObjects);
@@ -272,6 +256,10 @@ public void onClick(DialogInterface dialog, int which) {
}
}
+ public void showWifiDialog() {
+
+ }
+
private void startButtonLogic() {
if (JC_BURIED_POINT != null && mCurrentState == CURRENT_STATE_NORMAL) {
JC_BURIED_POINT.onClickStartIcon(mUrl, mObjects);
@@ -283,10 +271,10 @@ private void startButtonLogic() {
protected void prepareVideo() {
Log.d(TAG, "prepareVideo [" + this.hashCode() + "] ");
- if (JCMediaManager.instance().listener != null) {
- JCMediaManager.instance().listener.onCompletion();
+ if (JCMediaManager.instance().listener() != null) {
+ JCMediaManager.instance().listener().onCompletion();
}
- JCMediaManager.instance().listener = this;
+ JCMediaManager.instance().setListener(this);
addTextureView();
AudioManager mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
mAudioManager.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
@@ -383,13 +371,13 @@ public boolean onTouch(View v, MotionEvent event) {
if (absDeltaX >= mThreshold) {
mChangePosition = true;
mDownPosition = getCurrentPositionWhenPlaying();
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
JC_BURIED_POINT.onTouchScreenSeekPosition(mUrl, mObjects);
}
} else {
mChangeVolume = true;
mGestureDownVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
JC_BURIED_POINT.onTouchScreenSeekVolume(mUrl, mObjects);
}
}
@@ -401,8 +389,8 @@ public boolean onTouch(View v, MotionEvent event) {
mSeekTimePosition = (int) (mDownPosition + deltaX * totalTimeDuration / mScreenWidth);
if (mSeekTimePosition > totalTimeDuration)
mSeekTimePosition = totalTimeDuration;
- String seekTime = Utils.stringForTime(mSeekTimePosition);
- String totalTime = Utils.stringForTime(totalTimeDuration);
+ String seekTime = JCUtils.stringForTime(mSeekTimePosition);
+ String totalTime = JCUtils.stringForTime(totalTimeDuration);
showProgressDialog(deltaX, seekTime, mSeekTimePosition, totalTime, totalTimeDuration);
}
@@ -430,7 +418,7 @@ public boolean onTouch(View v, MotionEvent event) {
}
/////////////////////
startProgressTimer();
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
if (mIfCurrentIsFullscreen) {
JC_BURIED_POINT.onClickSeekbarFullscreen(mUrl, mObjects);
} else {
@@ -508,6 +496,10 @@ public void onStopTrackingTouch(SeekBar seekBar) {
public void onPrepared() {
if (mCurrentState != CURRENT_STATE_PREPAREING) return;
JCMediaManager.instance().mediaPlayer.start();
+ if (seekToInAdvance != -1) {
+ JCMediaManager.instance().mediaPlayer.seekTo(seekToInAdvance);
+ seekToInAdvance = -1;
+ }
startProgressTimer();
setStateAndUi(CURRENT_STATE_PLAYING);
}
@@ -515,7 +507,7 @@ public void onPrepared() {
@Override
public void onAutoCompletion() {
//make me normal first
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
if (mIfCurrentIsFullscreen) {
JC_BURIED_POINT.onAutoCompleteFullscreen(mUrl, mObjects);
} else {
@@ -529,9 +521,9 @@ public void onAutoCompletion() {
finishFullscreenActivity();
if (IF_FULLSCREEN_FROM_NORMAL) {//如果在进入全屏后播放完就初始化自己非全屏的控件
IF_FULLSCREEN_FROM_NORMAL = false;
- JCMediaManager.instance().lastListener.onAutoCompletion();
+ JCMediaManager.instance().lastListener().onAutoCompletion();
}
- JCMediaManager.instance().lastListener = null;
+ JCMediaManager.instance().setLastListener(null);
AudioManager mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
mAudioManager.abandonAudioFocus(onAudioFocusChangeListener);
((Activity) getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -549,10 +541,10 @@ public void onCompletion() {
if (IF_FULLSCREEN_FROM_NORMAL) {//如果在进入全屏后播放完就初始化自己非全屏的控件
IF_FULLSCREEN_FROM_NORMAL = false;
- JCMediaManager.instance().lastListener.onCompletion();
+ JCMediaManager.instance().lastListener().onCompletion();
}
- JCMediaManager.instance().listener = null;
- JCMediaManager.instance().lastListener = null;
+ JCMediaManager.instance().setListener(null);
+ JCMediaManager.instance().setLastListener(null);
JCMediaManager.instance().currentVideoWidth = 0;
JCMediaManager.instance().currentVideoHeight = 0;
@@ -652,7 +644,7 @@ protected int getCurrentPositionWhenPlaying() {
int position = 0;
if (mCurrentState == CURRENT_STATE_PLAYING || mCurrentState == CURRENT_STATE_PAUSE) {
try {
- position = JCMediaManager.instance().mediaPlayer.getCurrentPosition();
+ position = (int) JCMediaManager.instance().mediaPlayer.getCurrentPosition();
} catch (IllegalStateException e) {
e.printStackTrace();
return position;
@@ -664,7 +656,7 @@ protected int getCurrentPositionWhenPlaying() {
protected int getDuration() {
int duration = 0;
try {
- duration = JCMediaManager.instance().mediaPlayer.getDuration();
+ duration = (int) JCMediaManager.instance().mediaPlayer.getDuration();
} catch (IllegalStateException e) {
e.printStackTrace();
return duration;
@@ -684,28 +676,29 @@ protected void setProgressAndTime(int progress, int secProgress, int currentTime
if (!mTouchingProgressBar) {
if (progress != 0) progressBar.setProgress(progress);
}
+ if (secProgress > 95) secProgress = 100;
if (secProgress != 0) progressBar.setSecondaryProgress(secProgress);
- currentTimeTextView.setText(Utils.stringForTime(currentTime));
- totalTimeTextView.setText(Utils.stringForTime(totalTime));
+ currentTimeTextView.setText(JCUtils.stringForTime(currentTime));
+ totalTimeTextView.setText(JCUtils.stringForTime(totalTime));
}
protected void resetProgressAndTime() {
progressBar.setProgress(0);
progressBar.setSecondaryProgress(0);
- currentTimeTextView.setText(Utils.stringForTime(0));
- totalTimeTextView.setText(Utils.stringForTime(0));
+ currentTimeTextView.setText(JCUtils.stringForTime(0));
+ totalTimeTextView.setText(JCUtils.stringForTime(0));
}
protected void quitFullScreenGoToNormal() {
Log.d(TAG, "quitFullScreenGoToNormal [" + this.hashCode() + "] ");
- if (JC_BURIED_POINT != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT != null && isCurrentMediaListener()) {
JC_BURIED_POINT.onQuitFullscreen(mUrl, mObjects);
}
JCMediaManager.instance().setDisplay(null);
- JCMediaManager.instance().listener = JCMediaManager.instance().lastListener;
- JCMediaManager.instance().lastListener = null;
+ JCMediaManager.instance().setListener(JCMediaManager.instance().lastListener());
+ JCMediaManager.instance().setLastListener(null);
JCMediaManager.instance().lastState = mCurrentState;//save state
- JCMediaManager.instance().listener.onBackFullscreen();
+ JCMediaManager.instance().listener().onBackFullscreen();
if (mCurrentState == CURRENT_STATE_PAUSE) {
JCMediaManager.instance().mediaPlayer.seekTo(JCMediaManager.instance().mediaPlayer.getCurrentPosition());
}
@@ -723,7 +716,7 @@ public void backFullscreen() {
Log.d(TAG, "quitFullscreen [" + this.hashCode() + "] ");
IF_FULLSCREEN_FROM_NORMAL = false;
if (mIfFullscreenIsDirectly) {
- JCMediaManager.instance().mediaPlayer.stop();
+ JCMediaManager.instance().mediaPlayer.release();
finishFullscreenActivity();
} else {
CLICK_QUIT_FULLSCREEN_TIME = System.currentTimeMillis();
@@ -735,8 +728,8 @@ public void backFullscreen() {
public static void releaseAllVideos() {
if (IF_RELEASE_WHEN_ON_PAUSE) {
Log.d(TAG, "releaseAllVideos");
- if (JCMediaManager.instance().listener != null) {
- JCMediaManager.instance().listener.onCompletion();
+ if (JCMediaManager.instance().listener() != null) {
+ JCMediaManager.instance().listener().onCompletion();
}
JCMediaManager.instance().releaseMediaPlayer();
} else {
@@ -748,12 +741,15 @@ public static void releaseAllVideos() {
* if I am playing release me
*/
public void release() {
- if (JCMediaManager.instance().listener == this &&
-// mCurrentState != CURRENT_STATE_NORMAL &&
+ if (isCurrentMediaListener() &&
(System.currentTimeMillis() - CLICK_QUIT_FULLSCREEN_TIME) > FULL_SCREEN_NORMAL_DELAY) {
Log.d(TAG, "release [" + this.hashCode() + "]");
releaseAllVideos();
}
}
+ protected boolean isCurrentMediaListener() {
+ return JCMediaManager.instance().listener() != null
+ && JCMediaManager.instance().listener() == this;
+ }
}
diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayerStandard.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayerStandard.java
index af1ccdeb3..668a436cc 100644
--- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayerStandard.java
+++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayerStandard.java
@@ -158,24 +158,8 @@ public void onClick(View v) {
return;
}
if (mCurrentState == CURRENT_STATE_NORMAL) {
- if (!Utils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
- AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
- builder.setMessage(getResources().getString(R.string.tips_not_wifi));
- builder.setPositiveButton(getResources().getString(R.string.tips_not_wifi_confirm), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- startPlayLocic();
- WIFI_TIP_DIALOG_SHOWED = true;
- }
- });
- builder.setNegativeButton(getResources().getString(R.string.tips_not_wifi_cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialog.dismiss();
- }
- });
- builder.create().show();
+ if (!mUrl.startsWith("file") && !JCUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+ showWifiDialog();
return;
}
startPlayLocic();
@@ -183,7 +167,7 @@ public void onClick(DialogInterface dialog, int which) {
onClickUiToggle();
}
} else if (i == R.id.surface_container) {
- if (JC_BURIED_POINT_STANDARD != null && JCMediaManager.instance().listener == this) {
+ if (JC_BURIED_POINT_STANDARD != null && isCurrentMediaListener()) {
if (mIfCurrentIsFullscreen) {
JC_BURIED_POINT_STANDARD.onClickBlankFullscreen(mUrl, mObjects);
} else {
@@ -196,6 +180,28 @@ public void onClick(DialogInterface dialog, int which) {
}
}
+ @Override
+ public void showWifiDialog() {
+ super.showWifiDialog();
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ builder.setMessage(getResources().getString(R.string.tips_not_wifi));
+ builder.setPositiveButton(getResources().getString(R.string.tips_not_wifi_confirm), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ startPlayLocic();
+ WIFI_TIP_DIALOG_SHOWED = true;
+ }
+ });
+ builder.setNegativeButton(getResources().getString(R.string.tips_not_wifi_cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ }
+ });
+ builder.create().show();
+ }
+
private void startPlayLocic() {
if (JC_BURIED_POINT_STANDARD != null) {
JC_BURIED_POINT_STANDARD.onClickStartThumb(mUrl, mObjects);
-
+
