diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/PlayerFactory.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/PlayerFactory.java index c9ff5c45..7fea76d0 100644 --- a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/PlayerFactory.java +++ b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/PlayerFactory.java @@ -5,7 +5,7 @@ /** * 此接口使用方法: * 1.继承{@link AbstractPlayer}扩展自己的播放器。 - * 2.继承此接口并实现${@link #createPlayer(Context)},返回步骤1中的播放器。 + * 2.继承此接口并实现{@link #createPlayer(Context)},返回步骤1中的播放器。 * 可参照{@link AndroidMediaPlayer}和{@link AndroidMediaPlayerFactory}的实现。 */ public abstract class PlayerFactory
{
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/MarqueeTextView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/MarqueeTextView.java
deleted file mode 100644
index b2c92550..00000000
--- a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/MarqueeTextView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dueeeke.videocontroller;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-/**
- * 实现跑马灯效果的TextView
- */
-public class MarqueeTextView extends TextView {
- private boolean mNeedFocus;
- public MarqueeTextView(Context context) {
- super(context);
- }
- public MarqueeTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
- public MarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
- //返回textview是否处在选中的状态
- //而只有选中的textview才能够实现跑马灯效果
- @Override
- public boolean isFocused() {
- if (mNeedFocus) {
- return false;
- }
- return super.isFocused();
- }
-
- public void setNeedFocus(boolean needFocus) {
- mNeedFocus = needFocus;
- }
-}
\ No newline at end of file
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/CompleteView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/CompleteView.java
index 85a8c209..9b8b2477 100644
--- a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/CompleteView.java
+++ b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/CompleteView.java
@@ -103,14 +103,12 @@ public void onPlayerStateChanged(int playerState) {
if (activity != null && mControlWrapper.hasCutout()) {
int orientation = activity.getRequestedOrientation();
int cutoutHeight = mControlWrapper.getCutoutHeight();
+ LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
- LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
sflp.setMargins(0, 0, 0, 0);
} else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
- LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
sflp.setMargins(cutoutHeight, 0, 0, 0);
} else if (orientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
- LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
sflp.setMargins(0, 0, 0, 0);
}
}
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/TitleView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/TitleView.java
index 3f0e76a4..dd5e6f6b 100644
--- a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/TitleView.java
+++ b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/TitleView.java
@@ -19,7 +19,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.dueeeke.videocontroller.MarqueeTextView;
import com.dueeeke.videocontroller.R;
import com.dueeeke.videoplayer.controller.IControlComponent;
import com.dueeeke.videoplayer.controller.ControlWrapper;
@@ -34,7 +33,7 @@ public class TitleView extends FrameLayout implements IControlComponent {
private ControlWrapper mControlWrapper;
private LinearLayout mTitleContainer;
- private MarqueeTextView mTitle;
+ private TextView mTitle;
private TextView mSysTime;//系统当前时间
private BatteryReceiver mBatteryReceiver;
@@ -120,8 +119,8 @@ public void onVisibilityChanged(boolean isVisible, Animation anim) {
}
} else {
if (getVisibility() == VISIBLE) {
+ setVisibility(GONE);
if (anim != null) {
- setVisibility(GONE);
startAnimation(anim);
}
}
@@ -149,10 +148,10 @@ public void onPlayerStateChanged(int playerState) {
setVisibility(VISIBLE);
mSysTime.setText(PlayerUtils.getCurrentSystemTime());
}
- mTitle.setNeedFocus(true);
+ mTitle.setSelected(true);
} else {
setVisibility(GONE);
- mTitle.setNeedFocus(false);
+ mTitle.setSelected(false);
}
Activity activity = PlayerUtils.scanForActivity(getContext());
diff --git a/dkplayer-ui/src/main/res/layout/dkplayer_layout_title_view.xml b/dkplayer-ui/src/main/res/layout/dkplayer_layout_title_view.xml
index 289dab6b..629a92de 100644
--- a/dkplayer-ui/src/main/res/layout/dkplayer_layout_title_view.xml
+++ b/dkplayer-ui/src/main/res/layout/dkplayer_layout_title_view.xml
@@ -21,14 +21,12 @@
android:padding="@dimen/dkplayer_controller_icon_padding"
android:src="@drawable/dkplayer_ic_action_arrow_back" />
-