[merge2master]

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

@@ -1,49 +1,106 @@
 package com.zhjt.mogo_core_function_devatools
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.view.*
+import android.view.View
+import android.view.ViewGroup
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.EnvConfig
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
 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.mogo.eagle.core.function.api.devatools.apm.*
+import com.mogo.eagle.core.function.api.devatools.strict.*
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.zhjt.mogo_core_function_devatools.apm.*
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
+import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
+import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager
+import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl
+import com.zhjt.mogo_core_function_devatools.koom.KoomInitTask
 import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager
-import com.zhjt.mogo_core_function_devatools.mofang.MoFangManager
+import com.zhjt.mogo_core_function_devatools.mofang.MoFangManager.Companion.moFangManager
 import com.zhjt.mogo_core_function_devatools.monitor.MonitorManager
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb.Companion.getDb
+import com.zhjt.mogo_core_function_devatools.report.IPCReportManager
+import com.zhjt.mogo_core_function_devatools.report.IPCReportManager.Companion.iPCReportManager
 import com.zhjt.mogo_core_function_devatools.scene.SceneManager.Companion.sceneManager
-import com.zhjt.mogo_core_function_devatools.status.*
+import com.zhjt.mogo_core_function_devatools.status.StatusManager
+import com.zhjt.mogo_core_function_devatools.strict.*
 import com.zhjt.mogo_core_function_devatools.trace.TraceManager.Companion.traceManager
 import com.zhjt.mogo_core_function_devatools.tts.TtsManager.Companion.ttsManager
 import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeManager.Companion.upgradeManager
-import record_cache.RecordPanelOuterClass
 
 @Route(path = MogoServicePaths.PATH_DEVA_TOOLS)
 class DevaToolsProvider : IDevaToolsProvider {
 
     companion object {
-        const val MODULE_NAME = "DevaToolsProvider"
+        const val TAG = "DevaToolsProvider"
     }
 
     private var mContext: Context? = null
 
+    private val apmEnvProvider by lazy { ApmEnvProviderImpl() }
+
+    private val strictModeProvider by lazy { StrictModeProviderImpl() }
+
+    @Volatile
+    private var mDockerVersion: String? = null
+
     override fun init(context: Context) {
         mContext = context
     }
 
     override fun initBiz() {
-        ttsManager.initTts(mContext!!)
+        if (DebugConfig.isDebug()) {
+            KoomInitTask.init(AbsMogoApplication.getApp())
+        }
+        ttsManager.initTts(mContext!!) //todo
+        //链路相关
         traceManager.init(mContext!!)
         bizConfigCenter.init(mContext!!)
         FuncConfigImpl.init()
         MogoLogCatchManager.init(mContext!!)
-        MoFangManager.INSTANCE.init(mContext!!)
+
+        // 视角切换功能初始化，监听路口及停止线回调
+        CallerVisualAngleManager.init()
+
+        //升级(鹰眼/工控)与监控服务
+        iPCReportManager.initServer()
+        moFangManager.init(mContext!!)
+        bindingCarManager.init(mContext!!)
+        apmEnvProvider.init(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "")
+    }
+
+    override fun checkMonitorDb() {
+        mContext?.let {
+            Thread {
+                val limitId: Long = 50001
+                val file = it.getDatabasePath(MonitorDb.INTERNAL_DB_NAME)
+                try {
+                    if (file != null && file.exists()) {
+                        val cpuList = getDb(it).monitorDao().getAllCPUById(limitId)
+                        val memList = getDb(it).monitorDao().getAllMemById(limitId)
+                        // 大于5w条清除
+                        if (cpuList.isNotEmpty() || memList.isNotEmpty()) {
+                            it.deleteDatabase(MonitorDb.INTERNAL_DB_NAME)
+                        }
+                    }
+                } catch (e: Exception) {
+                    CallerLogger.e(TAG, e.message)
+                }
+            }.start()
+        }
     }
 
     override fun startLogCatch() {
@@ -70,7 +127,6 @@ class DevaToolsProvider : IDevaToolsProvider {
         return traceManager.getTraceInfo()
     }
 
-    @SuppressLint("NewApi")
     override fun refreshTraceInfo(map: HashMap<Int, ChainLogParam>) {
         traceManager.refreshTraceInfo(map)
     }
@@ -99,8 +155,12 @@ class DevaToolsProvider : IDevaToolsProvider {
         BadCaseManager.initAiCollect(view)
     }
 
-    override fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean,activity: Activity,countdown: Boolean) {
-        BadCaseManager.onReceiveBadCaseRecord(msgBoxBean, activity,countdown)
+    override fun onReceiveBadCaseRecord(
+        msgBoxBean: MsgBoxBean,
+        activity: Activity,
+        countdown: Boolean
+    ) {
+        BadCaseManager.onReceiveBadCaseRecord(msgBoxBean, activity, countdown)
     }
 
     override fun showFeedbackWindow(ctx: Context) {
@@ -111,12 +171,17 @@ class DevaToolsProvider : IDevaToolsProvider {
         BadCaseManager.showBadCaseManagerWindow(context)
     }
 
-    override fun getUpgradeVersionUrls(versionName: String) {
-        upgradeManager.getPackageUrls(versionName)
+    override fun showReportListWindow(context: Context, isShow: Boolean) {
+        iPCReportManager.showReportListWindow(context, isShow)
     }
 
-    override fun downLoadPackage(downloadKey: String,downloadUrl: String) {
-        upgradeManager.downLoadPackage(mContext!!, downloadKey,downloadUrl)
+    override fun downLoadPackage(downloadKey: String, downloadUrl: String) {
+        upgradeManager.downLoadPackage(mContext!!, downloadKey, downloadUrl)
+    }
+
+    override fun updateUpgradeProgress() {
+        upgradeManager.updateUpgradeProgress(mContext!!)
+        upgradeManager.updateObuUpgradeStatus(mContext!!)
     }
 
     override fun showStatusBar(ctx: Context, container: ViewGroup) {
@@ -139,4 +204,58 @@ class DevaToolsProvider : IDevaToolsProvider {
     override fun syncConfig() {
         traceManager.syncConfig()
     }
+
+    override fun getEnvConfig(): EnvConfig? {
+        return EnvChangeManager.getEnvConfig()
+    }
+
+    override fun getEnvCityName(): String {
+        return EnvChangeManager.getCityName()
+    }
+
+    override fun getEnvNetMode(): String {
+        return EnvChangeManager.getNetMode()
+    }
+
+    override fun envConfigReset() {
+        EnvChangeManager.reset()
+    }
+
+    override fun envConfigChange(cityCode: String, netMode: Int) {
+        apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "")
+        EnvChangeManager.changeTo(cityCode, netMode)
+    }
+
+    override fun dockerVersion(dockerVersion: String?) {
+        mDockerVersion = dockerVersion
+        apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1","${ DebugConfig.getNetMode() }", dockerVersion ?: "")
+        BadCaseConfig.dockerVersion = dockerVersion
+    }
+
+    override fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
+        bindingCarManager.modifyCarInfo(callBack)
+    }
+
+    override fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) {
+        bindingCarManager.getBindingCarInfo(macAddress, widevineIDWithMd5)
+    }
+
+    override fun upgradeConfirm(images: List<String>, padSn: String, releaseId: String) {
+        bindingCarManager.upgradeConfirm(images, padSn, releaseId)
+    }
+
+    override fun queryContainers(padSn: String, dockerVersion: String) {
+        bindingCarManager.queryContainers(padSn, dockerVersion)
+    }
+
+    override fun queryAppUpgrade() {
+        bindingCarManager.queryAppUpgrade()
+    }
+
+    override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider
+
+    override fun queryObuUpgrade(obuVersionName: String) {
+        bindingCarManager.queryObuUpgrade(obuVersionName)
+    }
+    override fun strict(): IStrictModeProvider = strictModeProvider
 }

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

@@ -0,0 +1,142 @@
+package com.zhjt.mogo_core_function_devatools.apm
+
+import android.os.Process
+import android.text.TextUtils
+import android.widget.Toast
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_INIT_ENV_RESTART
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_INIT
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
+import com.mogo.eagle.core.function.api.devatools.apm.*
+import com.mogo.eagle.core.utilcode.util.*
+import com.zhjt.mogo_core_function_devatools.apm.config.*
+import com.zhjt.service.chain.ChainLog
+import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
+import kotlinx.coroutines.*
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicReference
+import kotlin.coroutines.*
+
+class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
+
+    private val TAG = "ApmEnvProvider"
+
+    private val scope by lazy { CoroutineScope(Dispatchers.IO + SupervisorJob())  }
+
+    private val hasInit by lazy { AtomicBoolean(false) }
+
+    private val mBuildType by lazy { AtomicReference<String>() }
+    private val mNetType by lazy { AtomicReference<String>() }
+    private val mDockerVersion by lazy { AtomicReference<String>() }
+
+    override val coroutineContext: CoroutineContext
+        get() = scope.coroutineContext
+
+    override fun init(buildType: String, netType: String, dockerVersion: String) {
+        launch {
+            if (ApmEnvConfig.isFirstEnter()) {
+                if (!TextUtils.isEmpty(buildType)) {
+                    ApmEnvConfig.setBuildType(buildType)
+                }
+                if (!TextUtils.isEmpty(netType)) {
+                    ApmEnvConfig.setNetType(netType)
+                }
+                if (!TextUtils.isEmpty(dockerVersion)) {
+                    ApmEnvConfig.setDockerVersion(dockerVersion)
+                }
+            }
+            hasInit.set(true)
+        }
+    }
+
+    override fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) {
+        if (!hasInit.get()) {
+            return
+        }
+        if (mBuildType.get() == buildType && mNetType.get() == netType && mDockerVersion.get() == dockerVersion) {
+            return
+        }
+        launch {
+            var buildTypeChanged = false
+            if (ApmEnvConfig.getBuildType() != buildType) {
+                buildTypeChanged = true
+                ApmEnvConfig.setBuildType(buildType)
+            }
+            var netTypeChanged = false
+            if (ApmEnvConfig.getNetType() != netType) {
+                netTypeChanged = true
+                ApmEnvConfig.setNetType(netType)
+            }
+            var dockerVersionChanged = false
+            val version = ApmEnvConfig.getDockerVersion()
+            if (!TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion) && version != dockerVersion) {
+                dockerVersionChanged = true
+                ApmEnvConfig.setDockerVersion(dockerVersion)
+            }
+            var isFirstDockerVersionSet = false
+            if (TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion)) {
+                isFirstDockerVersionSet = true
+                ApmEnvConfig.setDockerVersion(dockerVersion)
+            }
+            var isEnvValid = true
+            if (dockerVersionChanged || isFirstDockerVersionSet) {
+                isEnvValid = buildType == "0" || (buildType == "1" && netType == DebugConfig.NET_MODE_RELEASE.toString() && dockerVersion.endsWith("release", true))
+            }
+            val appRelaunched = ApmEnvConfig.isAppRelaunched()
+            if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) {
+                ApmEnvConfig.setAppRelaunched(true)
+                restartApp("buildType:$buildType,netType:$netType,dockerVersion:$dockerVersion")
+                return@launch
+            }
+            if (isFirstDockerVersionSet) {
+                return@launch
+            }
+
+            if (appRelaunched) {
+                ApmEnvConfig.setAppRelaunched(false)
+            }
+
+            if (!TextUtils.isEmpty(buildType)) {
+                mBuildType.set(buildType)
+            }
+
+            if (!TextUtils.isEmpty(netType)) {
+                mNetType.set(netType)
+            }
+
+            if (!TextUtils.isEmpty(dockerVersion)) {
+                mDockerVersion.set(dockerVersion)
+            }
+        }
+    }
+
+    @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+        linkCode = CHAIN_LINK_INIT,
+        endpoint = PAD,
+        nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_RESTART,
+        paramIndexes = [0],
+        clientPkFileName = "sn"
+    )
+    private fun restartApp(envStr:String) {
+        launch(Dispatchers.Main) {
+            Toast.makeText(Utils.getApp(), "发现系统环境不一致，正在重启...", Toast.LENGTH_SHORT).show()
+            delay(50)
+            Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
+            Process.killProcess(Process.myPid())
+        }
+    }
+
+    override fun isDebugEnabled(): Boolean? {
+         return runBlocking {
+             val oldBuildType = ApmEnvConfig.getBuildType()
+             val oldNetType = ApmEnvConfig.getNetType()
+             val oldDockerVersion = ApmEnvConfig.getDockerVersion()
+             if (TextUtils.isEmpty(oldBuildType) || TextUtils.isEmpty(oldNetType) || TextUtils.isEmpty(oldDockerVersion)) {
+                 null
+             } else {
+                 DebugConfig.isDebug() || (oldBuildType != "1" || oldNetType != DebugConfig.NET_MODE_RELEASE.toString() || !(oldDockerVersion?.endsWith("release", true) ?: false))
+             }
+         }
+    }
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/config/ApmEnvConfig.kt

@@ -0,0 +1,51 @@
+package com.zhjt.mogo_core_function_devatools.apm.config
+
+import androidx.datastore.core.*
+import com.mogo.eagle.core.utilcode.util.Utils
+import com.zhjt.mogo_core_function_devatools.apm.generated.ApmEnv
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import java.io.*
+
+object ApmEnvConfig {
+
+    private val serializer = object : Serializer<ApmEnv> {
+
+        override val defaultValue: ApmEnv
+            get() = ApmEnv.getDefaultInstance()
+
+        override suspend fun readFrom(input: InputStream): ApmEnv {
+            return withContext(Dispatchers.IO) {
+                ApmEnv.parseFrom(input)
+            }
+        }
+
+        override suspend fun writeTo(t: ApmEnv, output: OutputStream) {
+            withContext(Dispatchers.IO) {
+                t.writeTo(output)
+            }
+        }
+    }
+
+    private val store: DataStore<ApmEnv> by lazy {
+        DataStoreFactory.create(serializer) { File(Utils.getApp().filesDir, "apm_env.pb")}
+    }
+
+    suspend fun isFirstEnter() = store.data.firstOrNull()?.let { it.buildType.isNullOrEmpty() || it.netType.isNullOrEmpty() || it.dockerVersion.isNullOrEmpty() } ?: true
+
+    suspend fun setBuildType(type: String) = store.updateData { it.toBuilder().setBuildType(type).build() }
+
+    suspend fun setDockerVersion(version: String) = store.updateData { it.toBuilder().setDockerVersion(version).build() }
+
+    suspend fun setNetType(type: String) = store.updateData { it.toBuilder().setNetType(type).build() }
+
+    suspend fun getBuildType(): String? = store.data.catch { if (it is IOException) emit(ApmEnv.getDefaultInstance()) }.map { it.buildType }.firstOrNull()
+
+    suspend fun getDockerVersion(): String? = store.data.catch { if (it is IOException) emit(ApmEnv.getDefaultInstance()) }.map { it.dockerVersion }.firstOrNull()
+
+    suspend fun getNetType(): String? = store.data.catch { if (it is IOException) emit(ApmEnv.getDefaultInstance()) }.map { it.netType }.firstOrNull()
+
+    suspend fun setAppRelaunched(isReLaunched: Boolean) = store.updateData { it.toBuilder().setIsRelaunchApp(isReLaunched).build() }
+
+    suspend fun isAppRelaunched(): Boolean = store.data.catch { if (it is IOException) emit(ApmEnv.getDefaultInstance()) }.map { it.isRelaunchApp }.firstOrNull() ?: false
+}

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

@@ -6,26 +6,37 @@ import android.content.Context
 import android.view.View
 import android.view.WindowManager
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.*
 import androidx.lifecycle.Lifecycle.Event
+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
 import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord
 import com.zhjt.mogo_core_function_devatools.ext.enqueuePop
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import me.jessyan.autosize.utils.AutoSizeUtils
 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"
 
