rebase

core/mogo-core-function-api/build.gradle

@@ -44,13 +44,16 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
     implementation rootProject.ext.dependencies.arouter
+    implementation project(path: ':libraries:mogo-adas')
     kapt rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.coroutinescore
     implementation rootProject.ext.dependencies.coroutinesandroid
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_data
+        compileOnly rootProject.ext.dependencies.adasHigh
     } else {
         implementation project(':core:mogo-core-data')
+        compileOnly project(':libraries:mogo-adas')
     }
 }
 

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt

@@ -1,5 +1,7 @@
 package com.mogo.eagle.core.function.api.devatools
 
+import android.view.View
+import com.mogo.eagle.core.data.autopilot.AutoPilotRecordResult
 import com.mogo.eagle.core.data.chain.ChainLogParam
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
 
@@ -18,4 +20,17 @@ interface IDevaToolsProvider : IMoGoFunctionServerProvider {
 
     fun refreshTraceInfo(map: HashMap<Int, ChainLogParam>)
 
+    /**
+     * 初始化BadCase入口
+     * @param view: 展示入口
+     * @param onShow: BadCase入口展示时回调
+     * @param onHide: BadCase入口隐藏时回调
+     * 注: 此方法必须在[recoverBadCase]和[onReceiveBadCaseRecord]之前调用
+     */
+    fun initBadCase(view: View, onShow: (() -> Unit)? = null, onHide: (() -> Unit)? = null)
+
+    /**
+     * 当工控机回调时调用
+     */
+    fun onReceiveBadCaseRecord(record: AutoPilotRecordResult)
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt

@@ -186,13 +186,6 @@ interface IMoGoWaringProvider  {
     fun showAdUpgradeStatus(upgradeMode : Int,downloadStatus : Int,currentProgress : Int,totalProgress : Int
                             ,downloadVersion : String,upgradeStatus : Int)
 
-    /**
-     * 注册badcase入口展示和隐藏的回调
-     * 当[onShow]被调用时，调用[showBadCaseEntrance]
-     * [onHide]回调不用关心，可以不注册
-     */
-    fun registerBadCaseCallback(onShow:() -> View, onHide: (() -> Unit)?)
-
     /**
      *注册工控机升级提示圆点View的回调
      * @param 提示圆点View
@@ -205,4 +198,11 @@ interface IMoGoWaringProvider  {
      * @param msg
      */
     fun showDockerRebootResult(code: Int,msg: String)
+
+    /**
+     * @param floatView: 要展示的View
+     * @param tag: 唯一标识
+     * @return 触发消失时回调
+     */
+    fun showBadCaseFloat(tag: String = "BadCaseFloat", floatView: View): () -> Unit
 }