diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 0e422750f7..034930adbf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -265,6 +265,16 @@ internal class DebugSettingView @JvmOverloads constructor( } private fun initView() { + post { + val maxHeight = ScreenUtils.getScreenHeight()-BarUtils.getStatusBarHeight() + val height = clDebugContain.height + if(height>maxHeight){ + val layoutParamsOther = clDebugContain.layoutParams + layoutParamsOther.height = maxHeight + clDebugContain.layoutParams = layoutParamsOther + } + } + val iconDown = ContextCompat.getDrawable(context, R.drawable.icon_down) iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight) val iconRight = ContextCompat.getDrawable(context, R.drawable.icon_right) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt index 69b4b17e89..b09396f749 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt @@ -12,6 +12,8 @@ import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.hmi.notification.WarningFloat import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator +import com.mogo.eagle.core.utilcode.util.BarUtils +import com.mogo.eagle.core.utilcode.util.ScreenUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import me.jessyan.autosize.utils.AutoSizeUtils import mogo_msg.MogoReportMsg @@ -76,13 +78,16 @@ class ToggleDebugView private constructor() : IMoGoAutopilotStatusListener { } }) } + val height = AutoSizeUtils.dp2px(context, 1100f) + val maxHeight = ScreenUtils.getScreenHeight() - BarUtils.getStatusBarHeight() + val currentHeight = if(height>maxHeight) maxHeight else height mDebugSettingViewFloat = WarningFloat.with(context) .setTag("DebugSettingView") .setLayout(mDebugSettingView!!) .setSidePattern(sidePattern) .setGravity(gravity, offsetY = 70) .setImmersionStatusBar(true) - .setWindowHeight(AutoSizeUtils.dp2px(context, 1100f)) + .setWindowHeight(currentHeight) .setWindowWidth(AutoSizeUtils.dp2px(context, 800f)) .setAnimator(object : DefaultAnimator() { override fun enterAnim( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 5bfa8302c6..f42dae9896 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2,6 +2,7 @@