Merge pull request svga#223 from yyued/2.5.3-fixIssue

PonyCui · web-flow · commit fb8722182f1d · 2020-01-12T10:15:29.000+08:00
feat: Correct touch event when mvideoItem == null;
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
@@ -256,6 +256,9 @@ open class SVGAImageView : ImageView {
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent?): Boolean {
+        if (mVideoItem == null) {
+            return super.onTouchEvent(event)
+        }
         event?.let {
             if(event.action == MotionEvent.ACTION_DOWN){
                 val drawable = drawable as? SVGADrawable ?: return false
@@ -267,9 +270,6 @@ open class SVGAImageView : ImageView {
                         }
                     }
                 }
-
-
-
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,9 @@ open class SVGAImageView : ImageView {`
`256`	`256`
`257`	`257`	`@SuppressLint("ClickableViewAccessibility")`
`258`	`258`	`override fun onTouchEvent(event: MotionEvent?): Boolean {`
	`259`	`+ if (mVideoItem == null) {`
	`260`	`+ return super.onTouchEvent(event)`
	`261`	`+ }`
`259`	`262`	`event?.let {`
`260`	`263`	`if(event.action == MotionEvent.ACTION_DOWN){`
`261`	`264`	`val drawable = drawable as? SVGADrawable ?: return false`
`@@ -267,9 +270,6 @@ open class SVGAImageView : ImageView {`
`267`	`270`	`}`
`268`	`271`	`}`
`269`	`272`	`}`
`270`		`-`
`271`		`-`
`272`		`-`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`