调整手势开启关闭逻辑

Doikki · Doikki · commit 63965fac3113 · 2019-11-29T21:26:56.000+08:00
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
@@ -172,6 +172,7 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float d
         if (!isInPlaybackState() //不处于播放状态
                 || !mIsGestureEnabled //关闭了手势
                 || !mCanSlide //关闭了滑动手势
+                || isLocked() //锁住了屏幕
                 || PlayerUtils.isEdge(getContext(), e1)) //处于屏幕边沿
             return true;
         float deltaX = e1.getX() - e2.getX();
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
@@ -96,6 +96,8 @@ protected void initView() {
 
             //竖屏也开启手势操作，默认关闭
 //            controller.setEnableInNormal(true);
+            //手势
+//            controller.setGestureEnabled(false);
             //适配刘海屏，默认开启
 //            controller.setAdaptCutout(false);
 
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/StandardVideoController.java
@@ -112,11 +112,9 @@ public void onClick(View v) {
     @Override
     protected void onLockStateChanged(boolean isLocked) {
         if (isLocked) {
-            setGestureEnabled(false);
             mLockButton.setSelected(true);
             Toast.makeText(getContext(), R.string.dkplayer_locked, Toast.LENGTH_SHORT).show();
         } else {
-            setGestureEnabled(true);
             mLockButton.setSelected(false);
             Toast.makeText(getContext(), R.string.dkplayer_unlocked, Toast.LENGTH_SHORT).show();
         }
