Merge branch 'oo' into dev

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt

@@ -3,6 +3,8 @@ package com.mogo.module.v2x.view
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.Log
+import android.view.MotionEvent
 import android.view.Surface
 import android.view.View
 import android.widget.ImageView
@@ -88,10 +90,6 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
         }
     }
 
-    override fun setDialogProgressBar(drawable: Drawable?) {
-//        standardGSYVideoPlayer.setDialogProgressBar(mDialogProgressBarDrawable)
-    }
-
     fun setFullClickListener(listener: OnClickListener) {
         fullscreen.setOnClickListener(listener)
     }
@@ -202,4 +200,10 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
             }
         }
     }
+
+    override fun showVolumeDialog(deltaY: Float, volumePercent: Int) {
+    }
+
+    override fun touchSurfaceMove(deltaX: Float, deltaY: Float, y: Float) {
+    }
 }