优化标题滚动

kolarbear · Mar 10, 2020 · cdaf128 · cdaf128
1 parent 67c49e5
commit cdaf128
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 46 deletions.
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
@@ -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<P extends AbstractPlayer> {

diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/MarqueeTextView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/MarqueeTextView.java
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
@@ -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
@@ -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
@@ -21,14 +21,12 @@
             android:padding="@dimen/dkplayer_controller_icon_padding"
             android:src="@drawable/dkplayer_ic_action_arrow_back" />
 
-        <com.dueeeke.videocontroller.MarqueeTextView
+        <TextView
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingLeft="6dp"
             android:paddingRight="6dp"