diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
index d3244e8f7b..bc2d52176b 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
@@ -4,9 +4,10 @@ import android.content.Context
 import android.media.AudioManager
 import android.util.AttributeSet
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.shuyu.gsyvideoplayer.utils.Debuger
+import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
+import me.jessyan.autosize.utils.AutoSizeUtils
 
 /**
  * @author: wangmingjun
@@ -20,7 +21,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     init {
         hideWidget()
         GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL)
-        GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
+        //GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
     }
 
     override fun hideAllWidget() {
@@ -124,4 +125,13 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     private fun setNeedMute(isMute: Boolean){
         gsyVideoManager?.player?.setNeedMute(isMute)
     }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (!mIfCurrentIsFullscreen) {
+            val dp2px = AutoSizeUtils.dp2px(context, 16f)
+            this.outlineProvider = TextureVideoViewOutlineProvider(dp2px.toFloat())
+            this.clipToOutline = true
+        }
+    }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
index 29a678e59a..3a5693e80a 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -13,9 +13,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.och.bus.passenger.R
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
+import me.jessyan.autosize.utils.AutoSizeUtils
 import java.io.File
 
 /**
@@ -68,6 +70,9 @@ class AdvanceVideoView @JvmOverloads constructor(
         layoutParams.addRule(ALIGN_PARENT_RIGHT)
         layoutParams.addRule(ALIGN_PARENT_TOP)
         layoutParams.addRule(ALIGN_PARENT_BOTTOM)
+        val dp2px = AutoSizeUtils.dp2px(context, 16f)
+        videoRelativeLayout?.outlineProvider = TextureVideoViewOutlineProvider(dp2px.toFloat())
+        videoRelativeLayout?.clipToOutline = true
 
         videoRelativeLayout?.addView(videoViewPlayer, layoutParams)
     }
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
index 350a666cce..fa1b31c186 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
@@ -62,6 +62,26 @@
         app:layout_constraintEnd_toEndOf="@+id/och_shadow_layout"
         app:layout_constraintStart_toStartOf="@+id/och_shadow_layout"/>
 
+    <!--    消息盒子气泡-->
+    <com.mogo.eagle.core.function.hmi.ui.msgbox.MBoxBubbleView
+        android:id="@+id/box_bubble_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/och_shadow_layout"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginLeft="@dimen/dp_42"/>
+
+    <!--pnc行为决策-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
+        android:id="@+id/pnc_actions_view"
+        android:layout_width="@dimen/dp_231"
+        android:layout_height="@dimen/dp_36"
+        app:layout_constraintBottom_toTopOf="@+id/video_fragment"
+        android:layout_marginBottom="@dimen/dp_25"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:background_resource="@drawable/bg_pnc" />
 
     <!-- 图片或视频广告-->
 
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
index 851d3a25bb..4962a9f3c9 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
@@ -11,24 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <!--    消息盒子气泡-->
-
-    <com.mogo.eagle.core.function.hmi.ui.msgbox.MBoxBubbleView
-        android:id="@+id/box_bubble_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="@dimen/dp_16"
-        android:layout_marginLeft="@dimen/dp_26"/>
-
-    <!--pnc行为决策-->
-    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
-        android:id="@+id/pnc_actions_view"
-        android:layout_width="@dimen/dp_231"
-        android:layout_height="@dimen/dp_36"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:background_resource="@drawable/bg_pnc" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file