BadCase

修改被动触发弹窗逻辑

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

@@ -25,6 +25,7 @@ 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.zhjt.mogo_core_function_devatools.badcase.biz.*
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
@@ -235,19 +236,22 @@ internal object BadCaseManager : LifecycleEventObserver {
     }
 
     fun onReceiveBadCaseRecord(record: RecordPanelOuterClass.RecordPanel,activity: Activity) {
+        CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}")
         if(BadCaseConfig.windowNum>1){
             return
         }
-        val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
-        passiveBadCaseWindow.setRecord(record.key.toString(),record.filename)
-        passiveBadCaseWindow.setClickListener(object: PassiveBadCaseWindow.ClickListener{
-            override fun closeWindow() {
-                passiveBadCaseWindow.hideFloatWindow()
-            }
-
-        })
-        passiveBadCaseWindow.showFloatWindow()
-
+        CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}")
+        CallerLogger.d("$M_DEVA$TAG","key=${record.key};filename${record.filename}")
+        ThreadUtils.runOnUiThread {
+            val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
+            passiveBadCaseWindow.setRecord(record.key.toString(),record.filename)
+            passiveBadCaseWindow.setClickListener(object: PassiveBadCaseWindow.ClickListener{
+                override fun closeWindow() {
+                    passiveBadCaseWindow.hideFloatWindow()
+                }
+            })
+            passiveBadCaseWindow.showFloatWindow()
+        }
     }
 
     private fun CoroutineScope.showBadCaseInternal(record: AutoPilotRecord) = launch {

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

@@ -272,7 +272,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
         when(recordPanel.stat){
             100, 101 ->{
                 //成功结束录制
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}bag录制成功")
+                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功")
             }
             300 ->{
                 //开始录制
@@ -280,7 +280,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
             }
             200 ->{
                 //录制失败
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}bag录制失败")
+                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败")
             }
         }
     }

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

@@ -166,8 +166,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             if(rbSix.isChecked){
                 uploadReason.append("点刹、顿挫")
             }
-            //点击上报时，如果没有停止录音则先停止录音
-            //TODO 未结束录音，点击上报，未能上传语音成功
             if(audioStatus){
                 audioStatus = !audioStatus
                 setAudio(audioStatus)
@@ -364,7 +362,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         when(recordPanel.stat){
             100, 101 ->{
                 //成功结束录制
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}bag录制成功")
+                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制成功")
             }
             300 ->{
                 //开始录制
@@ -372,7 +370,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             }
             200 ->{
                 //录制失败
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}bag录制失败")
+                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}:bag录制失败")
             }
         }
     }

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

@@ -16,7 +16,7 @@ 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.function.api.autopilot.IMoGoAutopilotCarStateListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
+import androidx.lifecycle.lifecycleScope
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
@@ -34,7 +34,7 @@ import com.zhjt.mogo_core_function_devatools.badcase.record.RecordManager
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mogo.telematics.pad.MessagePad
-import record_cache.RecordPanelOuterClass
+import com.mogo.eagle.core.utilcode.kotlin.*
 import java.io.File
 import java.lang.reflect.Field
 
@@ -122,8 +122,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                 TipToast.shortTip("请选择至少一个Case")
                 return@setOnClickListener
             }
-            //点击上报时，如果没有停止录音则先停止录音
-            //TODO 未结束录音，点击上报，未能上传语音成功
             if(audioStatus){
                 audioStatus = !audioStatus
                 setAudio(audioStatus)
@@ -286,12 +284,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                         checkBox.setTextColor(Color.WHITE)
                         val lp = FlexboxLayout.LayoutParams(FlexboxLayout.LayoutParams.WRAP_CONTENT,
                             FlexboxLayout.LayoutParams.WRAP_CONTENT)
-//                        lp.setMargins(
-//                            SizeUtils.dp2px(0f),
-//                            SizeUtils.dp2px(0f),
-//                            SizeUtils.dp2px(0f),
-//                            SizeUtils.dp2px(0f)
-//                        )
                         checkBox.buttonDrawable = mActivity.resources.getDrawable(R.drawable.badcase_radio_button_style)
                         checkBox.setPadding(SizeUtils.dp2px(12f),
                             SizeUtils.dp2px(5f),
@@ -304,7 +296,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                         flReasonLayout.addView(checkBox,lp)
                     }
                 }
-
             }
         }
 

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

@@ -1,13 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.badcase.biz
-
-/**
- * @author xuxinchao
- * @description
- * @since: 2022/7/11
- */
-data class TestBean(
-    var id: Int,
-    var src: String
-) {
-
-}