[2.13.0-arch-opt] merge

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt

@@ -11,10 +11,19 @@ import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.RecordBagMsg
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
+import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.mogo_core_function_devatools.badcase.biz.*
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
@@ -27,7 +36,7 @@ import record_cache.RecordPanelOuterClass
 import java.lang.ref.WeakReference
 import java.util.concurrent.TimeUnit
 
-internal object BadCaseManager : LifecycleEventObserver {
+internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordListener {
 
     const val TAG = "BadCase"
 
@@ -96,6 +105,8 @@ internal object BadCaseManager : LifecycleEventObserver {
      * 主动采集BadCase
      */
     fun initBadCase(view: View) {
+        CallerAutopilotRecordListenerManager.addListener(TAG, this)
+
         val activity = view.context as? FragmentActivity
             ?: throw IllegalStateException("please ensure context is FragmentActivity.")
         view.setOnClickListener {
@@ -193,24 +204,62 @@ internal object BadCaseManager : LifecycleEventObserver {
         }
     }
 
+    override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
+        super.onAutopilotRecordResult(recordPanel)
+        CallerLogger.d("$M_DEVA$TAG", "recordKey=${recordPanel.key},stat=${recordPanel.stat}")
+        if (BadCaseConfig.recordKeyList.contains(recordPanel.key)) {
+            if (recordPanel.stat == 100 || recordPanel.stat == 101) {
+                //成功结束录制
+                TipToast.shortTip(
+                    "${
+                        TimeUtils.millis2String(
+                            System.currentTimeMillis(),
+                            TimeUtils.getHourMinSecondFormat()
+                        )
+                    } bag录制成功"
+                )
+            }
+            if (recordPanel.stat == 200) {
+                //录制失败
+                TipToast.shortTip(
+                    "${
+                        TimeUtils.millis2String(
+                            System.currentTimeMillis(),
+                            TimeUtils.getHourMinSecondFormat()
+                        )
+                    } bag录制失败"
+                )
+            }
+            return
+        }
+        //在工控机taxi2.3.0版本和Bus2.4.0版本上不支持被动录包，不进行被动录包的弹窗
+        BadCaseConfig.dockerVersion?.let {
+            if (it.contains("taxi") && it.contains("2.3.0")) {
+                return
+            }
+            if (it.contains("bus") && it.contains("2.4.0")) {
+                return
+            }
+        }
+        //处于非美化模式下弹窗；是地图数据采集任务时即type=2时，不弹窗
+        if (!FunctionBuildConfig.isDemoMode && (recordPanel.stat == 100 || recordPanel.stat == 101) && recordPanel.type != 2) {
+            //只在司机屏生效，乘客屏不生效
+            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+                CallerMsgBoxManager.saveMsgBox(
+                    MsgBoxBean(
+                        MsgBoxType.RECORD, RecordBagMsg(
+                            recordPanel.key, recordPanel.stat, recordPanel.id,
+                            recordPanel.type, recordPanel.filename, recordPanel.note
+                        )
+                    )
+                )
+            }
+        }
+    }
+
 
     override fun onStateChanged(source: LifecycleOwner, event: Event) {
 
     }
 
 }
-
-
-internal fun RecordPanelOuterClass.RecordPanel.toRecord(): AutoPilotRecord =
-    AutoPilotRecord().also {
-        it.id = this.id
-        it.stat = this.stat
-        it.key = this.key.toString()
-        it.note = this.note
-        it.type = this.type
-        it.total = this.totalSize
-        it.fileName = this.filename
-        it.duration = this.duration.toDouble()
-        it.diskFree = this.diskFree
-        it.consumed = false
-    }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt

@@ -373,6 +373,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
 
     override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
         CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel")
+
         ThreadUtils.runOnUiThread {
             if (recordKey == null) {
                 recordKey = recordPanel.key.toString()