diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt index 12b7a1e3c4..8004d73182 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt @@ -265,24 +265,26 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel") if(recordKey==null){ recordKey = recordPanel.key.toString() + BadCaseConfig.recordKeyList.add(recordPanel.key) } if(recordFileName==null){ recordFileName = recordPanel.filename } - when(recordPanel.stat){ - 100, 101 ->{ - //成功结束录制 - TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功") - } - 300 ->{ - //开始录制 - } - 200 ->{ - //录制失败 - TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败") - } - } +// when(recordPanel.stat){ +// 100, 101 ->{ +// //成功结束录制 +// TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功") +// } +// 300 ->{ +// //开始录制 +// +// } +// 200 ->{ +// //录制失败 +// TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败") +// } +// } } private fun setRadioButtonStatus(largeCarStatus: Boolean,trafficLightStatus: Boolean,waterStatus: Boolean, diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 27668b6007..15296500ad 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -355,24 +355,25 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel") if(recordKey==null){ recordKey = recordPanel.key.toString() + BadCaseConfig.recordKeyList.add(recordPanel.key) } if(recordFileName==null){ recordFileName = recordPanel.filename } - when(recordPanel.stat){ - 100, 101 ->{ - //成功结束录制 - TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功") - } - 300 ->{ - //开始录制 - - } - 200 ->{ - //录制失败 - TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败") - } - } +// when(recordPanel.stat){ +// 100, 101 ->{ +// //成功结束录制 +// TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功") +// } +// 300 ->{ +// //开始录制 +// +// } +// 200 ->{ +// //录制失败 +// TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败") +// } +// } } fun setClickListener(clickListener: ClickListener) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt index b6406f34b1..5ea74fecef 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/consts/BadCaseConfig.kt @@ -28,4 +28,6 @@ object BadCaseConfig { @JvmField var dockerVersion:String ?= null + var recordKeyList:ArrayList = ArrayList() + } \ No newline at end of file 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 c3c7aefcdc..bd8530560d 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 @@ -68,6 +68,7 @@ import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.reminder.* import com.mogo.eagle.core.utilcode.reminder.api.* import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IStateChangeListener @@ -75,8 +76,10 @@ import com.mogo.eagle.core.utilcode.reminder.api.impl.* import com.mogo.eagle.core.utilcode.util.SoundUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.module.common.enums.* +import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig import kotlinx.android.synthetic.main.fragment_hmi.* import kotlinx.coroutines.* import mogo_msg.MogoReportMsg @@ -200,6 +203,19 @@ import kotlin.collections.ArrayList override fun getNotificationView(): IViewNotification? = context?.let { V2XNotificationView(it) } override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) { + CallerLogger.d(TAG, "recordKey=${recordPanel.key},stat=${recordPanel.stat}") + if(BadCaseConfig.recordKeyList.contains(recordPanel.key)){ + if(recordPanel.stat == 100 || recordPanel.stat == 101){ + //成功结束录制 + TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功") + } + if(recordPanel.stat == 200){ + //录制失败 + TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败") + } + BadCaseConfig.recordKeyList.remove(recordPanel.key) + return + } //处于非美化模式下弹窗 if (!FunctionBuildConfig.isDemoMode && recordPanel.stat == 100) { activity?.let { CallerDevaToolsManager.onReceiveBadCaseRecord(recordPanel, it) }