From 71a7674bfb59d4acc8a641092729afe0d9a56f43 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 1 Mar 2023 15:41:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[M2-P=20v1.0.0]=E5=AE=A3=E4=BC=A0=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=85=A8=E5=B1=8F=E6=92=AD=E6=94=BE=EF=BC=88=E6=8B=89?= =?UTF-8?q?=E4=BC=B8=E9=93=BA=E6=BB=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 7af0ea8fb7..0a55e1b913 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -3,6 +3,7 @@ package com.mogo.och.bus.passenger.ui.widget.video import android.content.Context import android.util.AttributeSet import com.shuyu.gsyvideoplayer.utils.Debuger +import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer /** @@ -16,6 +17,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { init { hideWidget() + GSYVideoType.setShowType(com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL) } override fun hideAllWidget() { From 0b8193d24c3addc32b0a954429ef64296066d047 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 1 Mar 2023 15:40:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[m1]=E6=B8=85=E6=89=AB=E8=BD=A6=E6=94=BE?= =?UTF-8?q?=E5=BC=80=E6=A1=A3=E4=BD=8D=E9=99=90=E5=88=B6=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/fOchSweeper.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/productFlavors/fOchSweeper.gradle b/app/productFlavors/fOchSweeper.gradle index 730ae5e818..273ff178c0 100644 --- a/app/productFlavors/fOchSweeper.gradle +++ b/app/productFlavors/fOchSweeper.gradle @@ -51,6 +51,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' //清扫车不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);}}' + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file