diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/ControlWrapper.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/ControlWrapper.java index e2b88c30..612cf4ed 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/ControlWrapper.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/ControlWrapper.java @@ -12,8 +12,8 @@ */ public class ControlWrapper implements MediaPlayerControl, IVideoController { - private MediaPlayerControl mPlayerControl; - private IVideoController mController; + private final MediaPlayerControl mPlayerControl; + private final IVideoController mController; public ControlWrapper(@NonNull MediaPlayerControl playerControl, @NonNull IVideoController controller) { mPlayerControl = playerControl; diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/GestureVideoController.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/GestureVideoController.java index d0c80d8b..505a31e5 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/GestureVideoController.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/controller/GestureVideoController.java @@ -246,7 +246,7 @@ protected void slideToChangeBrightness(float deltaY) { WindowManager.LayoutParams attributes = window.getAttributes(); int height = getMeasuredHeight(); if (mBrightness == -1.0f) mBrightness = 0.5f; - float brightness = deltaY * 2 / height * 1.0f + mBrightness; + float brightness = deltaY * 2 / height + mBrightness; if (brightness < 0) { brightness = 0f; } diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AndroidMediaPlayer.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AndroidMediaPlayer.java index 74cf83f6..11e99bd6 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AndroidMediaPlayer.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AndroidMediaPlayer.java @@ -21,7 +21,7 @@ public class AndroidMediaPlayer extends AbstractPlayer implements MediaPlayer.On protected MediaPlayer mMediaPlayer; private int mBufferedPercent; - private Context mAppContext; + protected Context mAppContext; private boolean mIsPreparing; public AndroidMediaPlayer(Context context) { diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AudioFocusHelper.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AudioFocusHelper.java index 463741a1..b93effbd 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AudioFocusHelper.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/AudioFocusHelper.java @@ -14,11 +14,11 @@ */ final class AudioFocusHelper implements AudioManager.OnAudioFocusChangeListener { - private Handler mHandler = new Handler(Looper.getMainLooper()); + private final Handler mHandler = new Handler(Looper.getMainLooper()); - private WeakReference mWeakVideoView; + private final WeakReference mWeakVideoView; - private AudioManager mAudioManager; + private final AudioManager mAudioManager; private boolean mStartRequested = false; private boolean mPausedForLoss = false; diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/BaseVideoView.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/BaseVideoView.java index a60d8fe5..92ffa549 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/BaseVideoView.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/BaseVideoView.java @@ -122,7 +122,7 @@ public class BaseVideoView

extends FrameLayout /** * {@link #mPlayerContainer}背景色，默认黑色 */ - private int mPlayerBackgroundColor; + private final int mPlayerBackgroundColor; public BaseVideoView(@NonNull Context context) { this(context, null); @@ -144,11 +144,11 @@ public BaseVideoView(@NonNull Context context, @Nullable AttributeSet attrs, int mRenderViewFactory = config.mRenderViewFactory; //读取xml中的配置，并综合全局配置 - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.VideoView); - mEnableAudioFocus = a.getBoolean(R.styleable.VideoView_enableAudioFocus, mEnableAudioFocus); - mIsLooping = a.getBoolean(R.styleable.VideoView_looping, false); - mCurrentScreenScaleType = a.getInt(R.styleable.VideoView_screenScaleType, mCurrentScreenScaleType); - mPlayerBackgroundColor = a.getColor(R.styleable.VideoView_playerBackgroundColor, Color.BLACK); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BaseVideoView); + mEnableAudioFocus = a.getBoolean(R.styleable.BaseVideoView_enableAudioFocus, mEnableAudioFocus); + mIsLooping = a.getBoolean(R.styleable.BaseVideoView_looping, false); + mCurrentScreenScaleType = a.getInt(R.styleable.BaseVideoView_screenScaleType, mCurrentScreenScaleType); + mPlayerBackgroundColor = a.getColor(R.styleable.BaseVideoView_playerBackgroundColor, Color.BLACK); a.recycle(); initView(); @@ -728,9 +728,7 @@ public void startFullScreen() { private void hideSysBar(ViewGroup decorView) { int uiOptions = decorView.getSystemUiVisibility(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - uiOptions |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - } + uiOptions |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { uiOptions |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; } @@ -775,9 +773,7 @@ public void stopFullScreen() { private void showSysBar(ViewGroup decorView) { int uiOptions = decorView.getSystemUiVisibility(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - uiOptions &= ~View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - } + uiOptions &= ~View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { uiOptions &= ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; } diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewConfig.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewConfig.java index 1e805184..5d4c9a80 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewConfig.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewConfig.java @@ -77,7 +77,7 @@ public Builder setEnableOrientation(boolean enableOrientation) { } /** - * 在移动环境下调用start()后是否继续播放，默认不继续播放 + * 在移动环境下调用start()后是否继续播放，默认继续播放 */ public Builder setPlayOnMobileNetwork(boolean playOnMobileNetwork) { mPlayOnMobileNetwork = playOnMobileNetwork; diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewManager.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewManager.java index d784f15e..b11538d3 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewManager.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/player/VideoViewManager.java @@ -2,10 +2,10 @@ import android.app.Application; -import xyz.doikki.videoplayer.util.L; - import java.util.LinkedHashMap; +import xyz.doikki.videoplayer.util.L; + /** * 视频播放器管理器，管理当前正在播放的VideoView，以及播放器配置 * 你也可以用来保存常驻内存的VideoView，但是要注意通过Application Context创建， @@ -16,7 +16,7 @@ public class VideoViewManager { /** * 保存VideoView的容器 */ - private LinkedHashMap mVideoViews = new LinkedHashMap<>(); + private final LinkedHashMap mVideoViews = new LinkedHashMap<>(); /** * 是否在移动网络下直接播放视频 diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/render/TextureRenderView.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/render/TextureRenderView.java index 2b8427a3..644eb560 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/render/TextureRenderView.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/render/TextureRenderView.java @@ -15,7 +15,7 @@ @SuppressLint("ViewConstructor") public class TextureRenderView extends TextureView implements IRenderView, TextureView.SurfaceTextureListener { - private MeasureHelper mMeasureHelper; + private final MeasureHelper mMeasureHelper; private SurfaceTexture mSurfaceTexture; @Nullable diff --git a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/util/PlayerUtils.java b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/util/PlayerUtils.java index c7f3cd51..b99fdff8 100644 --- a/dkplayer-java/src/main/java/xyz/doikki/videoplayer/util/PlayerUtils.java +++ b/dkplayer-java/src/main/java/xyz/doikki/videoplayer/util/PlayerUtils.java @@ -233,7 +233,7 @@ public static int getNetworkType(Context context) { /** * 通过反射获取Application * - * @deprecated 不在使用，后期谷歌可能封掉改接口 + * @deprecated 不在使用，后期谷歌可能封掉该接口 */ @SuppressLint("PrivateApi") @Deprecated diff --git a/dkplayer-java/src/main/res/values/attrs.xml b/dkplayer-java/src/main/res/values/attrs.xml index 6612afd6..c6b70faa 100644 --- a/dkplayer-java/src/main/res/values/attrs.xml +++ b/dkplayer-java/src/main/res/values/attrs.xml @@ -1,6 +1,6 @@ - + diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/PIPManager.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/PIPManager.java index abf63fcc..f0e3de88 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/PIPManager.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/PIPManager.java @@ -16,9 +16,9 @@ public class PIPManager { private static PIPManager instance; - private VideoView mVideoView; - private FloatView mFloatView; - private FloatController mFloatController; + private final VideoView mVideoView; + private final FloatView mFloatView; + private final FloatController mFloatController; private boolean mIsShowing; private int mPlayingPosition = -1; private Class mActClass; diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/ProgressManagerImpl.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/ProgressManagerImpl.java index 95843dcd..7bc22b88 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/ProgressManagerImpl.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/ProgressManagerImpl.java @@ -1,14 +1,15 @@ package xyz.doikki.dkplayer.util; -import androidx.collection.LruCache; import android.text.TextUtils; +import androidx.collection.LruCache; + import xyz.doikki.videoplayer.player.ProgressManager; public class ProgressManagerImpl extends ProgressManager { //保存100条记录 - private static LruCache mCache = new LruCache<>(100); + private static final LruCache mCache = new LruCache<>(100); @Override public void saveProgress(String url, long progress) { diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/cache/PreloadManager.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/cache/PreloadManager.java index ee7c81b4..554a5dc1 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/cache/PreloadManager.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/util/cache/PreloadManager.java @@ -23,19 +23,19 @@ public class PreloadManager { /** * 单线程池，按照添加顺序依次执行{@link PreloadTask} */ - private ExecutorService mExecutorService = Executors.newSingleThreadExecutor(); + private final ExecutorService mExecutorService = Executors.newSingleThreadExecutor(); /** * 保存正在预加载的{@link PreloadTask} */ - private LinkedHashMap mPreloadTasks = new LinkedHashMap<>(); + private final LinkedHashMap mPreloadTasks = new LinkedHashMap<>(); /** * 标识是否需要预加载 */ private boolean mIsStartPreload = true; - private HttpProxyCacheServer mHttpProxyCacheServer; + private final HttpProxyCacheServer mHttpProxyCacheServer; /** * 预加载的大小，每个视频预加载1M，这个参数可根据实际情况调整 diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/DefinitionControlView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/DefinitionControlView.java index 9989a1cd..cb01a1d9 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/DefinitionControlView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/DefinitionControlView.java @@ -17,25 +17,25 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import xyz.doikki.dkplayer.R; -import xyz.doikki.videocontroller.component.VodControlView; -import xyz.doikki.videoplayer.player.VideoView; -import xyz.doikki.videoplayer.util.L; -import xyz.doikki.videoplayer.util.PlayerUtils; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; import java.util.Map; +import xyz.doikki.dkplayer.R; +import xyz.doikki.videocontroller.component.VodControlView; +import xyz.doikki.videoplayer.player.VideoView; +import xyz.doikki.videoplayer.util.L; +import xyz.doikki.videoplayer.util.PlayerUtils; + public class DefinitionControlView extends VodControlView { - private TextView mDefinition; + private final TextView mDefinition; - private PopupWindow mPopupWindow; + private final PopupWindow mPopupWindow; private List mRateStr; - private LinearLayout mPopLayout; + private final LinearLayout mPopLayout; private int mCurIndex; @@ -125,7 +125,7 @@ public void setData(LinkedHashMap multiRateData) { } } - private OnClickListener rateOnClickListener = new OnClickListener() { + private final OnClickListener rateOnClickListener = new OnClickListener() { @Override public void onClick(View v) { diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/MyDanmakuView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/MyDanmakuView.java index 15f74e71..25191aa8 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/MyDanmakuView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/MyDanmakuView.java @@ -38,8 +38,8 @@ public class MyDanmakuView extends DanmakuView implements IControlComponent { - private DanmakuContext mContext; - private BaseDanmakuParser mParser; + private final DanmakuContext mContext; + private final BaseDanmakuParser mParser; public MyDanmakuView(@NonNull Context context) { super(context); diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/PipControlView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/PipControlView.java index b3a1f994..9184402d 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/PipControlView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/PipControlView.java @@ -23,9 +23,9 @@ public class PipControlView extends FrameLayout implements IControlComponent, Vi private ControlWrapper mControlWrapper; - private ImageView mPlay; - private ImageView mClose; - private ProgressBar mLoading; + private final ImageView mPlay; + private final ImageView mClose; + private final ProgressBar mLoading; public PipControlView(@NonNull Context context) { super(context); @@ -82,19 +82,19 @@ public void onVisibilityChanged(boolean isVisible, Animation anim) { if (mPlay.getVisibility() == VISIBLE) return; mPlay.setVisibility(VISIBLE); - mPlay.startAnimation(anim); } else { if (mPlay.getVisibility() == GONE) return; mPlay.setVisibility(GONE); - mPlay.startAnimation(anim); } + mPlay.startAnimation(anim); } @Override public void onPlayStateChanged(int playState) { switch (playState) { case VideoView.STATE_IDLE: + case VideoView.STATE_PAUSED: mPlay.setSelected(false); mPlay.setVisibility(VISIBLE); mLoading.setVisibility(GONE); @@ -104,12 +104,8 @@ public void onPlayStateChanged(int playState) { mPlay.setVisibility(GONE); mLoading.setVisibility(GONE); break; - case VideoView.STATE_PAUSED: - mPlay.setSelected(false); - mPlay.setVisibility(VISIBLE); - mLoading.setVisibility(GONE); - break; case VideoView.STATE_PREPARING: + case VideoView.STATE_BUFFERING: mPlay.setVisibility(GONE); mLoading.setVisibility(VISIBLE); break; @@ -122,10 +118,6 @@ public void onPlayStateChanged(int playState) { mPlay.setVisibility(GONE); bringToFront(); break; - case VideoView.STATE_BUFFERING: - mPlay.setVisibility(GONE); - mLoading.setVisibility(VISIBLE); - break; case VideoView.STATE_BUFFERED: mPlay.setVisibility(GONE); mLoading.setVisibility(GONE); diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/TikTokView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/TikTokView.java index 31a84926..fed66a74 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/TikTokView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/component/TikTokView.java @@ -22,11 +22,11 @@ public class TikTokView extends FrameLayout implements IControlComponent { - private ImageView thumb; - private ImageView mPlayBtn; + private final ImageView thumb; + private final ImageView mPlayBtn; private ControlWrapper mControlWrapper; - private int mScaledTouchSlop; + private final int mScaledTouchSlop; private int mStartX, mStartY; public TikTokView(@NonNull Context context) { diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/SurfaceRenderView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/SurfaceRenderView.java index 48100e72..a5ba3748 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/SurfaceRenderView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/SurfaceRenderView.java @@ -15,7 +15,7 @@ import xyz.doikki.videoplayer.render.MeasureHelper; public class SurfaceRenderView extends SurfaceView implements IRenderView, SurfaceHolder.Callback { - private MeasureHelper mMeasureHelper; + private final MeasureHelper mMeasureHelper; private AbstractPlayer mMediaPlayer; diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/TikTokRenderView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/TikTokRenderView.java index e9d5d069..49453a6b 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/TikTokRenderView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/render/TikTokRenderView.java @@ -15,7 +15,7 @@ */ public class TikTokRenderView implements IRenderView { - private IRenderView mProxyRenderView; + private final IRenderView mProxyRenderView; TikTokRenderView(@NonNull IRenderView renderView) { this.mProxyRenderView = renderView; diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/ExoVideoView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/ExoVideoView.java index b7f5d9d8..2e470775 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/ExoVideoView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/ExoVideoView.java @@ -28,7 +28,7 @@ public class ExoVideoView extends BaseVideoView { private RenderersFactory mRenderersFactory; private TrackSelector mTrackSelector; - private ExoMediaSourceHelper mHelper; + private final ExoMediaSourceHelper mHelper; public ExoVideoView(Context context) { super(context); diff --git a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/IjkVideoView.java b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/IjkVideoView.java index 7e42c6f7..7f0939ca 100644 --- a/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/IjkVideoView.java +++ b/dkplayer-sample/src/main/java/xyz/doikki/dkplayer/widget/videoview/IjkVideoView.java @@ -15,10 +15,10 @@ public class IjkVideoView extends BaseVideoView { - private HashMap mPlayerOptions = new HashMap<>(); - private HashMap mFormatOptions = new HashMap<>(); - private HashMap mCodecOptions = new HashMap<>(); - private HashMap mSwsOptions = new HashMap<>(); + private final HashMap mPlayerOptions = new HashMap<>(); + private final HashMap mFormatOptions = new HashMap<>(); + private final HashMap mCodecOptions = new HashMap<>(); + private final HashMap mSwsOptions = new HashMap<>(); public IjkVideoView(@NonNull Context context) { super(context); diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/CompleteView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/CompleteView.java index 86c2f388..6a727a8c 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/CompleteView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/CompleteView.java @@ -26,7 +26,7 @@ public class CompleteView extends FrameLayout implements IControlComponent { private ControlWrapper mControlWrapper; - private ImageView mStopFullscreen; + private final ImageView mStopFullscreen; public CompleteView(@NonNull Context context) { super(context); diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/GestureView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/GestureView.java index 524c730c..1ee6dfa6 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/GestureView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/GestureView.java @@ -1,5 +1,7 @@ package xyz.doikki.videocontroller.component; +import static xyz.doikki.videoplayer.util.PlayerUtils.stringForTime; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.Context; @@ -17,12 +19,10 @@ import androidx.annotation.Nullable; import xyz.doikki.videocontroller.R; -import xyz.doikki.videoplayer.controller.IGestureComponent; import xyz.doikki.videoplayer.controller.ControlWrapper; +import xyz.doikki.videoplayer.controller.IGestureComponent; import xyz.doikki.videoplayer.player.VideoView; -import static xyz.doikki.videoplayer.util.PlayerUtils.stringForTime; - /** * 手势控制 */ @@ -42,11 +42,11 @@ public GestureView(@NonNull Context context, @Nullable AttributeSet attrs, int d private ControlWrapper mControlWrapper; - private ImageView mIcon; - private ProgressBar mProgressPercent; - private TextView mTextPercent; + private final ImageView mIcon; + private final ProgressBar mProgressPercent; + private final TextView mTextPercent; - private LinearLayout mCenterContainer; + private final LinearLayout mCenterContainer; { diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/LiveControlView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/LiveControlView.java index 632c8c4d..d5c9cfea 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/LiveControlView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/LiveControlView.java @@ -27,9 +27,9 @@ public class LiveControlView extends FrameLayout implements IControlComponent, V private ControlWrapper mControlWrapper; - private ImageView mFullScreen; - private LinearLayout mBottomContainer; - private ImageView mPlayButton; + private final ImageView mFullScreen; + private final LinearLayout mBottomContainer; + private final ImageView mPlayButton; public LiveControlView(@NonNull Context context) { super(context); diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/PrepareView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/PrepareView.java index e7643ac5..e0b948e1 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/PrepareView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/PrepareView.java @@ -25,10 +25,10 @@ public class PrepareView extends FrameLayout implements IControlComponent { private ControlWrapper mControlWrapper; - private ImageView mThumb; - private ImageView mStartPlay; - private ProgressBar mLoading; - private FrameLayout mNetWarning; + private final ImageView mThumb; + private final ImageView mStartPlay; + private final ProgressBar mLoading; + private final FrameLayout mNetWarning; public PrepareView(@NonNull Context context) { super(context); diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/TitleView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/TitleView.java index 67dcbe35..295b6c68 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/TitleView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/TitleView.java @@ -32,11 +32,11 @@ public class TitleView extends FrameLayout implements IControlComponent { private ControlWrapper mControlWrapper; - private LinearLayout mTitleContainer; - private TextView mTitle; - private TextView mSysTime;//系统当前时间 + private final LinearLayout mTitleContainer; + private final TextView mTitle; + private final TextView mSysTime;//系统当前时间 - private BatteryReceiver mBatteryReceiver; + private final BatteryReceiver mBatteryReceiver; private boolean mIsRegister;//是否注册BatteryReceiver public TitleView(@NonNull Context context) { @@ -184,7 +184,7 @@ public void onLockStateChanged(boolean isLocked) { } private static class BatteryReceiver extends BroadcastReceiver { - private ImageView pow; + private final ImageView pow; public BatteryReceiver(ImageView pow) { this.pow = pow; diff --git a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/VodControlView.java b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/VodControlView.java index 52b74b00..6eedb80b 100644 --- a/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/VodControlView.java +++ b/dkplayer-ui/src/main/java/xyz/doikki/videocontroller/component/VodControlView.java @@ -35,12 +35,13 @@ public class VodControlView extends FrameLayout implements IControlComponent, Vi protected ControlWrapper mControlWrapper; - private TextView mTotalTime, mCurrTime; - private ImageView mFullScreen; - private LinearLayout mBottomContainer; - private SeekBar mVideoProgress; - private ProgressBar mBottomProgress; - private ImageView mPlayButton; + private final TextView mTotalTime; + private final TextView mCurrTime; + private final ImageView mFullScreen; + private final LinearLayout mBottomContainer; + private final SeekBar mVideoProgress; + private final ProgressBar mBottomProgress; + private final ImageView mPlayButton; private boolean mIsDragging;