From a5c2dcd8439f3e84a15a383e5bf139f2732cf83c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 21 Oct 2022 17:14:39 +0800 Subject: [PATCH] =?UTF-8?q?SOP=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 60 ++++++++++++++++++ .../hmi/ui/tools/AutoPilotAndCheckView.kt | 4 ++ .../res/drawable-xxhdpi/debug_icon_sop.png | Bin 0 -> 25704 bytes .../main/res/layout/view_auto_pilot_check.xml | 30 ++++++++- .../src/main/res/values/strings.xml | 1 + .../api/hmi/warning/IMoGoWaringProvider.kt | 5 ++ 6 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_sop.png diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index b4ad81e21b..0cf6b4e746 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -79,6 +79,7 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView import com.mogo.eagle.core.function.hmi.ui.setting.IPCReportWindow import com.mogo.eagle.core.function.hmi.ui.setting.ReportListFloatWindow +import com.mogo.eagle.core.function.hmi.ui.setting.SOPSettingView import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView import com.mogo.eagle.core.function.hmi.ui.tools.MaskView @@ -127,6 +128,9 @@ class MoGoHmiFragment : MvpFragment(), private var mDebugSettingViewFloat: WarningFloat.Builder? = null private var mDebugSettingView: DebugSettingView? = null + //SOPSettingView + private var mSOPSettingViewFloat: WarningFloat.Builder? = null + private var mSOPSettingView: SOPSettingView? = null private var mNoticeFloat: WarningFloat.Builder? = null @@ -447,6 +451,10 @@ class MoGoHmiFragment : MvpFragment(), dismissToolsFloatView() CallerDevaToolsManager.showFeedbackView(it) } + + override fun showSOPSettingView() { + toggleSOPView() + } }) } toolsViewFloat = WarningFloat.with(it) @@ -660,6 +668,58 @@ class MoGoHmiFragment : MvpFragment(), } } + + override fun toggleSOPView() { + activity?.let{ + if(mSOPSettingViewFloat!= null){ + WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false) + mSOPSettingViewFloat = null + mSOPSettingView = null + }else{ + if (mSOPSettingView == null){ + mSOPSettingView = SOPSettingView(it) + } + var side = RIGHT + var gravity = Gravity.RIGHT + //调试窗默认靠右显示,Bus的乘客端右端有视图覆盖,调试窗靠左显示 + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + ) { + side = LEFT + gravity = Gravity.LEFT + } + mSOPSettingViewFloat = WarningFloat.with(it) + .setTag("mSOPSettingView") + .setLayout(mSOPSettingView!!) + .setSidePattern(side) + .setGravity(gravity, offsetY = 70) + .setImmersionStatusBar(true) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() + } + } + } + /** * 展示VR下V2X预警 * diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 26c294afd6..a41a6c77d8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -101,6 +101,9 @@ class AutoPilotAndCheckView @JvmOverloads constructor( rlKillLayout.setOnClickListener { killApp() } + sopLayout.setOnClickListener { + clickListener?.showSOPSettingView() + } viewCheckStatus.setOnClickListener { clickListener?.go2CheckPage() } @@ -220,6 +223,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor( fun onClose(v: View) fun showDebugPanelView() fun showFeedbackView() + fun showSOPSettingView() } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_sop.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/debug_icon_sop.png new file mode 100644 index 0000000000000000000000000000000000000000..85809efdf3d5fc48f31db0ba89bb2e32a6c7aa16 GIT binary patch literal 25704 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 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml index fb2eaba745..ade0a7ce16 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml @@ -144,6 +144,32 @@ + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/sopLayout" /> + app:layout_constraintTop_toBottomOf="@id/sopLayout" /> 车辆检测 调试面板 录包设置 + 运营面板 车速设置 账户信息 系统运行 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt index aba129710c..da734fb58f 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -68,6 +68,11 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy { */ fun toggleDebugView() + /** + * 开关SOPSettingView + */ + fun toggleSOPView() + /** * 展示VR下V2X预警 *