Merge branch 'oo' into dev

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

@@ -73,13 +73,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
     }
 
     /*
-    * 默认双击暂停
+    * 默认双击暂停 单击响应事件也=暂停
     * */
     override fun onClickUiToggle() {
         super.touchDoubleUp()
     }
 
-
     override fun updateStartImage() {
         super.updateStartImage()
 

modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml

@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerCrop" />
 
     </RelativeLayout>
 
@@ -69,12 +69,14 @@
         android:layout_gravity="center_vertical"
         android:visibility="gone" />
 
+    <!--GSYVideoControlView  mLoadingProgressBar-->
     <ProgressBar
         android:id="@+id/loading"
         android:layout_width="@dimen/dp_56"
         android:layout_height="@dimen/dp_56"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
+        android:indeterminateTint="#256BFF"
         android:visibility="gone" />
 
 </RelativeLayout>