yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[code_opt_3.3.0] remove unuse log and fix bug of trace link

Browse Source
This commit is contained in:
zhongchao
2023-06-15 11:51:17 +08:00
parent 23ed2e4315
commit fef4bf97bb
13 changed files with 165 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/TextureVideoView.java
View File

@@ -32,8 +32,6 @@ import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.MediaController.MediaPlayerControl;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import java.io.IOException;
import java.util.Map;
@@ -136,11 +134,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void setVideoURI(Uri uri, Map<String, String> headers) {
if (uri == null) {
CallerLogger.INSTANCE.i(TAG, "setVideoURI--- uri = null");
} else {
CallerLogger.INSTANCE.i(TAG, "setVideoURI--- uri = " + uri.getPath());
}
mUri = uri;
mHeaders = headers;
mSeekWhenPrepared = 0;
@@ -161,15 +154,13 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
@SuppressLint("NewApi")
private void openVideo() {
CallerLogger.INSTANCE.i(TAG, "openVideo");
if (mUri == null) {
CallerLogger.INSTANCE.i(TAG, "mUri == null ");
return;
}
if (mSurface == null) {
CallerLogger.INSTANCE.i(TAG, "mSurface == null ");
return;
}
if (mUri == null || mSurface == null || isSuspendFromActivity) {
CallerLogger.INSTANCE.i(TAG, "isSuspendFromActivity = " + isSuspendFromActivity);
if (isSuspendFromActivity) {
return;
}
release(false);
@@ -217,15 +208,11 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
mVideoWidth = mp.getVideoWidth();
mVideoHeight = mp.getVideoHeight();
if (mVideoWidth != 0 && mVideoHeight != 0) {
CallerLogger.INSTANCE.i(TAG, "OnVideoSizeChangedListener mVideoWidth:" + " mVideoWidth:" + mVideoWidth + " mVideoHeight:" + mVideoHeight);
}
}
};
MediaPlayer.OnPreparedListener mPreparedListener = new MediaPlayer.OnPreparedListener() {
public void onPrepared(MediaPlayer mp) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.OnPreparedListener");
mPrepareState = mCurrentState = STATE_PREPARED;
mVideoWidth = mp.getVideoWidth();
mVideoHeight = mp.getVideoHeight();
@@ -251,7 +238,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
private final OnCompletionListener mCompletionListener = new OnCompletionListener() {
public void onCompletion(MediaPlayer mp) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.OnCompletionListener");
mTargetState = mCurrentState = STATE_PLAYBACK_COMPLETED;
if (mOnCompletionListener != null) {
mOnCompletionListener.onCompletion(mMediaPlayer);
@@ -260,7 +246,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
};
private final OnSeekCompleteListener mSeekCompleteListener = mp -> {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.OnSeekCompleteListener");
try {
mCurrentState = mMediaPlayer.isPlaying() ? STATE_PLAYING : STATE_PAUSED;
} catch (Exception e) {
@@ -271,7 +256,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
private final OnErrorListener mErrorListener = new OnErrorListener() {
public boolean onError(MediaPlayer mp, int framework_err, int impl_err) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.onError");
mTargetState = mPrepareState = mCurrentState = STATE_ERROR;
if (mOnErrorListener != null) {
mOnErrorListener.onError(mMediaPlayer, framework_err,
@@ -286,7 +270,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
@Override
public boolean onInfo(MediaPlayer mp, int what, int extra) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.OnInfoListener---what = " + what + ";extra = " + extra);
int messageId = 0;
if (what == MEDIA_INFO_VIDEO_NOT_SUPPORTED) {
messageId = R.string.VideoView_info_text_video_not_supported;
@@ -305,7 +288,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
private final MediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener = new MediaPlayer.OnBufferingUpdateListener() {
public void onBufferingUpdate(MediaPlayer mp, int percent) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.OnBufferingUpdateListener");
mCurrentBufferPercentage = percent;
}
};
@@ -348,14 +330,12 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
SurfaceTextureListener mSurfaceTextureListener = new SurfaceTextureListener() {
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
CallerLogger.INSTANCE.i(TAG, "onSurfaceTextureAvailable");
mSurface = new Surface(surface);
openVideo();
}
@Override
public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
CallerLogger.INSTANCE.i(TAG, "onSurfaceTextureSizeChanged mVideoWidth:" + " mVideoWidth:" + mVideoWidth + " mVideoHeight:" + mVideoHeight);
boolean isValidState = (mTargetState == STATE_PLAYING);
boolean hasValidSize = (mVideoWidth == width && mVideoHeight == height);
if (mMediaPlayer != null && isValidState && hasValidSize) {
@@ -373,7 +353,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
@Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
CallerLogger.INSTANCE.i(TAG, "onSurfaceTextureDestroyed");
mSurface = null;
release(false);
return false;
@@ -389,7 +368,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
* release the media player in any state
*/
private void release(boolean cleartargetstate) {
CallerLogger.INSTANCE.i(TAG, "release ---cleartargetstate=" + cleartargetstate);
mCurrentState = STATE_IDLE;
if (cleartargetstate) {
@@ -441,14 +419,12 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void start() {
CallerLogger.INSTANCE.i(TAG, "TextureVideoView---start");
if (isFocusLoss) {
mTagetStateBackup = STATE_PLAYING;
return;
}
//CallerLogger.INSTANCE.i(TAG, "mCurrentState = " + mCurrentState);
if (isInPlaybackState()) {
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.start");
mMediaPlayer.start();
mCurrentState = STATE_PLAYING;
}
@@ -456,11 +432,8 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void pause() {
CallerLogger.INSTANCE.i(TAG, "TextureVideoView---pause");
CallerLogger.INSTANCE.i(TAG, "mCurrentState = " + mCurrentState);
if (isInPlaybackState()) {
if (mMediaPlayer.isPlaying()) {
CallerLogger.INSTANCE.i(TAG, " MediaPlayer.pause");
mMediaPlayer.pause();
mCurrentState = STATE_PAUSED;
}
@@ -469,7 +442,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void suspend() {
CallerLogger.INSTANCE.i(TAG, "TextureVideoView---suspend");
if (!isSuspendFromActivity) {
isSuspendFromActivity = true;
if (mMediaPlayer != null) {
@@ -482,15 +454,12 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void resume() {
CallerLogger.INSTANCE.i(TAG, "TextureVideoView---resume");
isSuspendFromActivity = false;
openVideo();
seekTo(progressWhileSuspend);
if (mTagetStateBackup == STATE_IDLE)
mTagetStateBackup = mTargetState;
CallerLogger.INSTANCE.i(TAG, "isFocusLoss = " + isFocusLoss);
CallerLogger.INSTANCE.i(TAG, "isInPlaybackState() = " + isInPlaybackState());
if (isFocusLoss) {
if (isInPlaybackState()) {
if (mMediaPlayer.isPlaying()) {
@@ -522,12 +491,10 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public void seekTo(int msec) {
CallerLogger.INSTANCE.i(TAG, "TextureVideoView---seekTo---msec = " + msec);
if (isInPlaybackState() && mCurrentState != STATE_SEEKING
&& msec > 0 && msec < getDuration()) {
mCurrentState = STATE_SEEKING;
CallerLogger.INSTANCE.i(TAG, "MediaPlayer.seekTo(msec) = " + msec);
mMediaPlayer.seekTo(msec);
mSeekWhenPrepared = 0;
} else {
@@ -591,7 +558,6 @@ public class TextureVideoView extends TextureView implements MediaPlayerControl
}
public int getCurrentState() {
CallerLogger.INSTANCE.i(TAG, "mCurrentState == " + mCurrentState);
return mCurrentState;
}
}