From 67c49e54aadeeae80197d80bb97add095bf470b4 Mon Sep 17 00:00:00 2001
From: dueeeke <xinyunjian1995@gmail.com>
Date: Tue, 10 Mar 2020 13:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BB=91=E5=8A=A8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=90=8EGestureView=E4=BE=9D=E6=97=A7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GestureVideoController.java    | 41 ++++++++++++-------
 dkplayer-sample/src/main/AndroidManifest.xml  |  6 +--
 .../dkplayer/activity/api/PlayerActivity.java | 13 ++++++
 .../src/main/res/layout/activity_player.xml   | 24 +++++++++--
 .../StandardVideoController.java              |  2 +
 5 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/GestureVideoController.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/GestureVideoController.java
index 6e1d505f..18d6f510 100644
--- a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/GestureVideoController.java
+++ b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/GestureVideoController.java
@@ -33,8 +33,7 @@ public abstract class GestureVideoController extends BaseVideoController impleme
     private boolean mIsGestureEnabled = true;
     private int mStreamVolume;
     private float mBrightness;
-    private int mPosition;
-    private boolean mNeedSeek;
+    private int mSeekPosition;
     private boolean mFirstTouch;
     private boolean mChangePosition;
     private boolean mChangeBrightness;
@@ -228,8 +227,7 @@ protected void slideToChangePosition(float deltaX) {
                 ((IGestureComponent) component).onPositionChange(position, currentPosition, duration);
             }
         }
-        mPosition = position;
-        mNeedSeek = true;
+        mSeekPosition = position;
     }
 
     protected void slideToChangeBrightness(float deltaY) {
@@ -274,22 +272,35 @@ protected void slideToChangeVolume(float deltaY) {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        boolean detectedUp = event.getAction() == MotionEvent.ACTION_UP;
-        if (!mGestureDetector.onTouchEvent(event) && detectedUp) {
-            for (Map.Entry<IControlComponent, Boolean> next : mControlComponents.entrySet()) {
-                IControlComponent component = next.getKey();
-                if (component instanceof IGestureComponent) {
-                    ((IGestureComponent) component).onStopSlide();
-                }
-            }
-            if (mNeedSeek) {
-                mControlWrapper.seekTo(mPosition);
-                mNeedSeek = false;
+        //滑动结束时事件处理
+        if (!mGestureDetector.onTouchEvent(event)) {
+            int action = event.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_UP:
+                    stopSlide();
+                    if (mSeekPosition > 0) {
+                        mControlWrapper.seekTo(mSeekPosition);
+                        mSeekPosition = 0;
+                    }
+                    break;
+                case MotionEvent.ACTION_CANCEL:
+                    stopSlide();
+                    mSeekPosition = 0;
+                    break;
             }
         }
         return super.onTouchEvent(event);
     }
 
+    private void stopSlide() {
+        for (Map.Entry<IControlComponent, Boolean> next : mControlComponents.entrySet()) {
+            IControlComponent component = next.getKey();
+            if (component instanceof IGestureComponent) {
+                ((IGestureComponent) component).onStopSlide();
+            }
+        }
+    }
+
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         return false;
diff --git a/dkplayer-sample/src/main/AndroidManifest.xml b/dkplayer-sample/src/main/AndroidManifest.xml
index 35dc1e5d..ea156596 100644
--- a/dkplayer-sample/src/main/AndroidManifest.xml
+++ b/dkplayer-sample/src/main/AndroidManifest.xml
@@ -35,8 +35,7 @@
         <activity
             android:name=".activity.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -50,7 +49,8 @@
         <activity
             android:name=".activity.api.PlayerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden"/>
         <activity
             android:name=".activity.extend.DanmakuActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/PlayerActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/PlayerActivity.java
index 0bd88f40..8127bb68 100644
--- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/PlayerActivity.java
+++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/PlayerActivity.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
@@ -105,6 +106,7 @@ protected void initView() {
 
             //在控制器上显示调试信息
             controller.addControlComponent(new DebugInfoView(this));
+            //在LogCat显示调试信息
             controller.addControlComponent(new PlayerMonitor());
 
             //如果你不想要UI，不要设置控制器即可
@@ -127,6 +129,17 @@ protected void initView() {
 
             mVideoView.start();
         }
+
+        //播放其他视频
+        EditText etOtherVideo = findViewById(R.id.et_other_video);
+        findViewById(R.id.btn_start_play).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mVideoView.release();
+                mVideoView.setUrl(etOtherVideo.getText().toString());
+                mVideoView.start();
+            }
+        });
     }
 
     private VideoView.OnStateChangeListener mOnStateChangeListener = new VideoView.SimpleOnStateChangeListener() {
diff --git a/dkplayer-sample/src/main/res/layout/activity_player.xml b/dkplayer-sample/src/main/res/layout/activity_player.xml
index a5b2babf..1cd4aab0 100644
--- a/dkplayer-sample/src/main/res/layout/activity_player.xml
+++ b/dkplayer-sample/src/main/res/layout/activity_player.xml
@@ -19,12 +19,12 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/player"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/player">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <LinearLayout
@@ -154,6 +154,24 @@
                 android:layout_width="300dp"
                 android:layout_height="wrap_content" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/et_other_video"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="其他地址" />
+
+                <Button
+                    android:id="@+id/btn_start_play"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="开始播放" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java
index e2efceed..eeb5c7a8 100644
--- a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java
+++ b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java
@@ -28,6 +28,8 @@
 
 /**
  * 直播/点播控制器
+ * 注意：此控制器仅做一个参考，如果想定制ui，你可以直接继承GestureVideoController或者BaseVideoController实现
+ * 你自己的控制器
  * Created by dueeeke on 2017/4/7.
  */