[2.13.0]消息盒子

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

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.deva.chain.ChainLogParam
 import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
@@ -97,8 +98,8 @@ class DevaToolsProvider : IDevaToolsProvider {
         BadCaseManager.initAiCollect(view)
     }
 
-    override fun onReceiveBadCaseRecord(recordKey: Long,fileName: String,activity: Activity) {
-        BadCaseManager.onReceiveBadCaseRecord(recordKey, fileName, activity)
+    override fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean,activity: Activity,countdown: Boolean) {
+        BadCaseManager.onReceiveBadCaseRecord(msgBoxBean, activity,countdown)
     }
 
     override fun showFeedbackWindow(ctx: Context) {

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

@@ -14,6 +14,8 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.RecordBagMsg
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager
 import com.mogo.eagle.core.utilcode.kotlin.PX
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
@@ -23,10 +25,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.reminder.Reminder
 import com.mogo.eagle.core.utilcode.reminder.api.IReminder
 import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IGlobalStateChangeListener
-import com.mogo.eagle.core.utilcode.util.ClickUtils
-import com.mogo.eagle.core.utilcode.util.NetworkUtils
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.eagle.core.utilcode.util.ToastUtils
+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
 import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord
@@ -168,19 +167,29 @@ internal object BadCaseManager : LifecycleEventObserver {
         }
     }
 
-    fun onReceiveBadCaseRecord(recordKey: Long,fileName: String,activity: Activity) {
+    fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean,activity: Activity,countdown: Boolean) {
         CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}")
         CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}")
-        CallerLogger.d("$M_DEVA$TAG","key=${recordKey};filename${fileName}")
         ThreadUtils.runOnUiThread {
             val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
-            passiveBadCaseWindow.setRecord(recordKey.toString(),fileName)
+            passiveBadCaseWindow.setRecord(msgBoxBean)
             passiveBadCaseWindow.setClickListener(object: PassiveBadCaseWindow.ClickListener{
                 override fun closeWindow() {
                     passiveBadCaseWindow.hideFloatWindow()
                 }
             })
             passiveBadCaseWindow.showFloatWindow()
+            if(countdown){
+                val countDownTimer = object: CountDownTimer(10000,1000){
+                    override fun onTick(p0: Long) {
+                    }
+
+                    override fun onFinish() {
+                        passiveBadCaseWindow.hideFloatWindow()
+                    }
+                }
+                countDownTimer.start()
+            }
         }
     }
 

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

@@ -16,8 +16,11 @@ import android.widget.TextView
 import com.google.android.flexbox.FlexboxLayout
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.RecordBagMsg
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
@@ -59,6 +62,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
     private var uploadReason: String = String() //上报原因，标签
     private var recordKey: String?=null //录制bag包key
     private var recordFileName: String?=null //录制文件包名
+    private var boxBean: MsgBoxBean ?= null
     private var longitude: Double?=null
     private var latitude: Double?=null
 
@@ -132,11 +136,15 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
             }else{
                 uploadAudio()
             }
+            //删除记录
+            CallerMsgBoxManager.removeRecordInfo(mActivity, boxBean!!, recordKey!!)
         }
 
         tvPassiveCancel.setOnClickListener {
             BadCaseConfig.windowNum--
             clickListener?.closeWindow()
+            //删除记录
+            CallerMsgBoxManager.removeRecordInfo(mActivity, boxBean!!, recordKey!!)
         }
 
         mWindowParams = WindowManager.LayoutParams()
@@ -343,9 +351,11 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
     }
 
-    fun setRecord(key:String,fileName:String){
-        recordKey = key
-        recordFileName = fileName
+    fun setRecord(msgBoxBean: MsgBoxBean){
+        boxBean = msgBoxBean
+        val recordBagMsg = (msgBoxBean.bean as RecordBagMsg)
+        recordKey = recordBagMsg.key.toString()
+        recordFileName = recordBagMsg.fileName
     }
 
     fun setClickListener(clickListener: ClickListener) {