From c409b5d033f91dbbe39be4a0add09f1c34dadf6e Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 23 Oct 2024 15:44:11 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E4=B8=AD=E6=9F=A5=E7=9C=8B=E5=BD=95=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 47 +++++++++---------- .../hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 16 ++++--- .../function/hmi/ui/msgbox/MsgBoxToastView.kt | 16 ++++--- 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index dac5762545..5298c482f5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -377,31 +377,29 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean, activity: Activity, countdown: Boolean) { CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}") CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}") - if(!ProjectUtils.isSaas()){ - ThreadUtils.runOnUiThread { - val passiveBadCaseWindow = PassiveBadCaseWindow(activity) - passiveBadCaseWindow.setRecord(msgBoxBean) - passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener { - override fun closeWindow() { - passiveBadCaseWindow.hideFloatWindow() - } - }) - passiveBadCaseWindow.showFloatWindow() - if (countdown) { - val countDownTimer = object : CountDownTimer(10000, 10000) { - override fun onTick(p0: Long) { - } - - override fun onFinish() { - //如果有页面操作，则不自动关闭窗口 - if(!passiveBadCaseWindow.isOperated()){ - passiveBadCaseWindow.hideFloatWindow() - BadCaseConfig.windowNum-- - } - } - } - countDownTimer.start() + ThreadUtils.runOnUiThread { + val passiveBadCaseWindow = PassiveBadCaseWindow(activity) + passiveBadCaseWindow.setRecord(msgBoxBean) + passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener { + override fun closeWindow() { + passiveBadCaseWindow.hideFloatWindow() } + }) + passiveBadCaseWindow.showFloatWindow() + if (countdown) { + val countDownTimer = object : CountDownTimer(10000, 10000) { + override fun onTick(p0: Long) { + } + + override fun onFinish() { + //如果有页面操作，则不自动关闭窗口 + if(!passiveBadCaseWindow.isOperated()){ + passiveBadCaseWindow.hideFloatWindow() + BadCaseConfig.windowNum-- + } + } + } + countDownTimer.start() } } } @@ -469,6 +467,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis if (!FunctionBuildConfig.isDemoMode && (recordPanel.stat == 100 || recordPanel.stat == 101) && recordPanel.type != 2) { //只在司机屏生效，乘客屏不生效 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.RECORD, RecordBagMsg( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 5d4adff1d0..19db18b10e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.commons.env.ProjectUtils import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.deva.report.ReportEntity import com.mogo.eagle.core.data.enums.DataSourceType @@ -114,12 +115,15 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( if (isShowData) { if (category == MsgCategory.RECORD_BAG) { if (!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow) { - //弹出被动录包弹窗 - CallerDevaToolsManager.onReceiveBadCaseRecord( - msgBoxBean, - context as Activity, - true - ) + //660开始saas环境下原有的接管录包弹窗不弹了，其他环境下还弹 + if(!ProjectUtils.isSaas()){ + //弹出被动录包弹窗 + CallerDevaToolsManager.onReceiveBadCaseRecord( + msgBoxBean, + context as Activity, + true + ) + } CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true) } } else if (category == MsgCategory.SYS_INFO) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt index df714ba51d..0b695bc18b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.commons.env.ProjectUtils import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.deva.report.ReportEntity import com.mogo.eagle.core.data.enums.DataSourceType @@ -102,12 +103,15 @@ class MsgBoxToastView @JvmOverloads constructor( if (isShowData) { if (category == MsgCategory.RECORD_BAG) { if (!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow) { - //弹出被动录包弹窗 - CallerDevaToolsManager.onReceiveBadCaseRecord( - msgBoxBean, - context as Activity, - true - ) + //660开始saas环境下原有的接管录包弹窗不弹了，其他环境下还弹 + if(!ProjectUtils.isSaas()){ + //弹出被动录包弹窗 + CallerDevaToolsManager.onReceiveBadCaseRecord( + msgBoxBean, + context as Activity, + true + ) + } CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true) } } else if (category == MsgCategory.SYS_INFO) {