Merge pull request #302 from misaka10032w/develop

[Improved] 支持播放手势锁

Author: misaka10032w

app/src/main/java/com/yenaly/han1meviewer/ui/view/video/HJzvdStd.kt

@@ -245,6 +245,8 @@ class HJzvdStd @JvmOverloads constructor(
     private lateinit var topBarContainer: LinearLayout
     private lateinit var layoutTop: View
     private lateinit var layoutBottom: View
+    private lateinit var gestureLock: ImageView
+    var gestureLocked = false
     var savedProgress: Long = 0L
     private lateinit var btnResumeProgress: MaterialButton
     private val handler = Handler(Looper.getMainLooper())
@@ -363,6 +365,7 @@ class HJzvdStd @JvmOverloads constructor(
         layoutBottom = findViewById(R.id.layout_bottom)
         btnResumeProgress = findViewById(R.id.btn_resume_progress)
         topBarContainer = findViewById(R.id.top_bar_container)
+        gestureLock = findViewById(R.id.lock)
         textureViewContainer.isHapticFeedbackEnabled = true
         tvSpeed.setOnClickListener(this)
         tvKeyframe.setOnClickListener(this)
@@ -387,6 +390,9 @@ class HJzvdStd @JvmOverloads constructor(
                 gotoFullscreen()
             }
         }
+        gestureLock.setOnClickListener {
+            gestureLocked = !gestureLocked
+        }
 
     }
 
@@ -486,10 +492,23 @@ class HJzvdStd @JvmOverloads constructor(
             }
 
             STATE_PLAYING -> {
-                if (bottomContainer.isVisible) {
+                if (gestureLocked) {
+                    post {
+                        gestureLock.isVisible = !gestureLock.isVisible
+                    }
                     changeUiToPlayingClearSafe()
                 } else {
-                    changeUiToPlayingShowSafe()
+                    if (bottomContainer.isVisible) {
+                        post {
+                            gestureLock.isVisible = false
+                        }
+                        changeUiToPlayingClearSafe()
+                    } else {
+                        post {
+                            gestureLock.isVisible = true
+                        }
+                        changeUiToPlayingShowSafe()
+                    }
                 }
             }
 
@@ -545,6 +564,7 @@ class HJzvdStd @JvmOverloads constructor(
         btnGoHome.isVisible = true
         topBarContainer.isVisible = false
         superResolution.isVisible = false
+        gestureLock.isVisible = false
 
         layoutTop.updatePadding(left = 0, right = 0)
         layoutBottom.updatePadding(left = 0, right = 0)
@@ -562,6 +582,7 @@ class HJzvdStd @JvmOverloads constructor(
         topBarContainer.isVisible = true
         clarity.isVisible = true
         superResolution.isVisible = switchPlayerKernel == HMediaKernel.Type.MpvPlayer.name
+        gestureLock.isVisible = true
         val statusBarHeight = statusBarHeight
         val navBarHeight = navBarHeight
         layoutTop.updatePadding(left = statusBarHeight, right = navBarHeight)
@@ -701,6 +722,9 @@ class HJzvdStd @JvmOverloads constructor(
     }
 
     override fun touchActionMove(x: Float, y: Float) {
+        if (gestureLocked) {
+            return
+        }
         val deltaX = x - mDownX
         var deltaY = y - mDownY
         val absDeltaX = deltaX.absoluteValue

app/src/main/res/drawable/ic_baseline_lock_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorPrimary" android:pathData="M512.8,73.1a207.2,207.2 0,0 1,207.2 207.2l-0,61L829,341.3a73.1,73.1 0,0 1,73.1 73.1v438.9a73.1,73.1 0,0 1,-73.1 73.1L195,926.5a73.1,73.1 0,0 1,-73.1 -73.1L121.9,414.5a73.1,73.1 0,0 1,73.1 -73.1h110.5v-61a207.2,207.2 0,0 1,207.2 -207.2zM555.6,536.4h-73.1v195h73.1v-195zM512.8,146.3a134.1,134.1 0,0 0,-134.1 134.1L378.7,341.3h268.2v-61a134.1,134.1 0,0 0,-134.1 -134.1z"/>
+    
+</vector>

app/src/main/res/layout/layout_jzvd_with_speed.xml

@@ -264,21 +264,30 @@
 
     </LinearLayout>
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/start_layout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center_vertical">
+        android:layout_centerVertical="true">
 
         <ImageView
             android:id="@+id/start"
             android:layout_width="@dimen/jz_start_button_w_h_normal"
             android:layout_height="@dimen/jz_start_button_w_h_normal"
+            android:layout_centerInParent="true"
             android:src="@drawable/jz_click_play_selector" />
-    </LinearLayout>
 
+        <ImageView
+            android:id="@+id/lock"
+            android:tint="@color/per80_transparent_white"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="16dp"
+            android:visibility="invisible"
+            android:src="@drawable/ic_baseline_lock_24"/>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/replay_text"