From 510578c0974414f7c68f9cc95b73920dc8ff51ca Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 22 Nov 2023 19:43:19 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=E5=BD=95=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=A4=9A=E6=AC=A1=E6=89=93=E5=BC=80=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 2 +- .../badcase/biz/PassiveBadCaseWindow.kt | 1 + .../hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt | 10 ++++++++-- .../com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt | 2 +- 4 files changed, 11 insertions(+), 4 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 f1912afdc0..efa0e4a5f8 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 @@ -237,7 +237,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis MsgBoxBean( MsgBoxType.RECORD, RecordBagMsg( recordPanel.key, recordPanel.stat, recordPanel.id, - recordPanel.type, recordPanel.filename, recordPanel.note + recordPanel.type, recordPanel.filename, recordPanel.note,false ) ) ) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index ad5a0c8793..0460696433 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -529,6 +529,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene recordFileName = recordBagMsg.fileName receiveTime = msgBoxBean.timestamp.toString() stat = recordBagMsg.stat.toString() + recordBagMsg.isShow = true } fun setClickListener(clickListener: ClickListener) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 555e692b59..0781077e9c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTran import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat +import com.mogo.eagle.core.utilcode.util.ToastUtils /** * @author XuXinChao @@ -130,9 +131,14 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvBagRecordTime.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" val msgBoxBean = it[position] + val recordBagMsg = msgBoxBean.bean as RecordBagMsg holder.tvRecordCheck.setOnClickListener { - //打开被动录包弹窗 - CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean, activity, false) + if(recordBagMsg.isShow){ + ToastUtils.showShort("当前录包上报面板已打开，请勿重复操作") + }else{ + //打开被动录包弹窗 + CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean, activity, false) + } } } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt index 350d489bb7..530f9c9b16 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt @@ -2,4 +2,4 @@ package com.mogo.eagle.core.data.msgbox import java.io.Serializable -data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String): Serializable \ No newline at end of file +data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String,var isShow: Boolean): Serializable \ No newline at end of file