@@ -33,7 +44,8 @@ internal object BadCaseManager : LifecycleEventObserver{
      * 超过此时间，case入口自动消失
      */
 
-    private val CASE_EXPIRE_DURATION: Long = TimeUnit.HOURS.toMillis(4)/* TimeUnit.SECONDS.toMillis(10) */
+    private val CASE_EXPIRE_DURATION: Long =
+        TimeUnit.HOURS.toMillis(4)/* TimeUnit.SECONDS.toMillis(10) */
 
     private var hideFloat: (() -> Unit)? = null
 
@@ -71,15 +83,20 @@ internal object BadCaseManager : LifecycleEventObserver{
     /**
      * 展示BadCase配置页面
      */
-    fun showBadCaseConfigWindow(context: Context){
+    fun showBadCaseConfigWindow(context: Context) {
         val badCaseConfigView = BadCaseConfigView(context)
-        badCaseConfigView.setClickListener(object: BadCaseConfigView.ClickListener{
+        badCaseConfigView.setClickListener(object : BadCaseConfigView.ClickListener {
             override fun onClose() {
                 hideFloat?.invoke()
                 hideFloat = null
             }
         })
-        context.enqueuePop(badCaseConfigView,AutoSizeUtils.dp2px(context,960f), WindowManager.LayoutParams.MATCH_PARENT, key = "BadCaseConfigView").also {
+        context.enqueuePop(
+            badCaseConfigView,
+            AutoSizeUtils.dp2px(context, 960f),
+            WindowManager.LayoutParams.MATCH_PARENT,
+            key = "BadCaseConfigView"
+        ).also {
             hideFloat = it
         }
     }
@@ -103,37 +120,42 @@ internal object BadCaseManager : LifecycleEventObserver{
     /**
      * 主动采集BadCase
      */
-    fun initBadCase(view: View){
-        val activity = view.context as? FragmentActivity ?: throw IllegalStateException("please ensure context is FragmentActivity.")
+    fun initBadCase(view: View) {
+        CallerAutopilotRecordListenerManager.addListener(TAG, this)
+
+        val activity = view.context as? FragmentActivity
+            ?: throw IllegalStateException("please ensure context is FragmentActivity.")
         view.setOnClickListener {
-            if(ClickUtils.isFastClick()){
-                if(NetworkUtils.isConnected()){
-                    if(BadCaseConfig.dockerVersion!=null){
+            if (ClickUtils.isFastClick()) {
+                if (NetworkUtils.isConnected()) {
+                    if (BadCaseConfig.dockerVersion != null) {
                         //兼容老MAP版本
-                        if(BadCaseConfig.dockerVersion!!.contains("2.3.0")
+                        if (BadCaseConfig.dockerVersion!!.contains("2.3.0")
                             || BadCaseConfig.dockerVersion!!.contains("2.4.0")
                             || BadCaseConfig.dockerVersion!!.contains("2.5.0")
                             || BadCaseConfig.dockerVersion!!.contains("2.6.0")
-                            || BadCaseConfig.dockerVersion!!.contains("2.8.0")){
+                            || BadCaseConfig.dockerVersion!!.contains("2.8.0")
+                        ) {
                             val initiativeBadCaseWindow = InitiativeBadCaseWindow(activity)
-                            initiativeBadCaseWindow.setClickListener(object: InitiativeBadCaseWindow.ClickListener{
+                            initiativeBadCaseWindow.setClickListener(object :
+                                InitiativeBadCaseWindow.ClickListener {
                                 override fun closeWindow() {
                                     initiativeBadCaseWindow.hideFloatWindow()
                                 }
 
                             })
                             initiativeBadCaseWindow.showFloatWindow(null)
-                        }else{
+                        } else {
                             val caseListDialog = CaseListDialog(activity)
                             caseListDialog.show()
                         }
-                    }else{
+                    } else {
                         ToastUtils.showShort("工控机连接状态异常")
                     }
-                }else{
+                } else {
                     ToastUtils.showShort("网络异常,请检查网络")
                 }
-            }else{
+            } else {
                 ToastUtils.showShort("请勿连续点击，稍后再试")
             }
 
@@ -143,46 +165,48 @@ internal object BadCaseManager : LifecycleEventObserver{
     /**
      * AI数据采集
      */
-    fun initAiCollect(view: View){
-        val activity = view.context as? FragmentActivity ?: throw IllegalStateException("please ensure context is FragmentActivity.")
+    fun initAiCollect(view: View) {
+        val activity = view.context as? FragmentActivity
+            ?: throw IllegalStateException("please ensure context is FragmentActivity.")
         view.setOnClickListener {
-            if(ClickUtils.isFastClick()){
-                if(NetworkUtils.isConnected()){
-                    if(BadCaseConfig.dockerVersion!=null){
+            if (ClickUtils.isFastClick()) {
+                if (NetworkUtils.isConnected()) {
+                    if (BadCaseConfig.dockerVersion != null) {
                         val aiDataCollectWindow = AIDataCollectWindow(activity)
-                        aiDataCollectWindow.setClickListener(object: AIDataCollectWindow.ClickListener{
+                        aiDataCollectWindow.setClickListener(object :
+                            AIDataCollectWindow.ClickListener {
                             override fun closeWindow() {
                                 aiDataCollectWindow.hideFloatWindow()
                             }
                         })
                         aiDataCollectWindow.showFloatWindow()
-                    }else{
+                    } else {
                         ToastUtils.showShort("工控机连接状态异常")
                     }
-                }else{
+                } else {
                     ToastUtils.showShort("网络异常,请检查网络")
                 }
-            }else{
+            } else {
                 ToastUtils.showShort("请勿连续点击，稍后再试")
             }
 
         }
     }
 
-    fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean,activity: Activity,countdown: Boolean) {
+    fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean, activity: Activity, countdown: Boolean) {
         CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}")
         CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}")
         ThreadUtils.runOnUiThread {
             val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
             passiveBadCaseWindow.setRecord(msgBoxBean)
-            passiveBadCaseWindow.setClickListener(object: PassiveBadCaseWindow.ClickListener{
+            passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener {
                 override fun closeWindow() {
                     passiveBadCaseWindow.hideFloatWindow()
                 }
             })
             passiveBadCaseWindow.showFloatWindow()
-            if(countdown){
-                val countDownTimer = object: CountDownTimer(10000,1000){
+            if (countdown) {
+                val countDownTimer = object : CountDownTimer(10000, 1000) {
                     override fun onTick(p0: Long) {
                     }
 
@@ -196,25 +220,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/AIDataCollectWindow.kt

@@ -10,11 +10,12 @@ import android.widget.RadioButton
 import android.widget.TextView
 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.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 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
@@ -27,9 +28,7 @@ import com.zhjt.mogo_core_function_devatools.R
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import mogo.telematics.pad.MessagePad
 import record_cache.RecordPanelOuterClass
-import java.lang.reflect.Field
 import java.util.*
 
 /**
@@ -38,7 +37,7 @@ import java.util.*
  * @since: 2022/7/12
  */
 class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener,
-    IMoGoAutopilotRecordListener , IMoGoAutopilotCarStateListener {
+    IMoGoAutopilotRecordListener, IMoGoChassisLocationWGS84Listener {
 
     companion object {
         const val TAG = "AIDataCollectWindow"
@@ -63,12 +62,14 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
     private lateinit var tvCollectCancel: TextView //取消按钮
 
     private var collectReason: String = "大型车：大货、大巴、特种车辆"
+
     @Volatile
-    private var recordKey: String?=null //录制bag包key
+    private var recordKey: String? = null //录制bag包key
+
     @Volatile
-    private var recordFileName: String?=null //录制文件包名
-    private var longitude: Double?=null
-    private var latitude: Double?=null
+    private var recordFileName: String? = null //录制文件包名
+    private var longitude: Double? = null
+    private var latitude: Double? = null
 
     private lateinit var mFloatLayout: View
     private var mInViewX = 0f
@@ -89,8 +90,9 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
     }
 
     @SuppressLint("SetTextI18n")
-    private fun initFloatWindow(){
-        mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.view_ai_data_collect, null) as View
+    private fun initFloatWindow() {
+        mFloatLayout =
+            LayoutInflater.from(mActivity).inflate(R.layout.view_ai_data_collect, null) as View
         mFloatLayout.setOnTouchListener(this)
         tvCollectNum = mFloatLayout.findViewById(R.id.tvCollectNum)
         tvCollectTime = mFloatLayout.findViewById(R.id.tvCollectTime)
@@ -105,25 +107,26 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
 
         tvCollectReport = mFloatLayout.findViewById(R.id.tvCollectReport)
         tvCollectCancel = mFloatLayout.findViewById(R.id.tvCollectCancel)
-        if(BadCaseConfig.windowNum<1){
+        if (BadCaseConfig.windowNum < 1) {
             BadCaseConfig.windowNum = 1
         }
         tvCollectNum.text = BadCaseConfig.windowNum.toString()
         BadCaseConfig.windowNum++
-        tvCollectTime.text ="时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
+        tvCollectTime.text =
+            "时间：${millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())}"
         //采集结果回调监听
-        CallerAutopilotRecordListenerManager.addListener(this.hashCode().toString(),this)
+        CallerAutopilotRecordListenerManager.addListener(this.hashCode().toString(), this)
         // 添加 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.addListener(this.hashCode().toString(), this)
+        CallerChassisLocationWGS84ListenerManager.addListener(this.hashCode().toString(), this)
         //开始录制AI数据采集Bag包
-        CallerAutoPilotManager.recordPackage(
+        CallerAutoPilotControlManager.recordPackage(
             99,
             Random(SystemClock.elapsedRealtime()).nextInt(),
             20,
             12
         )
         //大型车
-        rbLargeCar.setOnClickListener{
+        rbLargeCar.setOnClickListener {
             setRadioButtonStatus(
                 largeCarStatus = true,
                 trafficLightStatus = false,
@@ -216,12 +219,12 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
 
         //上报
         tvCollectReport.setOnClickListener {
-            GlobalScope.launch{
+            GlobalScope.launch {
                 val uploadResult = presenter.upload(mutableMapOf<String, String>().also { itx ->
-                    itx["carLicense"] = AppConfigInfo.plateNumber?:"" //车牌号
-                    itx["filename"] = recordFileName?:"" //bag包文件地址
+                    itx["carLicense"] = AppConfigInfo.plateNumber ?: "" //车牌号
+                    itx["filename"] = recordFileName ?: "" //bag包文件地址
                     itx["filesize"] = "0" //bag包文件大小
-                    itx["key"] = recordKey?:"" //key
+                    itx["key"] = recordKey ?: "" //key
                     itx["reason"] = collectReason //采集原因
                     itx["duration"] = "20" //采集时长，固定为20S
                     itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
@@ -229,7 +232,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
                     itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
                     itx["userRole"] = "" //采集者角色
                     itx["audioUrl"] = "" //音频COS地址
-                    itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
+                    itx["mapVersion"] = BadCaseConfig.dockerVersion ?: "" //工控机版本
                     itx["eyeVersion"] = AppUtils.getAppVersionName() //鹰眼版本
                     itx["coordinate"] = "latitude:${latitude};longitude:${longitude}" //坐标
 
@@ -266,23 +269,29 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
     }
 
 
-
     override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
         CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel")
-        ThreadUtils.runOnUiThread{
-            if(recordKey==null){
+        ThreadUtils.runOnUiThread {
+            if (recordKey == null) {
                 recordKey = recordPanel.key.toString()
                 BadCaseConfig.recordKeyList.add(recordPanel.key)
             }
-            if(recordFileName==null){
+            if (recordFileName == null) {
                 recordFileName = recordPanel.filename
             }
         }
 
     }
 
-    private fun setRadioButtonStatus(largeCarStatus: Boolean,trafficLightStatus: Boolean,waterStatus: Boolean,
-                                     constructionStatus: Boolean,accidentStatus: Boolean,rainStatus: Boolean,nightTrafficStatus: Boolean){
+    private fun setRadioButtonStatus(
+        largeCarStatus: Boolean,
+        trafficLightStatus: Boolean,
+        waterStatus: Boolean,
+        constructionStatus: Boolean,
+        accidentStatus: Boolean,
+        rainStatus: Boolean,
+        nightTrafficStatus: Boolean
+    ) {
         rbLargeCar.isChecked = largeCarStatus
         rbTrafficLight.isChecked = trafficLightStatus
         rbWater.isChecked = waterStatus
@@ -332,7 +341,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
         //注销采集结果回调监听
         CallerAutopilotRecordListenerManager.removeListener(this.hashCode().toString())
         // 移除 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.removeListener(this.hashCode().toString())
+        CallerChassisLocationWGS84ListenerManager.removeListener(this.hashCode().toString())
         if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
     }
 
@@ -344,9 +353,9 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
-        latitude = gnssInfo?.latitude
-        longitude = gnssInfo?.longitude
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
+        latitude = gnssInfo.latitude
+        longitude = gnssInfo.longitude
     }
 
 }

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

@@ -8,10 +8,10 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.GridLayoutManager
-import com.mogo.eagle.core.data.badcase.RecordTypeEntity
-import com.mogo.eagle.core.data.badcase.TopicEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordTypeEntity
+import com.mogo.eagle.core.data.deva.badcase.TopicEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -20,7 +20,6 @@ import com.zhjt.mogo_core_function_devatools.badcase.biz.adapter.RecordTemplateA
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import kotlinx.android.synthetic.main.layout_badcase_config.view.*
 import mogo.telematics.pad.MessagePad
-import java.lang.Exception
 
 
 /**
@@ -206,7 +205,7 @@ internal class BadCaseConfigView @JvmOverloads constructor(
         super.onAttachedToWindow()
         CallerAutopilotRecordListenerManager.addListener(TAG, this)
         //获取数据采集录制模式配置列表
-        CallerAutoPilotManager.getBadCaseConfig(0, 0, listOf())
+        CallerAutoPilotControlManager.getBadCaseConfig(0, 0, listOf())
         recordTypesList.add(RecordTypeEntity(0,"自定义", arrayListOf()))
     }
 

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

@@ -12,12 +12,12 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import bag_manager.BagManagerOuterClass
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
-import com.mogo.eagle.core.data.badcase.SubBagEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.SubBagEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -28,7 +28,6 @@ import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig.bagMan
 import com.zhjt.mogo_core_function_devatools.badcase.record.Audition
 import kotlinx.android.synthetic.main.layout_badcase_manager.view.*
 import java.util.*
-import kotlin.collections.ArrayList
 
 
 /**
@@ -118,7 +117,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                 bagManagerEntity.reqType = 3
                 bagManagerEntity.keyReq = bagManagerList[0].key
                 Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq)
-                CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
 
                 bagUploadDialog = BagUploadDialog(context)
                 bagUploadDialog?.setListener { //删除选择,取消上传
@@ -148,7 +147,7 @@ class BadCaseManagerView @JvmOverloads constructor(
             if(bagManagerList.size>0){
                 bagManagerEntity.reqType = 4
                 bagManagerEntity.keyReq = bagManagerList[0].key
-                CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
             }else{
                 ToastUtils.showShort("请先选择要删除的Bag包")
             }
@@ -197,7 +196,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                 bagManagerEntity.reqType = 5
                 bagManagerEntity.keyReq = key
                 bagManagerEntity.descReq = description
-                CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
             }
 
             override fun bagAudio(key: Long, audioUrl: String) {
@@ -369,7 +368,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                             bagManagerEntity.reqType = 3
                             bagManagerEntity.keyReq = bagManagerList[0].key
                             Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq)
-                            CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                            CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
                         }
                     }
                 }
@@ -426,7 +425,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                     if(titleBagInfo.itemType == 1){
                         val bagIterator = bagManagerEntity.bagsInfoResp.iterator()
                         var hasBag = false
-                        var bagBagInfo: BagInfoEntity ?= null
+                        var bagBagInfo: BagInfoEntity?= null
                         while(bagIterator.hasNext()){
                             bagBagInfo = bagIterator.next()
                             if(bagBagInfo.itemType == 0){
@@ -462,7 +461,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                     //继续执行删除命令
                     bagManagerEntity.reqType = 4
                     bagManagerEntity.keyReq = bagManagerList[0].key
-                    CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                    CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
                 }
 
                 //更新列表
@@ -496,7 +495,7 @@ class BadCaseManagerView @JvmOverloads constructor(
         CallerAutopilotRecordListenerManager.addListener(TAG, this)
         bagManagerEntity.reqType = 2
         //遍历所有bag
-        CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+        CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
     }
 
     override fun onDetachedFromWindow() {
@@ -514,7 +513,7 @@ class BadCaseManagerView @JvmOverloads constructor(
             UiThreadHandler.post {
                 //获取空间使用信息,每隔1分钟获取一次
                 bagManagerEntity.reqType = 1
-                CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
             }
         }
     }

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

@@ -1,6 +1,5 @@
 package com.zhjt.mogo_core_function_devatools.badcase.biz
 
-import android.util.Log
 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

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

@@ -9,9 +9,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.data.badcase.RecordCaseEntity;
+import com.mogo.eagle.core.data.deva.badcase.RecordCaseEntity;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.zhjt.mogo_core_function_devatools.R;
@@ -78,7 +78,7 @@ public class CaseListDialog extends Dialog implements IMoGoAutopilotRecordListen
         super.onAttachedToWindow();
         CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
         //获取数据采集录制模式配置列表
-        CallerAutoPilotManager.INSTANCE.getBadCaseConfig(0, 0,new ArrayList<>());
+        CallerAutoPilotControlManager.INSTANCE.getBadCaseConfig(0, 0,new ArrayList<>());
     }
 
     @Override

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

@@ -14,10 +14,10 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.data.badcase.RecordTypeEntity;
-import com.mogo.eagle.core.data.badcase.TopicEntity;
+import com.mogo.eagle.core.data.deva.badcase.RecordTypeEntity;
+import com.mogo.eagle.core.data.deva.badcase.TopicEntity;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
@@ -70,10 +70,10 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
         init();
         initEvent();
         //获取所有Topic
-        CallerAutoPilotManager.INSTANCE.getBadCaseConfig(1, 0, new ArrayList<>());
-        if(recordType!=null){
+        CallerAutoPilotControlManager.INSTANCE.getBadCaseConfig(1, 0, new ArrayList<>());
+        if (recordType != null) {
             tvCaseName.setText(recordType.getDesc());
-            if(recordType.getTopicsList().size()>0){
+            if (recordType.getTopicsList().size() > 0) {
                 topicListAdapter.setData(recordType.getTopicsList());
                 topicListAdapter.notifyDataSetChanged();
             }
@@ -91,8 +91,8 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
     }
 
-    public void setData(RecordTypeEntity recordTypeEntity){
-        if(recordTypeEntity!=null){
+    public void setData(RecordTypeEntity recordTypeEntity) {
+        if (recordTypeEntity != null) {
             recordType = recordTypeEntity;
         }
     }
@@ -109,9 +109,9 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
         rvTopicList.setLayoutManager(linearLayoutManager);
         topicListAdapter = new TopicListAdapter();
         topicListAdapter.setListener((topicName, clicked) -> {
-            if(clicked){
+            if (clicked) {
                 addTopicList.add(topicName);
-            }else{
+            } else {
                 addTopicList.remove(topicName);
             }
         });
@@ -133,15 +133,15 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
             @Override
             public void afterTextChanged(Editable s) {
                 searchStr = s.toString();
-                if(searchStr!=null && searchStr.length()>0){
+                if (searchStr != null && searchStr.length() > 0) {
                     ivSearch.setImageDrawable(getContext().getDrawable(R.drawable.icon_bad_case_delect));
                 } else {
                     ivSearch.setImageDrawable(getContext().getDrawable(R.drawable.icon_bad_case_search));
                 }
-                if(searchStr!=null && searchStr.length()>0){
+                if (searchStr != null && searchStr.length() > 0) {
                     searchTopicList.clear();
-                    for(int index=0;index<recordType.getTopicsList().size();index++){
-                        if(recordType.getTopicsList().get(index).getTopicName().contains(searchStr)){
+                    for (int index = 0; index < recordType.getTopicsList().size(); index++) {
+                        if (recordType.getTopicsList().get(index).getTopicName().contains(searchStr)) {
                             searchTopicList.add(recordType.getTopicsList().get(index));
                         }
                     }
@@ -152,7 +152,7 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
         });
 
         ivSearch.setOnClickListener(v -> {
-            if(searchStr!=null && searchStr.length()>0){
+            if (searchStr != null && searchStr.length() > 0) {
                 etSearch.setText("");
                 ivSearch.setImageDrawable(getContext().getDrawable(R.drawable.icon_bad_case_search));
                 topicListAdapter.setData(recordType.getTopicsList());
@@ -160,11 +160,11 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
             }
         });
         tvSave.setOnClickListener(v -> {
-            if(recordType!=null){
-                Boolean success=CallerAutoPilotManager.INSTANCE.getBadCaseConfig(2,recordType.getId(),addTopicList);
-                if(Boolean.TRUE.equals(success)){
+            if (recordType != null) {
+                Boolean success = CallerAutoPilotControlManager.INSTANCE.getBadCaseConfig(2, recordType.getId(), addTopicList);
+                if (Boolean.TRUE.equals(success)) {
                     ToastUtils.showShort("Topic设置成功");
-                    if(recordType.getId() == 0){
+                    if (recordType.getId() == 0) {
                         //自定义Topic
                         BadCaseConfig.customTopicList.clear();
                         BadCaseConfig.customTopicList.addAll(addTopicList);
@@ -172,7 +172,7 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
                     addTopicList.clear();
                     recordType.getTopicsList().removeAll(allTopicList);
                     dismiss();
-                }else{
+                } else {
                     ToastUtils.showShort("Topic设置失败");
                 }
             }

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

@@ -13,15 +13,16 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
-import com.mogo.eagle.core.data.badcase.RecordCaseEntity
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordCaseEntity
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 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
@@ -42,7 +43,6 @@ import mogo.telematics.pad.MessagePad
 import record_cache.RecordPanelOuterClass
 import java.io.File
 import java.lang.StringBuilder
-import java.lang.reflect.Field
 import java.util.*
 
 
@@ -52,7 +52,7 @@ import java.util.*
  * @since: 2022/7/13
  */
 class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchListener,
-    IMoGoAutopilotRecordListener, IMoGoAutopilotCarStateListener {
+    IMoGoAutopilotRecordListener, IMoGoChassisLocationWGS84Listener {
 
     companion object {
         const val TAG = "InitiativeBadCaseWindow"
@@ -143,7 +143,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         //采集结果回调监听
         CallerAutopilotRecordListenerManager.addListener(this.hashCode().toString(),this)
         // 添加 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.addListener(this.hashCode().toString(), this)
+        CallerChassisLocationWGS84ListenerManager.addListener(this.hashCode().toString(), this)
         viewAudioButton.setOnClickListener {
             audioStatus = !audioStatus
             setAudio(audioStatus)
@@ -314,7 +314,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                     bagManagerEntity.reqType = 5
                     bagManagerEntity.keyReq = it.toLong()
                     bagManagerEntity.descReq = descReqEntity
-                    CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                    CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
                 }
                 BadCaseConfig.windowNum--
                 clickListener?.closeWindow()
@@ -357,10 +357,10 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             mWindowManager!!.addView(mFloatLayout, mWindowParams)
             //开启录包
             if(recordCaseEntity!=null){
-                CallerAutoPilotManager.recordPackage(recordCaseEntity.caseId,Random(SystemClock.elapsedRealtime()).nextInt(),
+                CallerAutoPilotControlManager.recordPackage(recordCaseEntity.caseId,Random(SystemClock.elapsedRealtime()).nextInt(),
                     BadCaseConfig.totalDuration, BadCaseConfig.previousDuration,recordCaseEntity.topicList)
             }else{
-                CallerAutoPilotManager.recordPackage(BadCaseConfig.type,Random(SystemClock.elapsedRealtime()).nextInt(),
+                CallerAutoPilotControlManager.recordPackage(BadCaseConfig.type,Random(SystemClock.elapsedRealtime()).nextInt(),
                     BadCaseConfig.totalDuration, BadCaseConfig.previousDuration)
             }
         }
@@ -386,7 +386,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         //注销采集结果回调监听
         CallerAutopilotRecordListenerManager.removeListener(this.hashCode().toString())
         // 移除 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.removeListener(this.hashCode().toString())
+        CallerChassisLocationWGS84ListenerManager.removeListener(this.hashCode().toString())
         if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
     }
 
@@ -412,9 +412,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
-        latitude = gnssInfo?.latitude
-        longitude = gnssInfo?.longitude
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
+        latitude = gnssInfo.latitude
+        longitude = gnssInfo.longitude
     }
 
 }

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

@@ -6,8 +6,9 @@ import android.graphics.Color
 import android.graphics.PixelFormat
 import android.os.CountDownTimer
 import android.os.Handler
+import android.os.Parcel
+import android.os.Parcelable
 import android.util.DisplayMetrics
-import android.util.Log
 import android.view.*
 import android.widget.CheckBox
 import android.widget.CompoundButton
@@ -16,14 +17,14 @@ 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.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
-import com.mogo.eagle.core.data.msgbox.MsgCategory
 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.CallerAutoPilotManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 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
@@ -42,7 +43,6 @@ import com.zhidao.loglib.upload.UploadManager
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
 import java.io.File
-import java.lang.reflect.Field
 
 /**
  * @author XuXinChao
@@ -50,7 +50,7 @@ import java.lang.reflect.Field
  * @since: 2022/7/17
  */
 class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListener,
-    IMoGoAutopilotCarStateListener, CompoundButton.OnCheckedChangeListener {
+    IMoGoChassisLocationWGS84Listener, CompoundButton.OnCheckedChangeListener {
 
     companion object {
         const val TAG = "PassiveBadCaseWindow"
@@ -123,7 +123,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         tvPassiveTime.text = "时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
         tvPassiveIdentity.text = "身份：${BadCaseConfig.identity}"
         // 添加 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.addListener(TAG, this)
+        CallerChassisLocationWGS84ListenerManager.addListener(TAG, this)
         viewAudioButton.setOnClickListener {
             audioStatus = !audioStatus
             setAudio(audioStatus)
@@ -277,7 +277,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                     bagManagerEntity.reqType = 5
                     bagManagerEntity.keyReq = it.toLong()
                     bagManagerEntity.descReq = descReqEntity
-                    CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity)
+                    CallerAutoPilotControlManager.sendBagManagerCmd(bagManagerEntity)
                 }
                 BadCaseConfig.windowNum--
                 clickListener?.closeWindow()
@@ -369,7 +369,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
 
     fun hideFloatWindow() {
         // 移除 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.removeListener(TAG)
+        CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
         if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
     }
 
@@ -388,9 +388,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
-        latitude = gnssInfo?.latitude
-        longitude = gnssInfo?.longitude
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
+        latitude = gnssInfo.latitude
+        longitude = gnssInfo.longitude
     }
 
 }

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

@@ -10,8 +10,8 @@ import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
 import com.zhjt.mogo_core_function_devatools.R
 import java.text.DecimalFormat
 
@@ -163,7 +163,7 @@ class BagManagerListAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     interface BagClickListener{
         //选择Bag包
-        fun onClick(bagInfoEntity: BagInfoEntity,isChecked: Boolean)
+        fun onClick(bagInfoEntity: BagInfoEntity, isChecked: Boolean)
         //上报BI平台
         fun uploadBI(bagInfoEntity: BagInfoEntity)
         //编辑Bag包描述信息

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

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.badcase.RecordCaseEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordCaseEntity
 import com.zhjt.mogo_core_function_devatools.R
 
 /**

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

@@ -5,25 +5,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.badcase.RecordTypeEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordTypeEntity
 import com.zhjt.mogo_core_function_devatools.R
-import com.zhjt.mogo_core_function_devatools.badcase.biz.BadCaseConfigView
 
 /**
  * @author XuXinChao
  * @description 录制模板清单列表适配器
  * @since: 2022/10/19
  */
-class RecordTemplateAdapter : RecyclerView.Adapter<RecordTemplateAdapter.RecordTemplateHolder>(){
+class RecordTemplateAdapter : RecyclerView.Adapter<RecordTemplateAdapter.RecordTemplateHolder>() {
 
-    private var data:List<RecordTypeEntity>? = null
+    private var data: List<RecordTypeEntity>? = null
     private var clickTemplateListener: ClickTemplateListener? = null
 
-    fun setData( data: List<RecordTypeEntity>?){
+    fun setData(data: List<RecordTypeEntity>?) {
         this.data = data
     }
 
-    fun setListener(listener: ClickTemplateListener){
+    fun setListener(listener: ClickTemplateListener) {
         clickTemplateListener = listener
     }
 
@@ -34,7 +33,7 @@ class RecordTemplateAdapter : RecyclerView.Adapter<RecordTemplateAdapter.RecordT
     }
 
     override fun onBindViewHolder(holder: RecordTemplateHolder, position: Int) {
-        data?.let {recordTypeEntity->
+        data?.let { recordTypeEntity ->
             holder.caseName.text = recordTypeEntity[position].desc
             holder.caseName.setOnClickListener {
                 clickTemplateListener?.onClick(recordTypeEntity[position])
@@ -44,11 +43,11 @@ class RecordTemplateAdapter : RecyclerView.Adapter<RecordTemplateAdapter.RecordT
 
     override fun getItemCount() = data?.size ?: 0
 
-    class RecordTemplateHolder(itemView: View): RecyclerView.ViewHolder(itemView){
+    class RecordTemplateHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         var caseName: TextView = itemView.findViewById(R.id.caseName)
     }
 
-    interface ClickTemplateListener{
+    interface ClickTemplateListener {
         fun onClick(recordTypeEntity: RecordTypeEntity)
     }
 

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

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.badcase.TopicEntity
+import com.mogo.eagle.core.data.deva.badcase.TopicEntity
 import com.zhjt.mogo_core_function_devatools.R
 
 /**
@@ -61,7 +61,7 @@ class TopicListAdapter: RecyclerView.Adapter<TopicListAdapter.TopicListHolder>()
         }
     }
 
-    private fun moveItem(topicEntity: TopicEntity,removePos: Int,insertedPos: Int){
+    private fun moveItem(topicEntity: TopicEntity, removePos: Int, insertedPos: Int){
         data?.remove(topicEntity)
         notifyItemRemoved(removePos)
         notifyItemRangeChanged(removePos, itemCount - removePos)

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

@@ -1,6 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.badcase.consts
 
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
 
 /**
  * @author XuXinChao

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

@@ -1,20 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.badcase.consts
-
-import com.mogo.commons.debug.DebugConfig
-
-internal object BadCaseHost {
-
-    private const val HOST_DEV = "http://dzt-test.zhidaozhixing.com/"
-    private const val HOST_RELEASE = "http://dzt.zhidaozhixing.com/"
-
-    fun getHost(): String{
-        return when (DebugConfig.getNetMode()) {
-            DebugConfig.NET_MODE_DEV -> HOST_DEV
-            DebugConfig.NET_MODE_QA -> HOST_DEV
-            DebugConfig.NET_MODE_DEMO -> HOST_RELEASE
-            DebugConfig.NET_MODE_RELEASE -> HOST_RELEASE
-            else -> HOST_RELEASE
-        }
-    }
-
-}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/mp3/Mp3EncodeThread.java

@@ -12,11 +12,10 @@ import java.util.List;
 
 
 public class Mp3EncodeThread extends Thread {
-    private static final String TAG = Mp3EncodeThread.class.getSimpleName();
-    private List<ChangeBuffer> cacheBufferList = Collections.synchronizedList(new LinkedList<ChangeBuffer>());
-    private File file;
+    private final List<ChangeBuffer> cacheBufferList = Collections.synchronizedList(new LinkedList<>());
+    private final File file;
+    private final byte[] mp3Buffer;
     private FileOutputStream os;
-    private byte[] mp3Buffer;
     private EncordFinishListener encordFinishListener;
 
     /**
@@ -69,7 +68,7 @@ public class Mp3EncodeThread extends Thread {
 
     private ChangeBuffer next() {
         for (; ; ) {
-            if (cacheBufferList == null || cacheBufferList.size() == 0) {
+            if (cacheBufferList.size() == 0) {
                 try {
                     if (isOver) {
                         finish();
@@ -122,8 +121,8 @@ public class Mp3EncodeThread extends Thread {
     }
 
     public static class ChangeBuffer {
-        private short[] rawData;
-        private int readSize;
+        private final short[] rawData;
+        private final int readSize;
 
         public ChangeBuffer(short[] rawData, int readSize) {
             this.rawData = rawData.clone();

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

@@ -1,12 +1,12 @@
 package com.zhjt.mogo_core_function_devatools.badcase.repository.net
 
+import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
 import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.BadCaseApi
 import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult
-import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseHost
 import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.coroutineContext
@@ -16,7 +16,7 @@ internal class BadCaseNetModel {
     suspend fun get(channel: String?, result: MutableList<Reason>, pageNo: Int) {
         try {
             MoGoRetrofitFactory
-                .getInstance(BadCaseHost.getHost())
+                .getInstance(HostConst.getEagleHost())
                 .create(BadCaseApi::class.java)
                 .get(channel ?: "", pageNo)
                 .takeIf {
@@ -42,7 +42,7 @@ internal class BadCaseNetModel {
     suspend fun upload(map: Map<String, String>): UploadResult? = try {
         CallerLogger.d("$M_DEVA${BadCaseManager.TAG}", "upload_params:$map")
         MoGoRetrofitFactory
-            .getInstance(BadCaseHost.getHost())
+            .getInstance(HostConst.getEagleHost() )
             .create(BadCaseApi::class.java)
             .post(map)
             .takeIf {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt

@@ -8,9 +8,9 @@ import retrofit2.http.*
 internal interface BadCaseApi {
 
     @FormUrlEncoded
-    @POST("/yycp-vehicle-management-service/tool/badcase/add/v2")
+    @POST("eagle-eye-dns/yycp-vehicle-management-service/tool/badcase/add/v2")
     suspend fun post(@FieldMap map: Map<String, String>): Response<UploadResult>
 
-    @GET("/yycp-vehicle-management-service/tool/badcase/reasons")
+    @GET("eagle-eye-dns/yycp-vehicle-management-service/tool/badcase/reasons")
     suspend fun get(@Query("channel", encoded = true) channel: String, @Query("pageNo") pageNo: Int): Response<BadCaseResponse>
 }

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

@@ -3,13 +3,13 @@ package com.zhjt.mogo_core_function_devatools.badcase.repository.store
 import androidx.datastore.core.DataStore
 import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.Serializer
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 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.util.Utils
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
-import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import com.zhjt.mogo_core_function_devatools.badcase.generated.BadCauses
 import com.zhjt.mogo_core_function_devatools.badcase.generated.Cause
+import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.firstOrNull
@@ -54,7 +54,12 @@ internal object BadCaseStore {
 
 
     private val store: DataStore<BadCauses> by lazy {
-        DataStoreFactory.create(serializer = serializer) { File(Utils.getApp().filesDir, "bad_cases.pb") }
+        DataStoreFactory.create(serializer = serializer) {
+            File(
+                Utils.getApp().filesDir,
+                "bad_cases.pb"
+            )
+        }
     }
 
     suspend fun updateRecords(reasons: List<Reason>, isDriven: Boolean): BadCauses {
@@ -99,7 +104,10 @@ internal object BadCaseStore {
 
     @OptIn(FlowPreview::class)
     suspend fun records(isDriven: Boolean): List<Reason> {
-        CallerLogger.d("$M_DEVA${BadCaseManager.TAG}", "-- load cases from pb -- isDriven: $isDriven")
+        CallerLogger.d(
+            "$M_DEVA${BadCaseManager.TAG}",
+            "-- load cases from pb -- isDriven: $isDriven"
+        )
         val causes = store.data.firstOrNull()
         CallerLogger.d("$M_DEVA${BadCaseManager.TAG}", "-- load cases from pb -- result: $causes")
         val list = if (isDriven) causes?.drivenDataList else causes?.drivingDataList

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarApiService.java

@@ -0,0 +1,36 @@
+package com.zhjt.mogo_core_function_devatools.binding;
+
+import com.mogo.eagle.core.data.deva.bindingcar.BindingCarInfo;
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo;
+
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+import retrofit2.http.Body;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+
+/**
+ * @author lixiaopeng
+ * @description 绑定车辆
+ * @since: 10/28/21
+ */
+public interface BindingCarApiService {
+    /**
+     * 获取绑定车辆的信息
+     *
+     * @return {@link BindingCarInfo}
+     */
+    @Headers("Content-Type:application/json;charset=UTF-8")
+    @POST("eagleEye-mis/cmdbapi/pad/selectPadByMac")
+    Observable<BindingCarInfo> getBindingCarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody);
+
+    /**
+     * 绑定和修改绑定车机
+     *
+     * @return {@link ModifyBindingcarInfo}
+     */
+    @Headers("Content-Type:application/json;charset=UTF-8")
+    @POST("eagleEye-mis/cmdbapi/pad/v2/updatePadByMac")
+    Observable<ModifyBindingcarInfo> modifyBindingCarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody);
+
+}

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

@@ -0,0 +1,180 @@
+package com.zhjt.mogo_core_function_devatools.binding
+
+import android.content.Context
+import android.text.TextUtils
+import com.elegant.utils.UiThreadHandler
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.app.AppConfigInfo.role
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.data.obu.MogoObuConst
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger
+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.storage.SharedPrefsMgr
+import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
+import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
+import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeAppNetWorkManager
+import mogo.telematics.pad.MessagePad
+
+
+class BindingCarManager : IMoGoAutopilotCarConfigListener {
+
+    companion object {
+        private const val TAG = "BindingCarManager"
+
+        val bindingCarManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+            BindingCarManager()
+        }
+    }
+
+    private var mContext: Context? = null
+
+    @Volatile
+    private var mAddress: String? = null
+
+    @Volatile
+    private var mWidevineIDWithMd5 //google 数字版权
+            : String? = null
+
+    fun init(context: Context) {
+        mContext = context
+        SharedPrefsMgr.getInstance(mContext!!).putLong("typeDriver", 0)
+        SharedPrefsMgr.getInstance(mContext!!).putLong("typePassenger", 0)
+        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
+        ipcUpgradeManager.init(context)
+        UiThreadHandler.postDelayed({ queryAppUpgrade() }, 10_000)
+    }
+
+    fun onDestroy() {
+        CallerAutopilotCarConfigListenerManager.removeListener(TAG)
+        ipcUpgradeManager.destroy()
+    }
+
+    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
+        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) {
+            getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
+        }
+    }
+
+    /**
+     * 获取macaddress,每次连接请求一次
+     *
+     * @param macAddress
+     */
+    fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) {
+        CallerLogger.d(
+            "$M_DEVA$TAG",
+            "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5"
+        )
+        mAddress = macAddress
+        mWidevineIDWithMd5 = widevineIDWithMd5
+        if (screenType == 1) { //司机屏
+            driverScreen(macAddress, widevineIDWithMd5)
+        } else if (screenType == 2) { //乘客屏
+            passengerScreen(macAddress, widevineIDWithMd5)
+        }
+    }
+
+    /**
+     * 确认升级工控机docker版本
+     *
+     * @param images    docker列表
+     * @param padSn     SN
+     * @param releaseId 任务ID
+     */
+    fun upgradeConfirm(images: List<String>, padSn: String, releaseId: String) {
+        ipcUpgradeManager.upgradeConfirm(images, padSn, releaseId)
+    }
+
+    /**
+     * 获取新工控机docker版本
+     *
+     * @param padSn         SN
+     * @param dockerVersion 当前工控机版本
+     */
+    fun queryContainers(padSn: String, dockerVersion: String) {
+        ipcUpgradeManager.queryContainers(padSn, dockerVersion)
+    }
+
+    fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
+        BindingCarNetWorkManager.instance.modifyBindingCar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType)
+    }
+
+    private fun driverScreen(macAddress: String, widevineIDWithMd5: String) {
+        val currentHour = System.currentTimeMillis() / (1000 * 60)
+        val oldHour = SharedPrefsMgr.getInstance(
+            mContext!!
+        ).getLong("typeDriver", 0)
+        //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
+        if (HmiBuildConfig.isShowSnBindingView) {
+            if (currentHour - oldHour > 1) {
+                SharedPrefsMgr.getInstance(mContext!!)
+                    .putLong("typeDriver", System.currentTimeMillis() / (1000 * 60))
+                BindingCarNetWorkManager.instance
+                    .getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
+            }
+        }
+    }
+
+    private fun passengerScreen(macAddress: String, widevineIDWithMd5: String) {
+        val currentHour = System.currentTimeMillis() / (1000 * 60)
+        val oldHour = SharedPrefsMgr.getInstance(
+            mContext!!
+        ).getLong("typePassenger", 0)
+        //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
+        if (HmiBuildConfig.isShowSnBindingView) {
+            if (currentHour - oldHour > 1) {
+                SharedPrefsMgr.getInstance(mContext!!)
+                    .putLong("typePassenger", System.currentTimeMillis() / (1000 * 60))
+                BindingCarNetWorkManager.instance
+                    .getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
+            }
+        }
+    }//乘客屏//司机屏
+
+    /**
+     * 以后可能废弃
+     *
+     * @return
+     */
+    private val screenType: Int
+        get() {
+            var screenType = -1
+            if (isDriver(FunctionBuildConfig.appIdentityMode)) {
+                screenType = 1 //司机屏
+            }
+            if (isPassenger(FunctionBuildConfig.appIdentityMode)) {
+                screenType = 2 //乘客屏
+            }
+            return screenType
+        }
+
+    /**
+     * 查询app是否需要升级
+     */
+    fun queryAppUpgrade() {
+        UpgradeAppNetWorkManager.getInstance()
+            .getAppUpgradeInfo(mContext, mAddress, role.toString() + "")
+
+    }
+
+    /**
+     * 司机屏 处理obu升级即可,乘客屏不需要处理
+     * obu的升级,只需要司机屏连接
+     */
+    fun queryObuUpgrade(obuVersionName: String) {
+        if (screenType == 1) {
+            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
+            ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, obuVersionName)
+        }
+    }
+
+}
+

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

@@ -0,0 +1,191 @@
+package com.zhjt.mogo_core_function_devatools.binding
+
+import android.content.Context
+import com.mogo.commons.constants.HostConst
+import com.mogo.commons.constants.SharedPrefsConstants
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.deva.bindingcar.BindingCarInfo
+import com.mogo.eagle.core.data.deva.bindingcar.BindingCarRequest
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.config.HdMapBuildConfig
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBindingCarDialog
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showModifyBindingCarDialog
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.network.utils.GsonUtil
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.zhjt.mogo_core_function_devatools.R
+import io.reactivex.Observer
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+
+/**
+ * @author lixiaopeng
+ * @description 绑定车机网络请求
+ * @since: 3/25/22
+ */
+class BindingCarNetWorkManager private constructor() {
+
+    companion object {
+        private const val TAG = "BindingCarNetManager"
+        val instance: BindingCarNetWorkManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+            BindingCarNetWorkManager()
+        }
+    }
+
+    private val mBindingCarApiService: BindingCarApiService =
+        MoGoRetrofitFactory.getInstance(HostConst.getHost())
+            .create(BindingCarApiService::class.java)
+
+    /**
+     * 获取绑定的车辆信息
+     *
+     * @param macAddress mac地址
+     */
+    fun getBindingCarInfo(
+        context: Context,
+        macAddress: String?,
+        widevineIDWithMd5: String?,
+        screenType: Int
+    ) {
+        val request = BindingCarRequest(
+            macAddress,
+            widevineIDWithMd5,
+            screenType
+        )
+        val requestBody = RequestBody.create(
+            MediaType.get("application/json;charset=UTF-8"),
+            GsonUtil.jsonFromObject(request)
+        )
+        mBindingCarApiService.getBindingCarInfo(requestBody)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Observer<BindingCarInfo> {
+                override fun onSubscribe(d: Disposable) {}
+                override fun onNext(info: BindingCarInfo) {
+                    if (info != null && info.getData() != null) {
+                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString() + "---getDefaultId() : ${getDefaultId()}")
+                        SharedPrefsMgr.getInstance(context).putString(
+                            SharedPrefsConstants.CAR_INFO,
+                            GsonUtils.toJson(info.getData())
+                        )
+                        when (info.getData().compare) {
+                            "0" -> showBindingCarDialog()
+                            "3" -> showModifyBindingCarDialog()
+                            "null" -> TipToast.shortTip("当前工控机没有入库")
+                        }
+                        updateCarVrIconRes(info.getData().brandId)
+                    } else {
+                        SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
+                        e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ---getDefaultId() : ${getDefaultId()} ")
+                    }
+                }
+
+                override fun onError(e: Throwable) {
+                    SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
+                    e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message + "---getDefaultId() : ${getDefaultId()}")
+                }
+
+                override fun onComplete() {}
+            })
+    }
+
+    /**
+     * 绑定和修改绑定车辆
+     * mac: 48:b0:2d:3a:9c:19
+     */
+    fun modifyBindingCar(
+        context: Context,
+        macAddress: String?,
+        widevineIDWithMd5: String?,
+        callBack: (ModifyBindingcarInfo) -> Unit,
+        screenType: Int
+    ) {
+//        String macAddress1 = "48:b0:2d:4d:33:40";
+//        String sn = "X2020220417KA94QIN";
+        val request = BindingCarRequest(
+            macAddress,
+            widevineIDWithMd5,
+            screenType
+        )
+        val requestBody = RequestBody.create(
+            MediaType.get("application/json;charset=UTF-8"),
+            GsonUtil.jsonFromObject(request)
+        )
+        mBindingCarApiService.modifyBindingCarInfo(requestBody)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Observer<ModifyBindingcarInfo> {
+                override fun onSubscribe(d: Disposable) {}
+                override fun onNext(info: ModifyBindingcarInfo) {
+                    if (info != null) {
+                        callBack.invoke(info)
+                        d(SceneConstant.M_BINDING + TAG, "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString())
+                        updateCarVrIconRes(info.data.brandId)
+                    }
+                }
+
+                override fun onError(e: Throwable) {
+                    e(SceneConstant.M_BINDING + TAG, "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message)
+                }
+
+                override fun onComplete() {}
+            })
+    }
+
+    private fun updateCarVrIconRes(brandId: String?) {
+        d(SceneConstant.M_BINDING + TAG, "CarModelChange : ${DebugConfig.isCarModelChange()}")
+        if(!DebugConfig.isCarModelChange()){
+            return
+        }
+        if (brandId == null || brandId.isEmpty()) {
+            return
+        }
+        d(SceneConstant.M_BINDING + TAG, "getDefaultId() : ${getDefaultId()} ---- brandId = $brandId")
+        if (getDefaultId() == brandId) {
+            return
+        }
+        d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId")
+        when (brandId) {
+            "1" -> { //东风
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
+            }
+            "2" -> { //红旗
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.hq_h9)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9
+            }
+            "3" -> { //金旅
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+            }
+            "4" -> { //开沃
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+            }
+            "5" -> { //福田
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
+            }
+        }
+    }
+
+    private fun getDefaultId(): String {
+        return when (HdMapBuildConfig.currentCarVrIconRes) {
+            R.raw.chuzuche -> "1"
+            R.raw.xiaobache -> "3"
+            R.raw.xiaobache -> "4"
+            R.raw.huanwei -> "5"
+            else -> "1"
+        }
+    }
+
+}

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

@@ -2,11 +2,12 @@ package com.zhjt.mogo_core_function_devatools.env
 
 import android.content.Context.MODE_PRIVATE
 import android.os.Process
-import com.mogo.commons.constants.*
-import com.mogo.commons.debug.*
-import com.mogo.eagle.core.function.call.map.*
-import com.mogo.eagle.core.utilcode.mogo.storage.*
-import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.commons.constants.SharedPrefsConstants
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.EnvConfig
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.Utils
 
 
 object EnvChangeManager {
@@ -33,7 +34,7 @@ object EnvChangeManager {
     fun getCityName(): String {
         val cache = getConfig()
         return if (cache == null) {
-            when(CallerMapLocationListenerManager.getCurrentLocation()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
+            when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
                 "010" -> "北京"
                 "0734" -> "衡阳"
                 else -> "未知"
@@ -47,6 +48,11 @@ object EnvChangeManager {
         }
     }
 
+    fun getConfigNetMode(): Int {
+        val cache = getConfig()
+        return cache?.second ?: -1
+    }
+
     fun getNetMode(): String {
         val cache = getConfig()
         return if (cache == null) {
@@ -88,6 +94,4 @@ object EnvChangeManager {
             if (it.first == "010") 116.397446 else 112.582654,
             if (it.first == "010") 39.909004 else 26.816478)
     }
-
-    data class EnvConfig(val cityCode: String, val netMode: Int, val lat: Double, val lon: Double)
 }

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

@@ -1,14 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.feedback.biz
-
-import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Feedback
-
-
-internal interface IFeedbackPresenter {
-
-   suspend fun loadFeedBacks(): List<Feedback>
-
-   suspend fun getBadCaseTaskId(): Int
-
-   suspend fun upload(params: Map<String, String>): UploadResult?
-}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/bean/Feedback.kt

@@ -1,28 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.feedback.biz.bean
-
-import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
-
-internal sealed class Feedback {
-
-    class BadCase(var remark: Remark, var reasons: List<Reason>): Feedback() {
-
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-            other as BadCase
-            if (reasons != other.reasons) return false
-            return true
-        }
-
-        override fun hashCode(): Int {
-            return reasons.hashCode()
-        }
-    }
-}
-
-/**
- * 记录文本编辑框的状态
- * @param text: 文件编辑框中输入的文字
- * @param cursorPos: 光标位置
- */
-data class Remark(var text: CharSequence = "", var cursorPos: Int = 0)

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/diff/FeedbackDiffCallback.kt

@@ -1,25 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.feedback.biz.diff
-
-import androidx.recyclerview.widget.DiffUtil
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Feedback
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Feedback.BadCase
-
-internal class FeedbackDiffCallback<T: Feedback>(private val oldData: List<T>?, private val newData: List<T>?): DiffUtil.Callback() {
-
-    override fun getOldListSize(): Int {
-        return oldData?.size ?: 0
-    }
-
-    override fun getNewListSize(): Int = newData?.size ?: 0
-
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean = oldData?.takeIf { it.size > oldItemPosition }?.equals(newData?.takeIf { it.size > newItemPosition }) ?: false
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        val oldItem = oldData?.get(oldItemPosition)
-        val newItem = newData?.get(newItemPosition)
-        if (oldItem == null || newItem == null) {
-            return false
-        }
-        return oldItem == newItem
-    }
-}

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

@@ -1,28 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.feedback.biz.impl
-
-import com.zhjt.mogo_core_function_devatools.badcase.biz.BadCasePresenter
-import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult
-import com.zhjt.mogo_core_function_devatools.feedback.biz.IFeedbackPresenter
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Feedback
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Feedback.BadCase
-import com.zhjt.mogo_core_function_devatools.feedback.biz.bean.Remark
-
-internal class FeedbackPresenter: IFeedbackPresenter {
-
-    private val badCase by lazy {
-        BadCasePresenter()
-    }
-
-    override suspend fun loadFeedBacks(): List<Feedback> = mutableListOf<Feedback>().also {
-        //添加BadCase数据
-        it += BadCase(Remark(), badCase.loadBadCases(false))
-    }
-
-    override suspend fun getBadCaseTaskId(): Int {
-        return badCase.getTaskId()
-    }
-
-    override suspend fun upload(params: Map<String, String>): UploadResult? {
-        return badCase.upload(params)
-    }
-}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/callback/IFeedbackCallback.kt

@@ -1,28 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.feedback.callback
-
-import android.view.View
-import android.widget.TextView
-import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason
-
-internal interface IFeedbackCallback {
-
-    /**
-     * 点击关闭弹窗按钮时回调
-     */
-    fun onClose(v: View)
-
-    /**
-     * BadCase某一条目被点击了
-     */
-    fun onBadCaseItemClicked(reason: Reason)
-
-    /**
-     * 点击开始录制
-     */
-    fun onStartBadCaseRecord(record: TextView)
-
-    /**
-     * 点击停止录制
-     */
-    fun onStopBadCaseRecord(record: TextView)
-}

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

@@ -0,0 +1,24 @@
+package com.zhjt.mogo_core_function_devatools.koom
+
+import android.app.Application
+import android.os.Build
+import com.kwai.koom.base.CommonConfig
+import com.kwai.koom.base.InitTask
+import com.kwai.koom.base.MonitorManager
+
+object KoomInitTask : InitTask {
+    override fun init(application: Application) {
+        val config = CommonConfig.Builder()
+            .setApplication(application) // Set application
+            .setDebugMode(false)
+            .setVersionNameInvoker { "1.0.0" } // Set version name, java leak feature use it
+            .setSdkVersionMatch(
+                Build.VERSION.SDK_INT <= 31 && Build.VERSION.SDK_INT
+                        >= Build.VERSION_CODES.LOLLIPOP
+            )  // Set if current sdk version is supported
+            .build()
+
+        MonitorManager.initCommonConfig(config)
+            .apply { onApplicationCreate() }
+    }
+}

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

@@ -15,7 +15,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FULL_LOG
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
 import com.mogo.eagle.core.function.api.map.deva.IMoGoMapDevaProvider
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -220,7 +220,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         Logger.init(LogLevel.DEBUG)
         MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = true
         MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = true
-        CallerAutoPilotManager.setEnableLog(true)
+        CallerAutoPilotControlManager.setEnableLog(true)
     }
 
     /**
@@ -230,7 +230,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         Logger.init(if (DebugConfig.isDebug()) LogLevel.DEBUG else LogLevel.OFF)
         MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false
         MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = false
-        CallerAutoPilotManager.setEnableLog(false)
+        CallerAutoPilotControlManager.setEnableLog(false)
     }
 
     override fun onError(errorCount: Int) {

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

@@ -7,21 +7,37 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import com.mogo.eagle.core.data.mofang.MfConstants
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateMfStatusView
+import android.view.KeyEvent
+import com.mogo.commons.context.ContextHolderUtil
+import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.data.deva.mofang.MfConstants
+import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorChangeLaneLeft
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorChangeLaneRight
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorSetAcceleratedSpeed
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorSetHorn
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager.invokeMoFangStatus
+import com.mogo.eagle.core.function.call.mofang.CallerMofangListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_F
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import java.util.*
 
 
 /**
  * 魔方连接状态和设备管理
  */
 @SuppressLint("StaticFieldLeak")
-class MoFangManager private constructor() {
+class MoFangManager private constructor() : IMoGoMoFangListener {
 
     companion object {
-        val INSTANCE: MoFangManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+        val moFangManager: MoFangManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
             MoFangManager()
         }
     }
@@ -31,6 +47,28 @@ class MoFangManager private constructor() {
     private lateinit var mBluetoothAdapter: BluetoothAdapter
     private var isMfConnect: Boolean = false //添加状态判断
 
+    private var startPressTime: Long = 0 //开始按键时间
+    private var isPressEnd = false //按键是否结束
+    @Volatile
+    private var isCombinationKey = 0 //是否是组合按键 1单击，2长按，3组合
+    private var pressADownTime: Long = 0
+    private var pressAUpTime: Long = 0
+    private var pressBDownTime: Long = 0
+    private var pressBUpTime: Long = 0
+    private var pressCDownTime: Long = 0
+    private var pressCUpTime: Long = 0
+    private var pressDDownTime: Long = 0
+    private var pressDUpTime: Long = 0
+    private var pressEDownTime: Long = 0
+    private var pressEUpTime: Long = 0
+
+    private val clickTime = 300 //单击
+    private val clickTimeInterval = 330
+    private val longPressTime = 670
+    private val longPressTimeInterval = 700
+    private var timerHorn: Timer? = null
+    private var timerAcc: Timer? = null
+
 
     fun init(context: Context) {
         mContext = context
@@ -41,6 +79,12 @@ class MoFangManager private constructor() {
         }
         mBluetoothAdapter.startDiscovery()
         showBondedDevice(mBluetoothAdapter)
+
+        CallerMofangListenerManager.addListener(TAG, this)
+    }
+
+    fun release() {
+        CallerMofangListenerManager.removeListener(TAG)
     }
 
     /**
@@ -89,14 +133,14 @@ class MoFangManager private constructor() {
     private val bluetoothMonitorReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             when (intent.action) {
-                BluetoothAdapter.ACTION_STATE_CHANGED -> { //中间状态 TODO
+                BluetoothAdapter.ACTION_STATE_CHANGED -> { //中间状态
                     CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_STATE_CHANGED  action = ${intent.action}")
                 }
 
                 BluetoothDevice.ACTION_ACL_CONNECTED -> { //蓝牙设备已连接
                     if (!isMfConnect) {
 //                        showBondedDevice(mBluetoothAdapter)
-                        updateMfStatusView(TAG, true)
+                        invokeMoFangStatus(true)
                         isMfConnect = true
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, true) }
                     }
@@ -106,7 +150,7 @@ class MoFangManager private constructor() {
                 BluetoothDevice.ACTION_ACL_DISCONNECTED -> { //蓝牙设备已断开 主动更新
                     CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver  ACTION_ACL_DISCONNECTED ----- isMfConnect = $isMfConnect ")
                     if (isMfConnect) {
-                        updateMfStatusView(TAG, false)
+                        invokeMoFangStatus(false)
                         isMfConnect = false
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, false) }
                     }
@@ -115,5 +159,191 @@ class MoFangManager private constructor() {
         }
     }
 
+    /**
+     * 魔方按键处理
+     */
+    override fun onMofangHandle(keyCode: Int, action: Int): Boolean {
+        val bluetoothName = SharedPrefsMgr.getInstance(ContextHolderUtil.getContext()).getString(
+            MfConstants.BLUETOOTH_NAME)
+        if (bluetoothName == "MINI_KEYBOARD") {
+            if (!isPressEnd) {
+                isPressEnd = true
+                startPressTime = System.currentTimeMillis()
+            }
+            e(M_F + "MoFangManager",
+                "dispatchKeyEvent ------ bluetoothName = $bluetoothName ---code = $keyCode -----action = $action ---HmiBuildConfig.isShowMfToastView = ${HmiBuildConfig.isShowMfToastView}")
+            if (keyCode == KeyEvent.KEYCODE_A) { //单击 -1，长按无操作，AB组合-2
+                if (action == KeyEvent.ACTION_DOWN) {
+                    pressADownTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent A down pressADownTime = " + pressADownTime + "---" + (pressADownTime - startPressTime) + "----isCombinationKey = " + isCombinationKey + "--pressBDownTime = " + pressBDownTime)
+                    if (pressADownTime - startPressTime in (clickTimeInterval + 1) until longPressTime && pressBDownTime > 0) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 A 按AB组合 +1 timeInterval: ${pressADownTime - startPressTime}ms---$pressBDownTime")
+                        }
+                        sendAcc(true, +1.0)
+                        isCombinationKey = 3
+                    }
+                    if (isCombinationKey != 3 && isCombinationKey != 1) {
+                        if (pressADownTime - startPressTime > longPressTimeInterval) {
+                            if (HmiBuildConfig.isShowMfToastView) {
+                                ToastUtils.showShort("方块 长按A -2 timeInterval: ${pressADownTime - startPressTime}ms")
+                            }
+                            sendAcc(true, -2.0)
+                            isCombinationKey = 2
+                        }
+                    }
+                } else if (action == KeyEvent.ACTION_UP) {
+                    pressAUpTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent A up    pressAUpTime = " + pressAUpTime + "---" + (pressAUpTime - startPressTime) + "--pressBDownTime = " + pressBDownTime + "---isCombinationKey = $isCombinationKey")
+                    if (pressAUpTime - startPressTime < clickTime && isCombinationKey != 3) {
+                        isCombinationKey = 1
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 单击A -1 timeInterval: ${pressAUpTime - startPressTime}ms")
+                        }
+                        sendAcc(true, -1.0)
+                    }
+                    pressADownTime = 0
+                    isPressEnd = false
+                    UiThreadHandler.postDelayed({ isCombinationKey = 0 }, 300)
+                }
+            } else if (keyCode == KeyEvent.KEYCODE_B) { //单击复原，长按+1，AB组合-2
+                if (action == KeyEvent.ACTION_DOWN) {
+                    pressBDownTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent B down pressBDownTime = " + pressBDownTime + "--差-" + (pressBDownTime - startPressTime) + "---isCombinationKey = " + isCombinationKey + "--pressADownTime = " + pressADownTime
+                    )
+                    if (pressBDownTime - startPressTime > clickTimeInterval && pressBDownTime - startPressTime < longPressTime && pressADownTime > 0) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 B 按AB组合 +1 timeInterval: ${pressBDownTime - startPressTime}ms ---pressADownTime = $pressADownTime ")
+                        }
+                        sendAcc(true, +1.0)
+                        isCombinationKey = 3
+                    }
+                    if (isCombinationKey != 3 && isCombinationKey != 1) {
+                        if (pressBDownTime - startPressTime > longPressTimeInterval) {
+                            if (HmiBuildConfig.isShowMfToastView) {
+                                ToastUtils.showShort("方块 长按B 无操作 timeInterval: ${pressBDownTime - startPressTime}ms")
+                            }
+                            isCombinationKey = 2
+                        }
+                    }
+                } else if (action == KeyEvent.ACTION_UP) {
+                    pressBUpTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent B up   pressBUpTime = " + pressBUpTime + "--差-" + (pressBUpTime - startPressTime) + "--pressADownTime = " + pressADownTime + "----isCombinationKey = $isCombinationKey")
+                    if (pressBUpTime - startPressTime < clickTime && isCombinationKey != 3) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 单击B  0  timeInterval: ${pressBUpTime - startPressTime}ms")
+                        }
+                        sendAcc(false, 0.0)
+                        isCombinationKey = 1
+                    }
+                    pressBDownTime = 0
+                    isPressEnd = false
+                    UiThreadHandler.postDelayed({ isCombinationKey = 0 }, 300)
+                }
+            } else if (keyCode == KeyEvent.KEYCODE_C) { //单击左变道，长按无操作
+                if (action == KeyEvent.ACTION_DOWN) {
+                    pressCDownTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent 方块 长按C 无操作 time dif = " + (pressCDownTime - startPressTime))
+                    if (pressCDownTime - startPressTime > longPressTimeInterval) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 长按C 无操作 timeInterval: ${pressCDownTime - startPressTime}ms")
+                        }
+                    }
+                } else if (action == KeyEvent.ACTION_UP) {
+                    pressCUpTime = System.currentTimeMillis()
+                    isPressEnd = false
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent 方块 单击C ← 向左变道 time dif = " + (pressCUpTime - startPressTime))
+                    if (pressCUpTime - startPressTime < clickTime) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 单击C ← 向左变道 timeInterval: ${pressCUpTime - startPressTime}ms")
+                        }
+                        sendOperatorChangeLaneLeft()
+                    }
+                }
+            } else if (keyCode == KeyEvent.KEYCODE_D) { //单击向右变道，双击无操作
+                if (action == KeyEvent.ACTION_DOWN) {
+                    pressDDownTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent 方块 长按D 无操作 time dif = " + (pressDDownTime - startPressTime))
+                    if (pressDDownTime - startPressTime > longPressTimeInterval) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 长按D 无操作 timeInterval: ${pressDDownTime - startPressTime}ms")
+                        }
+                    }
+                } else if (action == KeyEvent.ACTION_UP) {
+                    pressDUpTime = System.currentTimeMillis()
+                    isPressEnd = false
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent 方块 单击D → 向右变道 time dif = " + (pressDUpTime - startPressTime))
+                    if (pressDUpTime - startPressTime < clickTime) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 单击D → 向右变道 timeInterval: ${pressDUpTime - startPressTime}ms")
+                        }
+                        sendOperatorChangeLaneRight()
+                    }
+                }
+            } else if (keyCode == KeyEvent.KEYCODE_E) { //单击启动自驾，长按鸣笛
+                if (action == KeyEvent.ACTION_DOWN) {
+                    pressEDownTime = System.currentTimeMillis()
+                    d(M_F + "MoFangManager",
+                        "dispatchKeyEvent 方块 长按E 鸣笛 time dif = " + (pressEDownTime - startPressTime))
+                    if (pressEDownTime - startPressTime > longPressTimeInterval) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 长按E 鸣笛 timeInterval: ${pressEDownTime - startPressTime}ms")
+                        }
+                        sendOperatorSetHorn(1.0)
+                        if (timerHorn == null) {
+                            timerHorn = Timer()
+                        }
+                        timerHorn!!.schedule(object : TimerTask() {
+                            override fun run() {
+                                sendOperatorSetHorn(2.0)
+                                timerHorn = null
+                            }
+                        }, 500)
+                    }
+                } else if (action == KeyEvent.ACTION_UP) {
+                    pressEUpTime = System.currentTimeMillis()
+                    isPressEnd = false
+                    d(M_F + "MoFangManager",
+                        "方块 单击E 开启自动驾驶 time dif = " + (pressEUpTime - startPressTime))
+                    if (pressEUpTime - startPressTime < clickTime) {
+                        if (HmiBuildConfig.isShowMfToastView) {
+                            ToastUtils.showShort("方块 单击E 开启自动驾驶 timeInterval: ${pressEUpTime - startPressTime}ms")
+                        }
+                        startAutoPilot(getAutoPilotStatusInfo().autopilotControlParameters)
+                    }
+                }
+            }
+        }
+        return true
+    }
+
+    @Synchronized
+    private fun sendAcc(isSend: Boolean, acc: Double) {
+        if (isSend) {
+            if (timerAcc == null) {
+                timerAcc = Timer()
+                timerAcc!!.schedule(object : TimerTask() {
+                    override fun run() {
+                        sendOperatorSetAcceleratedSpeed(acc)
+                    }
+                }, 0, 500)
+            }
+        } else {
+            if (timerAcc != null) {
+                timerAcc!!.cancel()
+                timerAcc = null
+            }
+            sendOperatorSetAcceleratedSpeed(acc)
+        }
+    }
+
 }
 

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

@@ -0,0 +1,142 @@
+package com.zhjt.mogo_core_function_devatools.report
+
+import android.app.Activity
+import android.content.Context
+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.deva.report.ReportEntity
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.TimeUtils
+import mogo_msg.MogoReportMsg
+
+/**
+ * @author XuXinChao
+ * @description 工控机监控节点信息上报管理
+ * @since: 2022/5/12
+ */
+class IPCReportManager : IMoGoAutopilotStatusListener {
+
+    private var ipcErrorReportList = arrayListOf<ReportEntity>() //错误上报列表
+    private var ipcWarningReportList = arrayListOf<ReportEntity>() //警告上报列表
+
+    companion object{
+        const val TAG ="IPCReportManager"
+        val iPCReportManager: IPCReportManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+            IPCReportManager()
+        }
+        //Warning
+        const val RESULT_AUTOPILOT_INFERIOR = "RESULT_AUTOPILOT_INFERIOR"
+        const val RESULT_SHOW_WARNING = "RESULT_SHOW_WARNING"
+        const val RESULT_REMOTEPILOT_INFERIOR = "RESULT_REMOTEPILOT_INFERIOR"
+        //Error
+        const val RESULT_AUTOPILOT_DISABLE = "RESULT_AUTOPILOT_DISABLE"
+        const val RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED"
+        const val RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE"
+
+    }
+
+    //工控机上报列表悬浮窗
+    private var reportListFloatWindow: ReportListFloatWindow? = null
+    //工控机节点上报列表
+    private val reportList = arrayListOf<ReportEntity>()
+
+    fun initServer(){
+        //乘客屏不显示监控信息弹窗,只在司机端提示
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            // 添加 ADAS状态 监听
+            CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        }
+    }
+
+    fun showReportListWindow(context: Context, isShow: Boolean){
+        if(isShow){
+            //打开工控机上报列表
+            reportListFloatWindow =
+                ReportListFloatWindow(context as Activity)
+            reportListFloatWindow?.showFloatWindow()
+            reportListFloatWindow?.refreshData(reportList)
+        }else {
+            //关闭工控机上报列表
+            reportListFloatWindow?.hideFloatWindow()
+        }
+    }
+
+    /**
+     *工控机监控节点上报
+     */
+    override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
+        guardianInfo?.let{
+            if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
+                || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED)
+                || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
+                || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
+                || it.resultList.contains(RESULT_SHOW_WARNING)
+                || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){
+                val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
+                    it.src,it.level,it.msg,it.code,it.resultList,it.actionsList,false)
+                CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
+            }
+
+            if (reportList.size > 49) {
+                reportList.removeLast()
+            }
+            reportList.add(
+                0,
+                ReportEntity(
+                    TimeUtils.millis2String(System.currentTimeMillis()),
+                    it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
+                ,false)
+            )
+            reportListFloatWindow?.refreshData(reportList)
+
+//            //Error 弹窗并有提示音
+//            if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
+//                || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED)
+//                || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE)){
+//                if(ipcErrorReportList.size>19){
+//                    ipcErrorReportList.removeLast()
+//                }
+//                val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
+//                    it.src,it.level,it.msg,it.code,it.resultList,it.actionsList)
+////                CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
+//                ipcErrorReportList.add(0, reportEntity)
+//                //当前不处于美化模式时，展示监控节点上报
+//                if(!FunctionBuildConfig.isDemoMode){
+//                    if(FunctionBuildConfig.isReportWarning){
+//                        CallerHmiManager.showIPCReportWindow(ipcErrorReportList,ipcWarningReportList,1)
+//                    }
+//                }
+//            }
+//            //Warning 不弹窗也不会有提示音
+//            else if(it.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
+//                    || it.resultList.contains(RESULT_SHOW_WARNING)
+//                    || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){
+//                    if(ipcWarningReportList.size>19){
+//                        ipcWarningReportList.removeLast()
+//                    }
+//                ipcWarningReportList.add(0,
+//                    ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
+//                        it.src,it.level,it.msg,it.code,it.resultList,it.actionsList))
+//                //当前不处于美化模式时，展示监控节点上报
+//                if(!FunctionBuildConfig.isDemoMode){
+//                    if(FunctionBuildConfig.isReportWarning){
+//                        CallerHmiManager.showIPCReportWindow(ipcErrorReportList,ipcWarningReportList,2)
+//                    }
+//                }
+//            }
+        }
+    }
+
+    fun destroy(){
+        //乘客屏不显示监控信息弹窗,只在司机端提示
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            // 移除 ADAS状态 监听
+            CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        }
+    }
+
+}

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

@@ -0,0 +1,107 @@
+package com.zhjt.mogo_core_function_devatools.report
+
+import android.app.Activity
+import android.graphics.PixelFormat
+import android.util.DisplayMetrics
+import android.view.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.eagle.core.data.deva.report.ReportEntity
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import com.zhjt.mogo_core_function_devatools.R
+import com.zhjt.mogo_core_function_devatools.report.adapter.ReportListAdapter
+
+/**
+ * @author XuXinChao
+ * @description 工控机上报列表面板
+ * @since: 2022/4/13
+ */
+class ReportListFloatWindow constructor(activity: Activity) : View.OnTouchListener{
+
+    private var mActivity: Activity = activity
+    private var mWindowParams: WindowManager.LayoutParams? = null
+    private var mWindowManager: WindowManager? = null
+    private lateinit var rvReportList: RecyclerView
+    private var reportListAdapter: ReportListAdapter?=null
+
+    private lateinit var mFloatLayout: View
+    private var mInViewX = 0f
+    private var mInViewY = 0f
+    private var mDownInScreenX = 0f
+    private var mDownInScreenY = 0f
+    private var mInScreenX = 0f
+    private var mInScreenY = 0f
+
+    init {
+        initFloatWindow();
+    }
+
+    private fun initFloatWindow() {
+        mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.view_report_list, null) as View
+        mFloatLayout.setOnTouchListener(this)
+        rvReportList= mFloatLayout.findViewById(R.id.rv_report_list)
+        mWindowParams = WindowManager.LayoutParams()
+        mWindowManager = mActivity.windowManager
+        mWindowParams?.let {
+            it.format = PixelFormat.RGBA_8888
+            it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            it.gravity = Gravity.START or Gravity.TOP
+            it.width = 800
+            it.height = 1000
+            it.alpha = 0.9f
+        }
+        reportListAdapter= ReportListAdapter(mActivity)
+        rvReportList.layoutManager = LinearLayoutManager(mActivity,
+            LinearLayoutManager.VERTICAL,false)
+        rvReportList.adapter = reportListAdapter
+    }
+
+    fun refreshData(data:List<ReportEntity>){
+        reportListAdapter?.setDada(data)
+        reportListAdapter?.notifyDataSetChanged()
+    }
+
+    override fun onTouch(v: View?, motionEvent: MotionEvent?): Boolean {
+        when (motionEvent?.action) {
+            MotionEvent.ACTION_DOWN -> {
+                // 获取相对View的坐标，即以此View左上角为原点
+                mInViewX = motionEvent.x
+                mInViewY = motionEvent.y
+                // 获取相对屏幕的坐标，即以屏幕左上角为原点
+                mDownInScreenX = motionEvent.rawX
+                mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
+                mInScreenX = motionEvent.rawX
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
+            }
+            MotionEvent.ACTION_MOVE -> {
+                // 更新浮动窗口位置参数
+                mInScreenX = motionEvent.rawX
+                mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight()
+                mWindowParams!!.x = (mInScreenX - mInViewX).toInt()
+                mWindowParams!!.y = (mInScreenY - mInViewY).toInt()
+                // 手指移动的时候更新小悬浮窗的位置
+                mWindowManager!!.updateViewLayout(mFloatLayout, mWindowParams)
+            }
+//            MotionEvent.ACTION_UP ->                 // 如果手指离开屏幕时，xDownInScreen和xInScreen相等，且yDownInScreen和yInScreen相等，则视为触发了单击事件。
+//                if (mDownInScreenX === mInScreenX && mDownInScreenY === mInScreenY) {
+//                }
+        }
+        return true
+    }
+
+    fun showFloatWindow() {
+        if (mFloatLayout.parent == null) {
+            val metrics = DisplayMetrics()
+            // 默认固定位置，靠屏幕右边缘的中间
+            mWindowManager!!.defaultDisplay.getMetrics(metrics)
+            mWindowParams!!.x = metrics.widthPixels
+            mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()
+            mWindowManager!!.addView(mFloatLayout, mWindowParams)
+        }
+    }
+
+    fun hideFloatWindow() {
+        if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/adapter/ReportListAdapter.kt

@@ -0,0 +1,92 @@
+package com.zhjt.mogo_core_function_devatools.report.adapter
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.eagle.core.data.deva.report.ReportEntity
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
+import com.zhjt.mogo_core_function_devatools.R
+
+/**
+ * @author XuXinChao
+ * @description 工控机上报列表适配器
+ * @since: 2022/4/13
+ */
+class ReportListAdapter(context: Context) :
+    RecyclerView.Adapter<ReportListAdapter.ReportListHolder>() {
+
+    private var context: Context? = context
+    private var data:List<ReportEntity>? = null
+
+    public fun setDada( data: List<ReportEntity>?){
+        this.data = data
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReportListHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_report_detail, parent, false)
+        return ReportListHolder(view)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ReportListHolder, position: Int) {
+        data?.let { it ->
+            val reportEntity = it[position]
+            reportEntity.let {
+                holder.tvReportTime.text = "上报时间：${it.time}"
+                holder.tvReportSrc.text = "src:${it.src}"
+                holder.tvReportLevel.text = "level:${it.level}"
+                holder.tvReportMsg.text = "msg:${it.msg}"
+                holder.tvReportCode.text = "code:${it.code}"
+                var resultStr = "result:"
+                for (result in it.resultList) {
+                    resultStr = "$resultStr$result${CallerAutoPilotControlManager.getReportResultDesc(result)}  "
+                }
+                holder.tvReportResult.text = resultStr
+                var actionStr = "action:"
+                for (action in it.actionsList) {
+                    actionStr = "$actionStr$action${CallerAutoPilotControlManager.getReportActionDesc(action)}  "
+                }
+                holder.tvReportActions.text = actionStr
+
+                if ("error" == it.level) {
+                    //字体为红色,吐司提示
+                    holder.tvReportTime.setTextColor(Color.RED)
+                    holder.tvReportSrc.setTextColor(Color.RED)
+                    holder.tvReportLevel.setTextColor(Color.RED)
+                    holder.tvReportMsg.setTextColor(Color.RED)
+                    holder.tvReportCode.setTextColor(Color.RED)
+                    holder.tvReportResult.setTextColor(Color.RED)
+                    holder.tvReportActions.setTextColor(Color.RED)
+                } else {
+                    holder.tvReportTime.setTextColor(Color.WHITE)
+                    holder.tvReportSrc.setTextColor(Color.WHITE)
+                    holder.tvReportLevel.setTextColor(Color.WHITE)
+                    holder.tvReportMsg.setTextColor(Color.WHITE)
+                    holder.tvReportCode.setTextColor(Color.WHITE)
+                    holder.tvReportResult.setTextColor(Color.WHITE)
+                    holder.tvReportActions.setTextColor(Color.WHITE)
+                }
+            }
+        }
+
+    }
+
+    override fun getItemCount() = data?.size ?: 0
+
+    class ReportListHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
+        var tvReportTime: TextView = itemView.findViewById(R.id.tvReportTime)
+        var tvReportSrc: TextView = itemView.findViewById(R.id.tvReportSrc)
+        var tvReportLevel: TextView = itemView.findViewById(R.id.tvReportLevel)
+        var tvReportMsg: TextView = itemView.findViewById(R.id.tvReportMsg)
+        var tvReportCode: TextView = itemView.findViewById(R.id.tvReportCode)
+        var tvReportResult: TextView = itemView.findViewById(R.id.tvReportResult)
+        var tvReportActions: TextView = itemView.findViewById(R.id.tvReportActions)
+    }
+
+}

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

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_SWEEPER
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
@@ -38,6 +39,7 @@ class SceneManager {
         private const val NET = "NET"
         private const val BUS = "BUS"
         private const val TAXI = "TAXI"
+        private const val SWEEPER = "SWEEPER"
         private const val TAXI_P = "TAXI_P"
         private const val OTHER = "OTHER"
 
@@ -63,7 +65,8 @@ class SceneManager {
         sceneModuleTAG.map[BUS] = SceneModule(true, M_BUS)
         sceneModuleTAG.map[TAXI] = SceneModule(true, M_TAXI)
         sceneModuleTAG.map[TAXI_P] = SceneModule(true, M_TAXI_P)
-        sceneModuleTAG.map[OTHER] = SceneModule(false, M_OTHER)
+        sceneModuleTAG.map[SWEEPER] = SceneModule(true, M_SWEEPER)
+        sceneModuleTAG.map[OTHER] = SceneModule(true, M_OTHER)
 
         sceneLogTAG.map[TAXI] = SceneTAG(false)
         sceneLogTAG.map[BUS] = SceneTAG(false)
@@ -80,7 +83,7 @@ class SceneManager {
                 }
             }
             //call back
-            CallerDevaToolsListenerManager.invokeDevaToolsModuleLogChanges(sceneModuleTAG.map)
+//            CallerDevaToolsListenerManager.invokeDevaToolsModuleLogChanges(sceneModuleTAG.map)
         }
     }
 
@@ -160,6 +163,15 @@ class SceneManager {
                 sceneCache[M_OLD_ROUTE]?.logger = logger
                 scene.updateSceneCache(sceneCache)
             }
+            SWEEPER -> {
+                sceneCache[M_SWEEPER]?.logger = logger
+                sceneCache[M_NETWORK]?.logger = logger
+                sceneCache[M_ADAS_IMPL]?.logger = logger
+                sceneCache[M_HMI]?.logger = logger
+                sceneCache[M_DEVA]?.logger = logger
+                sceneCache[M_OLD_ROUTE]?.logger = logger
+                scene.updateSceneCache(sceneCache)
+            }
         }
     }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt

@@ -1,21 +1,35 @@
 package com.zhjt.mogo_core_function_devatools.status.flow.can
 
-import android.content.*
+import android.content.Context
 import android.util.Log
 import chassis.Chassis.GearPosition
 import chassis.Chassis.LightSwitch
-import chassis.VehicleStateOuterClass
+import chassis.ChassisStatesOuterClass
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.call.autopilot.*
-import com.mogo.eagle.core.utilcode.kotlin.*
-import com.zhjt.mogo_core_function_devatools.status.flow.IFlow
+import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus
-import kotlinx.coroutines.*
+import com.zhjt.mogo_core_function_devatools.status.flow.IFlow
+import kotlinx.coroutines.Job
 import mogo_msg.MogoReportMsg.MogoReportMessage
+import planning.RoboSweeperTaskIndexOuterClass
 import system_master.SystemStatusInfo.StatusInfo
-import java.util.concurrent.atomic.*
+import java.util.concurrent.atomic.AtomicInteger
 
-internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehicleStateListener, IMoGoAutopilotStatusListener {
+internal class CanImpl(ctx: Context) :
+        IFlow<CanStatus>(ctx),
+
+        IMoGoAutopilotVehicleStateListener,
+
+        IMoGoChassisAccStateListener,
+        IMoGoChassisSteeringStateListener,
+        IMoGoChassisGearStateListener,
+        IMoGoChassisBrakeStateListener,
+        IMoGoChassisThrottleStateListener,
+
+        IMoGoAutopilotStatusListener,
+        IMoGoChassisLamplightListener,
+        IMoGoSweeperFutianCleanSystemListener {
 
     companion object {
         const val TAG = "CanImpl"
@@ -25,41 +39,43 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
     private val state: AtomicInteger by lazy { AtomicInteger(Int.MIN_VALUE) }
 
     override fun onCreate() {
-        send(CanStatus(CallerAutoPilotManager.isConnected()))
-        CallerAutopilotVehicleStateListenerManager.addListener(TAG, this)
+        send(CanStatus(CallerAutoPilotControlManager.isConnected()))
+
+        CallerChassisAccStateListenerManager.addListener(TAG, this)
+        CallerChassisBrakeStateListenerManager.addListener(TAG, this)
+        CallerChassisGearStateListenerManager.addListener(TAG, this)
+        CallerChassisSteeringStateListenerManager.addListener(TAG, this)
+        CallerChassisThrottleStateListenerManager.addListener(TAG, this)
+
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        CallerChassisLamplightListenerManager.addListener(TAG, this)
     }
 
     override fun onAutopilotLightSwitchData(lightSwitch: LightSwitch?) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     private fun isCanEnabled(): Boolean {
         val code = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageCode()
-        return CallerAutoPilotManager.isConnected() && code != "EHW_CAN" && (state.get() == Int.MIN_VALUE || state.get() == 0)
+        return CallerAutoPilotControlManager.isConnected() && code != "EHW_CAN" && (state.get() == Int.MIN_VALUE || state.get() == 0)
     }
 
 
     override fun onAutopilotBrakeLightData(brakeLight: Boolean) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotSteeringData(steering: Float) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotGearData(gear: GearPosition) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) {
         super.onAutopilotIpcConnectStatusChanged(status, reason)
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotDataException(timestamp: Long) {
@@ -69,28 +85,26 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
 
     override fun onAutopilotAcc(carAcc: Float) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotThrottle(throttle: Float) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotBrake(brake: Float) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
-    override fun onSweeperFutianCleanSystemState(cleanSystemState: VehicleStateOuterClass.SweeperFuTianCleanSystemState) {
+
+    override fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates) {
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
+    override fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex) {
 
+    }
     override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) {
         super.onAutopilotGuardian(guardianInfo)
         send(CanStatus(isCanEnabled()))
-        timeOutCheck()
     }
 
     override fun onAutopilotStatusRespByQuery(status: StatusInfo) {
@@ -101,18 +115,15 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
         }
     }
 
-    private fun timeOutCheck() {
-        job?.safeCancel()
-        launch(Dispatchers.Unconfined) {
-            delay(4000)
-            send(CanStatus(isCanEnabled()))
-        }.also { job = it  }
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         job?.safeCancel()
-        CallerAutopilotVehicleStateListenerManager.removeListener(TAG)
+        CallerChassisAccStateListenerManager.removeListener(TAG)
+        CallerChassisBrakeStateListenerManager.removeListener(TAG)
+        CallerChassisGearStateListenerManager.removeListener(TAG)
+        CallerChassisSteeringStateListenerManager.removeListener(TAG)
+        CallerChassisThrottleStateListenerManager.removeListener(TAG)
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        CallerChassisLamplightListenerManager.removeListener(TAG)
     }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/ipc/IpcImpl.kt

@@ -28,7 +28,7 @@ internal class IpcImpl(ctx: Context): IFlow<IpcStatus>(ctx), IMoGoAutopilotStatu
     }
 
     private fun checkAndSend() {
-        send(IpcStatus(CallerAutoPilotManager.isConnected()))
+        send(IpcStatus(CallerAutoPilotControlManager.isConnected()))
     }
 
     override fun onDestroy() {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt

@@ -1,20 +1,27 @@
 package com.zhjt.mogo_core_function_devatools.status.flow.rtk
 
-import android.content.*
-import android.util.*
-import com.mogo.eagle.core.function.api.autopilot.*
-import com.mogo.eagle.core.function.call.autopilot.*
+import android.content.Context
+import android.util.Log
+import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus
 import com.zhjt.mogo_core_function_devatools.status.flow.IFlow
-import kotlinx.coroutines.*
-import mogo.telematics.pad.MessagePad.GnssInfo
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import system_master.SystemStatusInfo.HealthInfo
 import system_master.SystemStatusInfo.StatusInfo
-import java.util.concurrent.atomic.*
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicReference
 
-internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener {
+internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatusListener, IMoGoChassisLocationWGS84Listener {
     companion object {
         const val TAG = "RTKImpl"
     }
@@ -34,8 +41,8 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
         send(RTKStatus(getDesc(), getCode()))
         CallerLogger.d("$M_DEVA$TAG", "-- onCreate --")
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
-        CallerAutopilotCarStatusListenerManager.addListener(TAG, this)
-        if (CallerAutoPilotManager.isConnected()) {
+        CallerChassisLocationWGS84ListenerManager.addListener(TAG, this)
+        if (CallerAutoPilotControlManager.isConnected()) {
             check()
         }
     }
@@ -46,7 +53,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
         }
         check?.takeIf { it.isActive }?.cancel()
         launch(Dispatchers.Unconfined) {
-            CallerAutoPilotManager.sendStatusQueryReq()
+            CallerAutoPilotControlManager.sendStatusQueryReq()
             delay(5000)
             isOldVersion.set(true)
         }.also {
@@ -67,18 +74,18 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
 
     override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) {
         super.onAutopilotIpcConnectStatusChanged(status, reason)
-        if (!CallerAutoPilotManager.isConnected()) {
+        if (!CallerAutoPilotControlManager.isConnected()) {
             CallerLogger.d("$M_DEVA$TAG", "工控机断开了....")
             healthInfo.set(null)
             send(RTKStatus("", -1))
         }
 
-        if (CallerAutoPilotManager.isConnected() && check == null && !isOldVersion.get()) {
+        if (CallerAutoPilotControlManager.isConnected() && check == null && !isOldVersion.get()) {
              check()
         }
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: GnssInfo?) {
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
         if (isOldVersion.get()) {
             if (isRTKEnabled()) {
                 send(RTKStatus("RTK", 0))
@@ -95,8 +102,8 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
 
     private fun isRTKEnabled(): Boolean {
         val code = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageCode()
-        val gnssInfo = CallerAutopilotCarStatusListenerManager.getCurrentGnssInfo()
-        return CallerAutoPilotManager.isConnected() && (
+        val gnssInfo = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
+        return CallerAutoPilotControlManager.isConnected() && (
                 code != "EHW_RTK" &&
                         code != "EHW_GNSS" &&
                         code != "ESYS_RTK_STATUS_FAULT" &&
@@ -117,6 +124,6 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
         isOldVersion.set(false)
         CallerLogger.d("$M_DEVA$TAG", "-- onDestroy --")
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
-        CallerAutopilotCarStatusListenerManager.removeListener(TAG)
+        CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
     }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt

@@ -9,6 +9,8 @@ import com.zhjt.mogo_core_function_devatools.status.entity.*
 import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.*
 import com.zhjt.mogo_core_function_devatools.status.flow.*
 import mogo_msg.MogoReportMsg.MogoReportMessage
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicReference
 
 internal class TracingImpl(ctx: Context): IFlow<TracingStatus>(ctx), IMoGoAutopilotStatusListener {
 
@@ -18,6 +20,14 @@ internal class TracingImpl(ctx: Context): IFlow<TracingStatus>(ctx), IMoGoAutopi
 
     private var old: TracingStatus.Tracing = UNKNOWN
 
+    private val ipcConnectStatus by lazy { AtomicInteger() }
+
+    private val ipcStatus by lazy { AtomicInteger() }
+
+    private val reportCode by lazy { AtomicReference<String>() }
+
+    private val reportMsg by lazy { AtomicReference<String>() }
+
     override fun onCreate() {
         val code = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageCode()
         val msg = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageContent()
@@ -30,32 +40,53 @@ internal class TracingImpl(ctx: Context): IFlow<TracingStatus>(ctx), IMoGoAutopi
 
     override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) {
         super.onAutopilotGuardian(guardianInfo)
-        val current = guardianInfo?.code
-        val newState = current?.toState(guardianInfo.msg)
-        if (newState != null) {
-            old = newState
-            send(TracingStatus(newState))
+        val code = guardianInfo?.code
+        val message = guardianInfo?.msg
+        try {
+            if (code != reportCode.get() || message != reportMsg.get()) {
+                val newState = code?.toState(message)
+                if (newState != null) {
+                    old = newState
+                    send(TracingStatus(newState))
+                }
+            }
+        } finally {
+            reportCode.set(code)
+            reportMsg.set(message)
         }
     }
 
     override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) {
         super.onAutopilotIpcConnectStatusChanged(status, reason)
-        if (!CallerAutoPilotManager.isConnected()) {
-            old = UNKNOWN
-            send(TracingStatus(UNKNOWN))
+        try {
+            if (ipcConnectStatus.get() != status) {
+                if (!CallerAutoPilotControlManager.isConnected()) {
+                    old = UNKNOWN
+                    send(TracingStatus(UNKNOWN))
+                }
+            }
+        } finally {
+            ipcConnectStatus.set(status)
         }
     }
 
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
         super.onAutopilotStatusResponse(autoPilotStatusInfo)
-        if (autoPilotStatusInfo.state != STATUS_AUTOPILOT_RUNNING) {
-            old = UNKNOWN
-            send(TracingStatus(UNKNOWN))
-            return
-        }
-        if (old.isException()) {
-            old = TRACK_LOADED
-            send(TracingStatus(TRACK_LOADED))
+        val state = autoPilotStatusInfo.state
+        try {
+            if (ipcStatus.get() != state) {
+                if (state != STATUS_AUTOPILOT_RUNNING) {
+                    old = UNKNOWN
+                    send(TracingStatus(UNKNOWN))
+                    return
+                }
+                if (old.isException()) {
+                    old = TRACK_LOADED
+                    send(TracingStatus(TRACK_LOADED))
+                }
+            }
+        } finally {
+            ipcStatus.set(state)
         }
     }
 

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt

@@ -19,7 +19,7 @@ internal class StatusModel : ViewModel() {
 
         const val TAG = "StatusModel"
         val DEFAULTS = Pair(null, ArrayList<Status>().also {
-            it += IpcStatus(CallerAutoPilotManager.isConnected())
+            it += IpcStatus(CallerAutoPilotControlManager.isConnected())
             it += CanStatus(false)
             it += TracingStatus(UNKNOWN)
             it += RTKStatus("", -1)

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

@@ -0,0 +1,34 @@
+package com.zhjt.mogo_core_function_devatools.strict
+
+import android.os.*
+import android.os.StrictMode.ThreadPolicy.Builder
+import android.os.StrictMode.VmPolicy
+import com.mogo.eagle.core.function.api.devatools.strict.*
+
+/**
+ * 严格模式功能管理
+ * 1. 监测主线程磁盘读写
+ * 2. 监测主线程网络请求
+ * 3. 监测磁盘输入输出流使用异常(未及时关闭)
+ * 4. 监测数据库查询操作异常（cursor使用未关闭）
+ * 5. 监测资源类型不匹配（TypedValue）
+ * 6. 监测文件读写未使用Buffer（增加buffer可以减少系统调用，降低性能损耗）
+ */
+class StrictModeProviderImpl: IStrictModeProvider {
+
+
+    override fun enable() {
+        StrictMode.setThreadPolicy(
+            Builder()
+                .detectAll()
+                .penaltyLog()
+                .penaltyDropBox()
+                .build())
+        StrictMode.setVmPolicy(
+            VmPolicy.Builder()
+                .detectAll()
+                .penaltyLog()
+                .penaltyDropBox()
+                .build())
+    }
+}

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

@@ -7,7 +7,7 @@ import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
@@ -53,7 +53,7 @@ object SyncConfig {
             else -> {
             }
         }
-        AppConfigInfo.teleTimeStamp = CallerAutoPilotManager.getTeleTimeStamp()
+        AppConfigInfo.teleTimeStamp = CallerAutoPilotControlManager.getTeleTimeStamp()
         logOutConfig(AppConfigInfo)
     }
 

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

@@ -43,7 +43,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
         // 初始化Trace抓取服务
         val pkgName = Utils.getApp().packageName
         ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress(), false)
-        CallerCloudListenerManager.registerCloudListener(TAG, this)
+        CallerCloudListenerManager.addListener(TAG, this)
         CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
 
         // Trace过程中进行日志抓取，对日志进行配置

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

@@ -23,7 +23,7 @@ class TtsManager : IMoGoCloudListener {
     fun initTts(context: Context) {
         val sn = SharedPrefsMgr.getInstance(context).getString("sn")
         if (sn.isNullOrEmpty()) {
-            CallerCloudListenerManager.registerCloudListener(TraceManager.TAG, this)
+            CallerCloudListenerManager.addListener(TraceManager.TAG, this)
         }
         AIAssist.getInstance(context)
     }

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

@@ -0,0 +1,35 @@
+package com.zhjt.mogo_core_function_devatools.upgrade
+
+import com.mogo.eagle.core.data.BaseResponse
+import com.mogo.eagle.core.data.Response
+import okhttp3.RequestBody
+import retrofit2.http.*
+
+/**
+ * @author XuXinChao
+ * @description 工控机升级网络请求接口
+ * @since: 2022/5/17
+ */
+interface IPCUpgradeApiService {
+
+    /**
+     * 确认升级工控机docker版本
+     * @param imageName docker域名
+     * @param imageVersion docker版本
+     * @param padSn SN
+     * @param releaseId 任务ID
+     */
+    @Headers(
+        "Content-Type:application/json",
+        "Accept: application/json"
+    )
+    @POST("/api/pushServer/confirm")
+    suspend fun upgradeConfirm(@Body requestBody: RequestBody): BaseResponse<Any>
+
+    /**
+     * 获取新工控机docker版本
+     * @param padSn SN
+     */
+    @GET("/api/pushServer/queryContainers")
+    suspend fun queryContainers(@Query("padSn") padSn: String): Response<Any>
+}

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

@@ -0,0 +1,153 @@
+package com.zhjt.mogo_core_function_devatools.upgrade
+
+import android.content.Context
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
+import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import org.json.JSONObject
+
+/**
+ * @author XuXinChao
+ * @description 工控机镜像版本升级管理
+ * @since: 2022/5/12
+ */
+class IPCUpgradeManager: IMogoOnMessageListener<IPCUpgradeStateInfo> ,
+    IMoGoAutopilotStatusListener {
+
+    companion object{
+        const val TAG ="IPCUpgradeManager"
+        const val IPC_UPGRADE_MSG_TYPE = 50000
+        val ipcUpgradeManager: IPCUpgradeManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED){
+            IPCUpgradeManager()
+        }
+    }
+
+    private var mContext: Context? = null
+    private val ipcUpgradeNetWorkModel = IPCUpgradeNetWorkModel()
+    private var autopilotStatus: Int? = null  //自动驾驶状态   0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中
+
+    private var hasIPCUpgradeTask = false //是否有工控机升级任务，默认没有该任务
+    private var ipcUpgradeStateInfoTask: IPCUpgradeStateInfo?=null
+
+    fun init(context: Context){
+        mContext = context
+        //添加长链接监听
+        MogoAiCloudSocketManager.getInstance(context)
+            .registerOnMessageListener(IPC_UPGRADE_MSG_TYPE, this)
+        // 添加 ADAS状态 监听
+        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+    }
+
+    override fun target(): Class<IPCUpgradeStateInfo> {
+        return IPCUpgradeStateInfo::class.java
+    }
+
+    override fun onMsgReceived(ipcUpgradeStateInfo: IPCUpgradeStateInfo?) {
+        CallerLogger.i(TAG,"IPCUpgradeManager received msg${ipcUpgradeStateInfo}")
+        ipcUpgradeStateInfo?.let {
+            if(it.status.isEmpty() || it.status == "0"){
+                if(autopilotStatus == 2){
+                    //当前处于自动驾驶状态时，不弹窗提示，结束自动驾驶时弹窗
+                    hasIPCUpgradeTask = true
+                    ipcUpgradeStateInfoTask=it
+                }else{
+                    var releaseId=""
+                    if(it.releaseId!=null){
+                        releaseId = it.releaseId.toString()
+                    }
+                    //弹窗提示，确认是否进行工控机升级
+                    CallerHmiManager.showAdUpgradeDialog(
+                        it.images,
+                        MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
+                        releaseId)
+                }
+            }else{
+                //更新下载or升级状态
+                CallerHmiManager.showAdUpgradeStatus(it)
+            }
+
+
+        }
+    }
+
+    /**
+     * 自动驾驶状态信息
+     * @param autoPilotStatusInfo 状态信息
+     */
+    override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
+        autopilotStatus = autoPilotStatusInfo.state
+        //有升级任务，且不处于自动驾驶状态，进行升级提示
+        if(hasIPCUpgradeTask && autopilotStatus!=2){
+            ipcUpgradeStateInfoTask?.let {
+                var releaseId=""
+                if(it.releaseId!=null){
+                    releaseId = it.releaseId.toString()
+                }
+                CallerHmiManager.showAdUpgradeDialog(
+                    it.images,
+                    MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
+                    releaseId)
+                //将升级任务置为false
+                hasIPCUpgradeTask = false
+            }
+        }
+    }
+
+    /**
+     * 确认升级工控机docker版本
+     * @param images docker列表
+     * @param padSn SN
+     * @param releaseId 任务ID
+     */
+    fun upgradeConfirm(images: List<String>,padSn: String,releaseId: String){
+        ipcUpgradeNetWorkModel.upgradeConfirm(images,padSn,releaseId,
+            onSuccess = {
+                CallerDevaToolsListenerManager.invokePushServerConfirm()
+            },
+            onError = {
+
+            })
+    }
+
+    /**
+     * 获取新工控机docker版本
+     * @param padSn SN
+     * @param dockerVersion 当前工控机版本
+     */
+    fun queryContainers(padSn: String,dockerVersion: String){
+        ipcUpgradeNetWorkModel.queryContainers(padSn,
+            onSuccess = {
+                val jsonObject = JSONObject(it)
+                val images = jsonObject.getJSONArray("images")
+                val dockerList = ArrayList<String>()
+                for(i in 0 until images.length()){
+                    if(!images[i].toString().contains(dockerVersion)){
+                        dockerList.add(images[i].toString())
+                    }
+
+                }
+                //将数组结果回调
+                CallerDevaToolsListenerManager.invokeQueryContainersResponse(dockerList)
+            },
+            onError = {
+
+            })
+    }
+
+    fun destroy(){
+        //注销长链接监听
+        MogoAiCloudSocketManager.getInstance(mContext)
+            .unregisterLifecycleListener(IPC_UPGRADE_MSG_TYPE)
+        // 移除 ADAS状态 监听
+        CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        mContext = null
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.zhjt.mogo_core_function_devatools.upgrade
+
+import com.mogo.eagle.core.data.BaseResponse
+import com.mogo.eagle.core.data.Response
+import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeHostConst.Companion.getBaseUrl
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.network.apiCall
+import com.mogo.eagle.core.network.apiResponseCall
+import com.mogo.eagle.core.network.request
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import org.json.JSONArray
+import org.json.JSONObject
+
+/**
+ * @author XuXinChao
+ * @description 工控机升级网络请求
+ * @since: 2022/5/17
+ */
+class IPCUpgradeNetWorkModel {
+
+    private fun getNetWorkApi(baseUrl: String =getBaseUrl()): IPCUpgradeApiService {
+        return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
+            .create(IPCUpgradeApiService::class.java)
+    }
+
+    /**
+     * 确认升级工控机docker版本
+     * @param images docker列表
+     * @param padSn SN
+     * @param releaseId 任务ID
+     */
+    fun upgradeConfirm(images: List<String>,padSn: String,releaseId: String,
+                       onSuccess: ((String) -> Unit),onError: ((String) -> Unit)){
+        request<BaseResponse<Any?>> {
+            val requestJson = JSONObject()
+            val imagesJsonArray = JSONArray()
+            images.iterator().forEach {
+                imagesJsonArray.put(it)
+            }
+            requestJson.put("images",imagesJsonArray)
+            requestJson.put("padSn",padSn)
+            requestJson.put("releaseId",releaseId)
+            val requestBody:RequestBody= RequestBody.create(
+                MediaType.parse("application/json; charset=utf-8"),
+                requestJson.toString()
+            )
+            loader{
+                apiCall{
+                    getNetWorkApi(getBaseUrl()).upgradeConfirm(requestBody)
+                }
+            }
+            onSuccess{
+                onSuccess.invoke("")
+            }
+
+            onError {
+                onError.invoke("")
+            }
+
+        }
+    }
+
+    /**
+     * 获取新工控机docker版本
+     * @param padSn SN
+     */
+    fun queryContainers(padSn: String,onSuccess: ((String) -> Unit),onError: ((String) -> Unit)){
+        request<Response<Any?>>{
+            loader {
+                apiResponseCall{
+                    getNetWorkApi(getBaseUrl()).queryContainers(padSn)
+                }
+            }
+            onSuccess{
+                if(it.msg == "success"){
+                    onSuccess.invoke(GsonUtils.toJson(it.data))
+                }else{
+                    onError.invoke("query Containers fail")
+                }
+            }
+
+            onError {
+                if(it.message!=null){
+                    onError.invoke(it.message!!)
+                }
+            }
+
+        }
+    }
+
+
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java

@@ -0,0 +1,98 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING;
+
+import android.content.Context;
+
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.constants.HostConst;
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager;
+import com.mogo.eagle.core.network.MoGoRetrofitFactory;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * @author lixiaopeng
+ * @description 获取obu升级信息
+ * @since: 3/25/22
+ */
+public class ObuUpgradeAppNetWorkManager {
+    private static volatile ObuUpgradeAppNetWorkManager requestNoticeManager;
+    private final UpgradeApiService mUpgradeApiService;
+    private static final String TAG = "ObuUpgrade";
+
+    private ObuUpgradeAppNetWorkManager() {
+        mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost())
+                .create(UpgradeApiService.class);
+    }
+
+    public static ObuUpgradeAppNetWorkManager getInstance() {
+        if (requestNoticeManager == null) {
+            synchronized (ObuUpgradeAppNetWorkManager.class) {
+                if (requestNoticeManager == null) {
+                    requestNoticeManager = new ObuUpgradeAppNetWorkManager();
+                }
+            }
+        }
+        return requestNoticeManager;
+    }
+
+    /**
+     * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型
+     * mac ：工控机mac地址，
+     * screenType ： 类型
+     */
+    public void getObuUpgradeInfo(Context context, String mac, String versionName) {
+//        String sn = "X20202203105S688HZ";
+//        String mac1 = "48:b0:2d:4d:33:40";
+
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + " ---sn = " + sn + " ---versionName = " + versionName);
+        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, "7");
+        RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
+        mUpgradeApiService.getUpgradeInfo(requestBody)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<UpgradeAppInfo>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                    }
+
+                    @Override
+                    public void onNext(@NonNull UpgradeAppInfo info) {
+                        if (info != null && info.result != null) {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo appFileName = " + info.result.getAppFileName() + " ----url = " + info.result.getAppUrl() + " ----name = " + info.result.getVersionName() + " --obuVersionName =" + versionName + " ---info.result = " + info.result);
+                            if (!String.valueOf(info.result.getVersionName()).equals(versionName)) { //判断是否下载,当文件名称不一致的时候，就下载
+                                CallerDevaToolsManager.INSTANCE.downLoadPackage(info.result.getAppFileName(), info.result.getAppUrl());
+                            }
+                        } else {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null");
+                            CallerObuApiManager.INSTANCE.deleteObuFile();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        CallerLogger.INSTANCE.e(M_BINDING + TAG, "getObuUpgradeInfo e = " + e);
+                        //请求出错，需要删除相关文件
+                        CallerObuApiManager.INSTANCE.deleteObuFile();
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeApiService.java

@@ -0,0 +1,27 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
+
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+import retrofit2.http.Body;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+
+/**
+ * @author lixiaopeng
+ * @description 升级
+ * @since: 6/20/22
+ */
+public interface UpgradeApiService {
+    /**
+     * 获取升级信息
+     * , @Query("resources") String i
+     * @return {@link UpgradeAppInfo}
+     */
+    @Headers("Content-Type:application/json;charset=UTF-8")
+    @POST("eagleEye-mis/config/versionInfo")
+//    Observable<UpgradeAppInfo> getUpgradeInfo(@Query("resources") String res, @Body RequestBody requestBody);
+    Observable<UpgradeAppInfo> getUpgradeInfo(@Body RequestBody requestBody);
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.java

@@ -0,0 +1,111 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING;
+
+import android.content.Context;
+
+import com.elegant.utils.UiThreadHandler;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.constants.HostConst;
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.network.MoGoRetrofitFactory;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.breakpoint.Config;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.AppUtils;
+import com.mogo.eagle.core.utilcode.util.FileUtils;
+
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * @author lixiaopeng
+ * @description 获取升级信息
+ * @since: 3/25/22
+ */
+public class UpgradeAppNetWorkManager {
+    private static volatile UpgradeAppNetWorkManager requestNoticeManager;
+    private final UpgradeApiService mUpgradeApiService;
+    private static final String TAG = "Upgrade";
+
+    private UpgradeAppNetWorkManager() {
+        mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost())
+                .create(UpgradeApiService.class);
+    }
+
+    public static UpgradeAppNetWorkManager getInstance() {
+        if (requestNoticeManager == null) {
+            synchronized (UpgradeAppNetWorkManager.class) {
+                if (requestNoticeManager == null) {
+                    requestNoticeManager = new UpgradeAppNetWorkManager();
+                }
+            }
+        }
+        return requestNoticeManager;
+    }
+
+    /**
+     * 获取app升级信息
+     */
+    public void getAppUpgradeInfo(Context context, String mac, String screenType) {
+//        String sn = "X20202203105S688HZ";
+//        String mac = "48:b0:2d:3a:bc:78";
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        int versionCode = AppUtils.getAppVersionCode();
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getAppUpgradeInfo mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
+        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
+        RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
+        mUpgradeApiService.getUpgradeInfo(requestBody)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<UpgradeAppInfo>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                    }
+
+                    @Override
+                    public void onNext(@NonNull UpgradeAppInfo info) {
+                        if (info != null && info.result != null) {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
+                            if (info.result.getVersionCode() > versionCode) {
+                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType());
+                            } else {
+                                deleteApkFile();
+                            }
+                        } else {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "UpgradeAppInfo onNext info == null");
+                            deleteApkFile();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        deleteApkFile();
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+
+    }
+
+    /**
+     * 删除APK 相关的文件
+     */
+    private void deleteApkFile(){
+        UiThreadHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                FileUtils.delete(Config.downLoadPath);
+            }
+        });
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppRequest.java

@@ -0,0 +1,44 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+/**
+ * @author lixiaopeng
+ * @description 获取app升级信息
+ * @since: 11/15/21
+ */
+public class UpgradeAppRequest {
+    private String mac;
+    private String sn;
+    private String screenType;
+
+
+    public UpgradeAppRequest( String sn, String mac, String screenType) {
+        this.sn = sn;
+        this.mac = mac;
+        this.screenType = screenType;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getMac() {
+        return mac;
+    }
+
+    public void setMac(String mac) {
+        this.mac = mac;
+    }
+
+    public String getScreenType() {
+        return screenType;
+    }
+
+    public void setScreenType(String screenType) {
+        this.screenType = screenType;
+    }
+
+}

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

@@ -1,12 +1,18 @@
-package com.zhjt.mogo_core_function_devatools.upgrade.network
+package com.zhjt.mogo_core_function_devatools.upgrade
 
 import com.mogo.commons.debug.DebugConfig
 
-class HostConst {
+/**
+ * @author XuXinChao
+ * @description 工控机升级域名管理
+ * @since: 2022/5/17
+ */
+class UpgradeHostConst {
 
-    companion object {
-        private const val HOST_DEV = "http://myflow.ee-private-dev.myghost.zhidaoauto.com"
-        private const val HOST_RELEASE = "https://myflow.zhidaoauto.com"
+    companion object{
+
+        private const val HOST_DEV = "http://mysunflower-qa.zhidaoauto.com"
+        private const val HOST_RELEASE = "http://mysunflower.zhidaoauto.com"
 
         fun getBaseUrl(): String {
             return when (DebugConfig.getNetMode()) {

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

@@ -1,18 +1,22 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
 import android.content.Context
-import android.util.Log
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
+import com.elegant.utils.UiThreadHandler
+import com.mogo.eagle.core.data.obu.MogoObuConst
+import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateStatusBarDownloadView
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
 import com.mogo.eagle.core.utilcode.breakpoint.Config
-import com.mogo.eagle.core.utilcode.breakpoint.Config.DOWN_LOAD_TAG
 import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
 import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
 import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils
 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.util.AppUtils
-import com.zhjt.mogo_core_function_devatools.upgrade.network.UpgradeVersionNetWorkModel
+import com.mogo.eagle.core.utilcode.util.ZipUtils
+import java.io.IOException
 
 class UpgradeManager : IDownload {
 
@@ -25,32 +29,23 @@ class UpgradeManager : IDownload {
         }
     }
 
-    private val upgradeVersionNetWorkModel = UpgradeVersionNetWorkModel()
     private var map: Map<String, String>? = null
-    private var version: String? = null
-
-    fun getPackageUrls(version: String) {
-        this.version = version
-        upgradeVersionNetWorkModel.requestUpgradeVersionUrls(version, onSuccess = {
-            map = it
-            CallerDevaToolsListenerManager.invokeDevaToolsUpgradeVersionUrls(map)
-        }, onError = {
-            CallerLogger.e("$M_DEVA$TAG", " getPackageUrls error: $it")
-        })
-    }
+    private var mDownloadFileName: String? = null
 
     fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) {
-//        val downLoadUrl = map?.get(downLoadKey)
-//        downLoadUrl?.let {
+        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "UpgradeManager downLoadPackage = " + downloadUrl?.contains(".zip") + "----downloadKey = $downloadKey  ---downloadUrl = $downloadUrl")
+        if (downloadUrl?.contains(".zip")) {
+            mDownloadFileName = downloadKey
+        }
+
         DownloadUtils.downLoad(
             context,
             downloadUrl,
-            Config.downLoadPath,
+            if (downloadUrl?.contains(".zip"))  Config.downLoadObuPath else Config.downLoadPath,
             downloadKey,
             5,
             this
         )
-//        }
     }
 
     override fun onStart(downloadUrl: String?) {
@@ -93,7 +88,7 @@ class UpgradeManager : IDownload {
     }
 
     override fun onFinished(downloadUrl: String?, threadBean: ThreadBean?) {
-        if (downloadUrl != null) {
+        if (downloadUrl != null) { //TODO 需要判断是否是apk文件
             AppUtils.installApp(Config.downLoadPath + downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1))
         }
         if (downloadUrl != null) {
@@ -129,4 +124,73 @@ class UpgradeManager : IDownload {
             }
         }
     }
+
+    /**
+     * 鹰眼app下载监听
+     */
+    fun updateUpgradeProgress(context: Context) {
+        CallerDevaToolsUpgradeListenerManager.addListener(
+            TAG,
+            object : IMogoDevaToolsUpgradeListener {
+                override fun onStart(url: String?) {}
+                override fun onPause(url: String?) {}
+                override fun onProgress(url: String?, length: Int) {
+                    updateStatusBarDownloadView(true, "download", length)
+                }
+
+                override fun onFinished(url: String?) {
+                    UiThreadHandler.postDelayed({
+                        updateStatusBarDownloadView(false, "download", 100)
+                    }, 1000)
+                }
+
+                override fun onError(url: String?, errorMsg: String?) {
+                }
+            })
+    }
+
+    /**
+     * obu升级包下载监听
+     */
+    fun updateObuUpgradeStatus(context: Context) {
+        CallerDevaToolsUpgradeListenerManager.addListener(
+            TAG,
+            object : IMogoDevaToolsUpgradeListener {
+                override fun onStart(url: String?) {}
+                override fun onPause(url: String?) {}
+                override fun onProgress(url: String?, length: Int) {
+                }
+
+                override fun onFinished(url: String?) {
+                    //下载完成，解压文件
+                    try {
+                        val files = ZipUtils.unzipFile(Config.downLoadObuPath + mDownloadFileName, Config.downLoadUnzipObuPath)
+                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} -----files = $files ")
+                        //1传给obu升级,升级成功，2需要删除相应文件夹
+                        var md5Path = ""
+                        var tarPath = ""
+                        for (f in files) {
+                            if (f.path.contains(".md5")) {
+                                md5Path = f.path
+                            }
+                            if (f.path.contains(".gz")) {
+                                tarPath = f.path
+                            }
+                        }
+                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ")
+                        CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath))
+                    } catch (e: IOException) {
+                        //解压失败,删除文件夹
+                        CallerObuApiManager.deleteObuFile()
+                        e.printStackTrace()
+                    }
+                }
+
+                override fun onError(url: String?, errorMsg: String?) {
+                    //下载失败，删除文件夹
+                    CallerObuApiManager.deleteObuFile()
+                }
+            })
+    }
+
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionApiService.kt

@@ -1,12 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.upgrade.network
-
-import com.mogo.eagle.core.data.Response
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface UpgradeVersionApiService {
-
-    @GET("/backend/app/getApkInfo")
-    suspend fun getUpgradeVersion(@Query("fileName") versionName: String): Response<Any>
-
-}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/network/UpgradeVersionNetWorkModel.kt

@@ -1,47 +0,0 @@
-package com.zhjt.mogo_core_function_devatools.upgrade.network
-
-import com.mogo.eagle.core.data.Response
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.eagle.core.network.apiResponseCall
-import com.mogo.eagle.core.network.request
-
-class UpgradeVersionNetWorkModel {
-
-    private fun getNetWorkApi(baseUrl: String = HostConst.getBaseUrl()): UpgradeVersionApiService {
-        return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
-            .create(UpgradeVersionApiService::class.java)
-    }
-
-    fun requestUpgradeVersionUrls(
-        versionName: String,
-        onSuccess: ((Map<String, String>) -> Unit),
-        onError: ((String) -> Unit)
-    ) {
-        request<Response<Any?>> {
-            loader {
-                apiResponseCall {
-                    getNetWorkApi().getUpgradeVersion(
-                        versionName
-                    )
-                }
-            }
-            onSuccess {
-                if (it.data != null) {
-                    val jsonData = it.data.toString()
-                    val map = mutableMapOf<String, String>()
-                    jsonData.split(",").forEach { data ->
-                        val array = data.split("=")
-                        map[array[0]] = array[1]
-                    }
-                    onSuccess.invoke(map)
-                } else {
-                    onError.invoke("没有获取到最新版本信息")
-                }
-            }
-            onError {
-                onError.invoke(it.message ?: "获取最新版本信息失败")
-            }
-        }
-    }
-
-}

core/function-impl/mogo-core-function-devatools/src/main/proto/apm_env.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "com.zhjt.mogo_core_function_devatools.apm.generated";
+
+
+message ApmEnv {
+
+  /**
+   * 构建类型： release:1; debug:0
+   */
+  string buildType     = 1;
+
+  /**
+   * 网络类型: 1:dev; 2: qa; 3: online; 4: demo
+   */
+  string netType       = 2;
+  /**
+   * docker版本
+   */
+  string dockerVersion = 3;
+
+  /**
+   * 是否重启了应用
+   */
+  bool isRelaunchApp   = 4;
+}

core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_report_detail.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tvReportTime"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tvReportSrc"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+    <TextView
+        android:id="@+id/tvReportLevel"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tvReportMsg"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tvReportCode"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tvReportResult"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tvReportActions"
+        android:textColor="#1A1A1A"
+        android:textSize="24dp"
+        android:layout_margin="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#F0F0F0" />
+
+</LinearLayout>

core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_report_list.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="840dp"
+    android:layout_height="584dp"
+    android:orientation="vertical"
+    >
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_drag"
+        android:padding="15dp"
+        android:layout_gravity="center_horizontal"
+        />
+
+    <com.mogo.eagle.core.widget.RoundConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#3B4577"
+        app:roundLayoutRadius="10dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_report_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </com.mogo.eagle.core.widget.RoundConstraintLayout>
+
+</LinearLayout>