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() { diff --git a/app/build.gradle b/app/build.gradle index fa7610ae23..db0d4f9e4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -478,16 +478,14 @@ Object readFileToJson(env){ def variantName() { if(gradle.startParameter.taskNames.size()>0) { for (String taskName : gradle.startParameter.taskNames) { - if (taskName.startsWith("assemble")) { - taskName = taskName.replace("Debug","") - taskName = taskName.replace("Release","") - if (taskName.endsWith("Qa")) { - return "qa" - } else if (taskName.endsWith("Online")) { - return "online" - } else if (taskName.endsWith("Demo")) { - return "demo" - } + taskName = taskName.replace("Debug", "") + taskName = taskName.replace("Release", "") + if (taskName.endsWith("Qa")) { + return "qa" + } else if (taskName.endsWith("Online")) { + return "online" + } else if (taskName.endsWith("Demo")) { + return "demo" } } } 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