Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java

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

@@ -1,10 +1,11 @@
 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.eagle.core.data.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
@@ -12,23 +13,24 @@ import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
+import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager
 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.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.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.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
@@ -38,12 +40,17 @@ class DevaToolsProvider : IDevaToolsProvider {
     }
 
     override fun initBiz() {
-        ttsManager.initTts(mContext!!)
+        ttsManager.initTts(mContext!!) //todo
+        //链路相关
         traceManager.init(mContext!!)
         bizConfigCenter.init(mContext!!)
         FuncConfigImpl.init()
         MogoLogCatchManager.init(mContext!!)
-        MoFangManager.INSTANCE.init(mContext!!)
+
+        //升级(鹰眼/工控)与监控服务
+        iPCReportManager.initServer()
+        moFangManager.init(mContext!!)
+        bindingCarManager.init(mContext!!)
     }
 
     override fun startLogCatch() {
@@ -70,7 +77,6 @@ class DevaToolsProvider : IDevaToolsProvider {
         return traceManager.getTraceInfo()
     }
 
-    @SuppressLint("NewApi")
     override fun refreshTraceInfo(map: HashMap<Int, ChainLogParam>) {
         traceManager.refreshTraceInfo(map)
     }
@@ -99,20 +105,20 @@ 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) {
         BadCaseManager.showBadCaseConfigWindow(ctx)
     }
 
-    override fun getUpgradeVersionUrls(versionName: String) {
-        upgradeManager.getPackageUrls(versionName)
-    }
-
-    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 showStatusBar(ctx: Context, container: ViewGroup) {
@@ -135,4 +141,25 @@ class DevaToolsProvider : IDevaToolsProvider {
     override fun syncConfig() {
         traceManager.syncConfig()
     }
+
+    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()
+    }
+
 }

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

@@ -7,31 +7,19 @@ import android.view.View
 import android.view.WindowManager
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle.Event
-import androidx.lifecycle.Lifecycle.Event.ON_CREATE
-import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
-import com.mogo.eagle.core.data.msgbox.RecordBagMsg
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager
-import com.mogo.eagle.core.utilcode.kotlin.PX
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
-import com.mogo.eagle.core.utilcode.kotlin.onClick
 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.reminder.Reminder
-import com.mogo.eagle.core.utilcode.reminder.api.IReminder
-import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IGlobalStateChangeListener
 import com.mogo.eagle.core.utilcode.util.*
 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.badcase.repository.net.api.entity.BadCaseResponse.Reason
 import com.zhjt.mogo_core_function_devatools.ext.enqueuePop
-import com.zhjt.mogo_core_function_devatools.ext.toast
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import me.jessyan.autosize.utils.AutoSizeUtils
@@ -47,7 +35,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
 
@@ -85,15 +74,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
         }
     }
@@ -101,37 +95,40 @@ 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) {
+        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("请勿连续点击，稍后再试")
             }
 
@@ -141,46 +138,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) {
                     }
 
@@ -202,7 +201,6 @@ internal object BadCaseManager : LifecycleEventObserver {
 }
 
 
-
 internal fun RecordPanelOuterClass.RecordPanel.toRecord(): AutoPilotRecord =
     AutoPilotRecord().also {
         it.id = this.id

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

@@ -10,10 +10,10 @@ 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.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 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.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
@@ -29,7 +29,6 @@ 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,16 +107,17 @@ 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(
             99,
@@ -123,7 +126,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
             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,7 +353,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
+    override fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo?) {
         latitude = gnssInfo?.latitude
         longitude = gnssInfo?.longitude
     }

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/CaseTopicListDialog.java

@@ -70,9 +70,9 @@ public class CaseTopicListDialog extends Dialog implements IMoGoAutopilotRecordL
         initEvent();
         //获取所有Topic
         CallerAutoPilotManager.INSTANCE.getBadCaseConfig(1, 0, new ArrayList<>());
-        if(recordType!=null){
+        if (recordType != null) {
             tvCaseName.setText(recordType.getDesc());
-            if(recordType.getTopicsList().size()>0){
+            if (recordType.getTopicsList().size() > 0) {
                 topicListAdapter.setData(recordType.getTopicsList());
                 topicListAdapter.notifyDataSetChanged();
             }
@@ -90,8 +90,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;
         }
     }
@@ -108,9 +108,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);
             }
         });
@@ -132,15 +132,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));
                         }
                     }
@@ -151,7 +151,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());
@@ -159,11 +159,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 = CallerAutoPilotManager.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);
@@ -171,7 +171,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

@@ -14,10 +14,10 @@ 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.RecordCaseEntity
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 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.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
@@ -38,8 +38,6 @@ import kotlinx.coroutines.launch
 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.*
 
 
@@ -49,7 +47,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"
@@ -79,15 +77,17 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
     private lateinit var tvInitiativeCancel: TextView
 
     private var audioStatus = false
-    private var audioFileName:String?=null //录音文件名称
+    private var audioFileName: String? = null //录音文件名称
 
     private var uploadReason: StringBuilder = StringBuilder() //上报原因，标签
+
     @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 var mInViewX = 0f
     private var mInViewY = 0f
@@ -107,8 +107,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
     }
 
     @SuppressLint("SetTextI18n")
-    private fun initFloatWindow(){
-        mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.view_initiative_bad_case, null) as View
+    private fun initFloatWindow() {
+        mFloatLayout =
+            LayoutInflater.from(mActivity).inflate(R.layout.view_initiative_bad_case, null) as View
         mFloatLayout.setOnTouchListener(this)
 
         tvInitiativeNum = mFloatLayout.findViewById(R.id.tvInitiativeNum)
@@ -127,54 +128,56 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
 
         tvInitiativeReport = mFloatLayout.findViewById(R.id.tvInitiativeReport)
         tvInitiativeCancel = mFloatLayout.findViewById(R.id.tvInitiativeCancel)
-        if(BadCaseConfig.windowNum<1){
+        if (BadCaseConfig.windowNum < 1) {
             BadCaseConfig.windowNum = 1
         }
         tvInitiativeNum.text = BadCaseConfig.windowNum.toString()
         BadCaseConfig.windowNum++
-        tvInitiativeTime.text = "时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
+        tvInitiativeTime.text =
+            "时间：${millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())}"
         tvInitiativeIdentity.text = "身份：${BadCaseConfig.identity}"
 
         //采集结果回调监听
-        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)
         viewAudioButton.setOnClickListener {
             audioStatus = !audioStatus
             setAudio(audioStatus)
         }
 
         tvInitiativeReport.setOnClickListener {
-            if(!rbOne.isChecked && !rbTwo.isChecked && !rbThree.isChecked &&
-                !rbFour.isChecked && !rbFive.isChecked && !rbSix.isChecked){
+            if (!rbOne.isChecked && !rbTwo.isChecked && !rbThree.isChecked &&
+                !rbFour.isChecked && !rbFive.isChecked && !rbSix.isChecked
+            ) {
                 TipToast.shortTip("请选择至少一个Case")
                 return@setOnClickListener
             }
-            if(rbOne.isChecked){
+            if (rbOne.isChecked) {
                 uploadReason.append("严重画龙 ")
             }
-            if(rbTwo.isChecked){
+            if (rbTwo.isChecked) {
                 uploadReason.append("速度过慢 ")
             }
-            if(rbThree.isChecked){
+            if (rbThree.isChecked) {
                 uploadReason.append("感知、定位、地图等其他 ")
             }
-            if(rbFour.isChecked){
+            if (rbFour.isChecked) {
                 uploadReason.append("速度过快 ")
             }
-            if(rbFive.isChecked){
+            if (rbFive.isChecked) {
                 uploadReason.append("存在碰撞风险 ")
             }
-            if(rbSix.isChecked){
+            if (rbSix.isChecked) {
                 uploadReason.append("点刹、顿挫")
             }
-            if(audioStatus){
+            if (audioStatus) {
                 audioStatus = !audioStatus
                 setAudio(audioStatus)
                 Handler().postDelayed({
-                   uploadAudio()
-                },1000)
-            }else{
+                    uploadAudio()
+                }, 1000)
+            } else {
                 uploadAudio()
             }
         }
@@ -197,10 +200,10 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         }
     }
 
-    var countDownTimer: CountDownTimer?=null
+    var countDownTimer: CountDownTimer? = null
 
-    private fun setAudio(status: Boolean){
-        if(status){
+    private fun setAudio(status: Boolean) {
+        if (status) {
             //开始录音
             audioFileName = "Audio_${System.currentTimeMillis()}_BadCase"
             RecordManager.getInstance().start(audioFileName)
@@ -208,11 +211,11 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_select)
             tvAudioCountDown.visibility = View.VISIBLE
             //开始倒计时
-            if(countDownTimer==null){
+            if (countDownTimer == null) {
                 countDownTimer = object : CountDownTimer(60000, 1000) {
 
                     override fun onTick(millisUntilFinished: Long) {
-                        tvAudioCountDown.text = "${millisUntilFinished/1000}S"
+                        tvAudioCountDown.text = "${millisUntilFinished / 1000}S"
                     }
 
                     override fun onFinish() {
@@ -225,7 +228,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                 }
                 countDownTimer?.start()
             }
-        }else{
+        } else {
             //结束倒计时
             countDownTimer?.cancel()
             countDownTimer?.onFinish()
@@ -235,11 +238,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
 
     }
 
-    private fun uploadAudio(){
+    private fun uploadAudio() {
         val singlePath = "/mnt/sdcard/mogo/DataCollection/${audioFileName}.wav"
         val file = File(singlePath)
-        if(file.exists()){
-            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,"Audio",singlePath,
+        if (file.exists()) {
+            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,
+                "Audio",
+                singlePath,
                 object : OnUploadListener {
                     override fun onUploadSuccess(filePath: String, downloadUrl: String) {
                         CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
@@ -255,7 +260,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                         removeUploadListener(singlePath)
                     }
                 })
-        }else{
+        } else {
             //上传到服务器
             upload(null)
         }
@@ -265,7 +270,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
      * 将语音文件上传Cos监听移除
      * @param filePath 文件路径
      */
-    private fun removeUploadListener(filePath: String){
+    private fun removeUploadListener(filePath: String) {
         val pkgInfo: List<String> = filePath.substring(
             filePath.lastIndexOf("/") + 1,
             filePath.lastIndexOf(".")
@@ -278,21 +283,21 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
      * 将记录上传到服务器
      * @param downloadUrl 语音文件下载地址
      */
-    private fun upload(downloadUrl: String?){
-        GlobalScope.launch{
+    private fun upload(downloadUrl: String?) {
+        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["reason"] = uploadReason.toString()?:"" //采集原因
+                itx["key"] = recordKey ?: "" //key
+                itx["reason"] = uploadReason.toString() ?: "" //采集原因
                 itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
                 itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
                 itx["channel"] = "1" //渠道
                 itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
                 itx["userRole"] = BadCaseConfig.identity //采集者角色
-                itx["audioUrl"] = downloadUrl?:"" //音频COS地址
-                itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
+                itx["audioUrl"] = downloadUrl ?: "" //音频COS地址
+                itx["mapVersion"] = BadCaseConfig.dockerVersion ?: "" //工控机版本
                 itx["eyeVersion"] = AppUtils.getAppVersionName() //鹰眼版本
                 itx["coordinate"] = "latitude:${latitude};longitude:${longitude}" //坐标
 
@@ -341,12 +346,19 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-950
             mWindowManager!!.addView(mFloatLayout, mWindowParams)
             //开启录包
-            if(recordCaseEntity!=null){
-                CallerAutoPilotManager.recordPackage(recordCaseEntity.caseId,Random(SystemClock.elapsedRealtime()).nextInt(),
-                    BadCaseConfig.totalDuration, BadCaseConfig.previousDuration,recordCaseEntity.topicList)
-            }else{
-                CallerAutoPilotManager.recordPackage(BadCaseConfig.type,Random(SystemClock.elapsedRealtime()).nextInt(),
-                    BadCaseConfig.totalDuration, BadCaseConfig.previousDuration)
+            if (recordCaseEntity != null) {
+                CallerAutoPilotManager.recordPackage(
+                    recordCaseEntity.caseId,
+                    Random(SystemClock.elapsedRealtime()).nextInt(),
+                    BadCaseConfig.totalDuration,
+                    BadCaseConfig.previousDuration,
+                    recordCaseEntity.topicList
+                )
+            } else {
+                CallerAutoPilotManager.recordPackage(
+                    BadCaseConfig.type, Random(SystemClock.elapsedRealtime()).nextInt(),
+                    BadCaseConfig.totalDuration, BadCaseConfig.previousDuration
+                )
             }
         }
     }
@@ -355,18 +367,18 @@ 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)
     }
 
     override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
         CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel")
         ThreadUtils.runOnUiThread {
-            if(recordKey==null){
+            if (recordKey == null) {
                 recordKey = recordPanel.key.toString()
                 BadCaseConfig.recordKeyList.add(recordPanel.key)
             }
-            if(recordFileName==null){
+            if (recordFileName == null) {
                 recordFileName = recordPanel.filename
             }
         }
@@ -381,7 +393,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
+    override fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo?) {
         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

@@ -7,7 +7,6 @@ import android.graphics.PixelFormat
 import android.os.CountDownTimer
 import android.os.Handler
 import android.util.DisplayMetrics
-import android.util.Log
 import android.view.*
 import android.widget.CheckBox
 import android.widget.CompoundButton
@@ -17,10 +16,9 @@ import com.google.android.flexbox.FlexboxLayout
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
-import com.mogo.eagle.core.data.msgbox.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.CallerAutopilotCarStatusListenerManager
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+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
@@ -29,17 +27,16 @@ import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.upload.OnUploadListener
+import com.zhidao.loglib.upload.UploadManager
 import com.zhjt.mogo_core_function_devatools.R
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import com.zhjt.mogo_core_function_devatools.badcase.record.RecordManager
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import mogo.telematics.pad.MessagePad
-import com.zhidao.loglib.upload.UploadManager
 import me.jessyan.autosize.utils.AutoSizeUtils
+import mogo.telematics.pad.MessagePad
 import org.greenrobot.eventbus.EventBus
 import java.io.File
-import java.lang.reflect.Field
 
 /**
  * @author XuXinChao
@@ -47,7 +44,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"
@@ -59,14 +56,14 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
     private lateinit var mFloatLayout: View
 
     private var audioStatus = false
-    private var audioFileName:String?=null //录音文件名称
+    private var audioFileName: String? = null //录音文件名称
 
     private var uploadReason: String = String() //上报原因，标签
-    private var recordKey: String?=null //录制bag包key
-    private var recordFileName: String?=null //录制文件包名
-    private var boxBean: MsgBoxBean ?= null
-    private var longitude: Double?=null
-    private var latitude: Double?=null
+    private var recordKey: String? = null //录制bag包key
+    private var recordFileName: String? = null //录制文件包名
+    private var boxBean: MsgBoxBean? = null
+    private var longitude: Double? = null
+    private var latitude: Double? = null
 
     private var mInViewX = 0f
     private var mInViewY = 0f
@@ -76,7 +73,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
     private var mInScreenY = 0f
 
     private var clickListener: ClickListener? = null
-    var countDownTimer: CountDownTimer?=null
+    var countDownTimer: CountDownTimer? = null
 
     private lateinit var tvPassiveNum: TextView
     private lateinit var tvPassiveTime: TextView
@@ -99,8 +96,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
     }
 
     @SuppressLint("SetTextI18n")
-    private fun initFloatWindow(){
-        mFloatLayout = LayoutInflater.from(mActivity).inflate(R.layout.view_passive_bad_case, null) as View
+    private fun initFloatWindow() {
+        mFloatLayout =
+            LayoutInflater.from(mActivity).inflate(R.layout.view_passive_bad_case, null) as View
         mFloatLayout.setOnTouchListener(this)
         tvPassiveNum = mFloatLayout.findViewById(R.id.tvPassiveNum)
         tvPassiveTime = mFloatLayout.findViewById(R.id.tvPassiveTime)
@@ -110,32 +108,33 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         tvPassiveReport = mFloatLayout.findViewById(R.id.tvPassiveReport)
         tvPassiveCancel = mFloatLayout.findViewById(R.id.tvPassiveCancel)
         flReasonLayout = mFloatLayout.findViewById(R.id.flReasonLayout)
-        if(BadCaseConfig.windowNum<1){
+        if (BadCaseConfig.windowNum < 1) {
             BadCaseConfig.windowNum = 1
         }
         tvPassiveNum.text = BadCaseConfig.windowNum.toString()
         BadCaseConfig.windowNum++
-        tvPassiveTime.text = "时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
+        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)
         }
 
         tvPassiveReport.setOnClickListener {
-            if(uploadReason.isEmpty()){
+            if (uploadReason.isEmpty()) {
                 TipToast.shortTip("请选择至少一个Case")
                 return@setOnClickListener
             }
-            if(audioStatus){
+            if (audioStatus) {
                 audioStatus = !audioStatus
                 setAudio(audioStatus)
                 Handler().postDelayed({
                     uploadAudio()
-                },1000)
-            }else{
+                }, 1000)
+            } else {
                 uploadAudio()
             }
             //删除记录
@@ -163,8 +162,8 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         }
     }
 
-    private fun setAudio(status: Boolean){
-        if(status){
+    private fun setAudio(status: Boolean) {
+        if (status) {
             //开始录音
             audioFileName = "Audio_${System.currentTimeMillis()}_BadCase"
             RecordManager.getInstance().start(audioFileName)
@@ -172,11 +171,11 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
             viewAudioButton.setImageResource(R.drawable.icon_bad_case_audio_select)
             tvAudioCountDown.visibility = View.VISIBLE
             //开始倒计时
-            if(countDownTimer==null){
+            if (countDownTimer == null) {
                 countDownTimer = object : CountDownTimer(60000, 1000) {
 
                     override fun onTick(millisUntilFinished: Long) {
-                        tvAudioCountDown.text = "${millisUntilFinished/1000}S"
+                        tvAudioCountDown.text = "${millisUntilFinished / 1000}S"
                     }
 
                     override fun onFinish() {
@@ -189,7 +188,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                 }
                 countDownTimer?.start()
             }
-        }else{
+        } else {
             //结束倒计时
             countDownTimer?.cancel()
             countDownTimer?.onFinish()
@@ -199,11 +198,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
 
     }
 
-    private fun uploadAudio(){
+    private fun uploadAudio() {
         val singlePath = "/mnt/sdcard/mogo/DataCollection/${audioFileName}.wav"
         val file = File(singlePath)
-        if(file.exists()){
-            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,"Audio",singlePath,
+        if (file.exists()) {
+            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,
+                "Audio",
+                singlePath,
                 object : OnUploadListener {
                     override fun onUploadSuccess(filePath: String, downloadUrl: String) {
                         CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl")
@@ -219,7 +220,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                         removeUploadListener(singlePath)
                     }
                 })
-        }else{
+        } else {
             //上传到服务器
             upload(null)
         }
@@ -229,7 +230,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
      * 将语音文件上传Cos监听移除
      * @param filePath 文件路径
      */
-    private fun removeUploadListener(filePath: String){
+    private fun removeUploadListener(filePath: String) {
         val pkgInfo: List<String> = filePath.substring(
             filePath.lastIndexOf("/") + 1,
             filePath.lastIndexOf(".")
@@ -242,21 +243,21 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
      * 将记录上传到服务器
      * @param downloadUrl 语音文件下载地址
      */
-    private fun upload(downloadUrl: String?){
-        GlobalScope.launch{
+    private fun upload(downloadUrl: String?) {
+        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"] = uploadReason //采集原因
                 itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
                 itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
                 itx["channel"] = "0" //渠道
                 itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
                 itx["userRole"] = BadCaseConfig.identity //采集者角色
-                itx["audioUrl"] = downloadUrl?:"" //音频COS地址
-                itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
+                itx["audioUrl"] = downloadUrl ?: "" //音频COS地址
+                itx["mapVersion"] = BadCaseConfig.dockerVersion ?: "" //工控机版本
                 itx["eyeVersion"] = AppUtils.getAppVersionName() //鹰眼版本
                 itx["coordinate"] = "latitude:${latitude};longitude:${longitude}" //坐标
 
@@ -308,28 +309,33 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
             // 默认固定位置，靠屏幕右边缘的中间
             mWindowManager!!.defaultDisplay.getMetrics(metrics)
             mWindowParams!!.x = metrics.widthPixels
-            mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-950
+            mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight() - 950
             mWindowManager!!.addView(mFloatLayout, mWindowParams)
         }
 
-        GlobalScope.launch{
+        GlobalScope.launch {
             presenter.loadBadCases(true).also {
                 ThreadUtils.runOnUiThread {
                     it.iterator().forEach {
                         val checkBox = CheckBox(mActivity)
                         checkBox.setTextColor(Color.WHITE)
-                        val lp = FlexboxLayout.LayoutParams(FlexboxLayout.LayoutParams.WRAP_CONTENT,
-                            FlexboxLayout.LayoutParams.WRAP_CONTENT)
-                        checkBox.buttonDrawable = mActivity.resources.getDrawable(R.drawable.badcase_radio_button_style)
-                        checkBox.setPadding(SizeUtils.dp2px(10f),
+                        val lp = FlexboxLayout.LayoutParams(
+                            FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                            FlexboxLayout.LayoutParams.WRAP_CONTENT
+                        )
+                        checkBox.buttonDrawable =
+                            mActivity.resources.getDrawable(R.drawable.badcase_radio_button_style)
+                        checkBox.setPadding(
                             SizeUtils.dp2px(10f),
                             SizeUtils.dp2px(10f),
-                            SizeUtils.dp2px(10f))
-                        checkBox.textSize = AutoSizeUtils.dp2px(mActivity,18f).toFloat()
+                            SizeUtils.dp2px(10f),
+                            SizeUtils.dp2px(10f)
+                        )
+                        checkBox.textSize = AutoSizeUtils.dp2px(mActivity, 18f).toFloat()
                         checkBox.text = it.reason
                         checkBox.isChecked = it.isChecked
                         checkBox.setOnCheckedChangeListener(this@PassiveBadCaseWindow)
-                        flReasonLayout.addView(checkBox,lp)
+                        flReasonLayout.addView(checkBox, lp)
                     }
                 }
             }
@@ -339,13 +345,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
 
     override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
         buttonView?.text?.let {
-            if(isChecked){
-                if(!uploadReason.contains(it)){
+            if (isChecked) {
+                if (!uploadReason.contains(it)) {
                     uploadReason += it
                 }
-            }else{
-                if(uploadReason.contains(it)){
-                    uploadReason = uploadReason.replace(it.toString(),"")
+            } else {
+                if (uploadReason.contains(it)) {
+                    uploadReason = uploadReason.replace(it.toString(), "")
                 }
             }
 
@@ -355,11 +361,11 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
 
     fun hideFloatWindow() {
         // 移除 ADAS车辆状态&定位 监听
-        CallerAutopilotCarStatusListenerManager.removeListener(TAG)
+        CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
         if (mFloatLayout.parent != null) mWindowManager!!.removeView(mFloatLayout)
     }
 
-    fun setRecord(msgBoxBean: MsgBoxBean){
+    fun setRecord(msgBoxBean: MsgBoxBean) {
         boxBean = msgBoxBean
         val recordBagMsg = (msgBoxBean.bean as RecordBagMsg)
         recordKey = recordBagMsg.key.toString()
@@ -374,7 +380,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
         fun closeWindow()
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
+    override fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo?) {
         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/RecordTemplateAdapter.kt

@@ -7,23 +7,22 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.data.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/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/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.bindingcar.BindingCarInfo;
+import com.mogo.eagle.core.data.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,163 @@
+package com.zhjt.mogo_core_function_devatools.binding
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.Log
+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.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
+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.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.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
+        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)) {
+            Log.d("Upgrade", "MoGoHandAdasMsgManager address = " + 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(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() + "")
+    }
+
+}

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

@@ -0,0 +1,177 @@
+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.eagle.core.data.bindingcar.BindingCarInfo
+import com.mogo.eagle.core.data.bindingcar.BindingCarRequest
+import com.mogo.eagle.core.data.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.CallerHDMapManager.changeCurrentIcon
+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
+    ) {
+//        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.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 onNext info.getData() =" + info.getData().toString()
+                        )
+                        //根据车辆类型切换不同的车辆模型,只针对红旗做处理
+                        updateCarVrIconRes(info.getData().brandId)
+                        when (info.getData().compare) {
+                            "0" -> showBindingcarDialog()
+                            "3" -> showModifyBindingcarDialog()
+                            "null" -> TipToast.shortTip("当前工控机没有入库")
+                        }
+                        SharedPrefsMgr.getInstance(context!!).putString(
+                            SharedPrefsConstants.CAR_INFO,
+                            GsonUtils.toJson(info.getData())
+                        )
+                    }
+                }
+
+                override fun onError(e: Throwable) {
+                    e(
+                        SceneConstant.M_BINDING + TAG,
+                        "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
+                    )
+                }
+
+                override fun onComplete() {}
+            })
+    }
+
+    /**
+     * 绑定和修改绑定车辆
+     * mac: 48:b0:2d:3a:9c:19
+     */
+    fun modifyBindingcar(
+        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?) {
+        if (brandId == null || brandId.isEmpty()) {
+            return
+        }
+        d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId")
+        when (brandId) {
+            "1" -> {
+                changeCurrentIcon(R.raw.chuzuche)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
+            }
+            "2" -> {
+                changeCurrentIcon(R.raw.hq_h9)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9
+            }
+            "3" -> {
+                changeCurrentIcon(R.raw.xiaobache)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+            }
+            else -> {
+                changeCurrentIcon(R.raw.chuzuche)
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
+            }
+        }
+    }
+
+}

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/mofang/MoFangManager.kt

@@ -21,7 +21,7 @@ import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 class MoFangManager private constructor() {
 
     companion object {
-        val INSTANCE: MoFangManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
+        val moFangManager: MoFangManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
             MoFangManager()
         }
     }

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

@@ -0,0 +1,110 @@
+package com.zhjt.mogo_core_function_devatools.report
+
+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.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"
+
+    }
+
+    fun initServer(){
+        //乘客屏不显示监控信息弹窗,只在司机端提示
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            // 添加 ADAS状态 监听
+            CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        }
+    }
+
+    /**
+     *工控机监控节点上报
+     */
+    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)
+                CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
+            }
+
+//            //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/status/flow/can/CanImpl.kt

@@ -11,6 +11,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
+import com.mogo.eagle.core.function.api.autopilot.*
+import com.mogo.eagle.core.function.call.autopilot.*
+import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus
 import com.zhjt.mogo_core_function_devatools.status.flow.IFlow
 import kotlinx.coroutines.Dispatchers
@@ -21,8 +24,22 @@ import mogo_msg.MogoReportMsg.MogoReportMessage
 import planning.RoboSweeperTaskIndexOuterClass
 import system_master.SystemStatusInfo.StatusInfo
 import java.util.concurrent.atomic.AtomicInteger
+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"
@@ -33,8 +50,15 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
 
     override fun onCreate() {
         send(CanStatus(CallerAutoPilotManager.isConnected()))
-        CallerAutopilotVehicleStateListenerManager.addListener(TAG, this)
+
+        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?) {
@@ -119,13 +143,20 @@ internal class CanImpl(ctx: Context): IFlow<CanStatus>(ctx), IMoGoAutopilotVehic
         launch(Dispatchers.Unconfined) {
             delay(4000)
             send(CanStatus(isCanEnabled()))
-        }.also { job = it  }
+        }.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/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.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import mogo.telematics.pad.MessagePad.GnssInfo
 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,7 +41,7 @@ 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)
+        CallerChassisLocationWGS84ListenerManager.addListener(TAG, this)
         if (CallerAutoPilotManager.isConnected()) {
             check()
         }
@@ -78,7 +85,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
         }
     }
 
-    override fun onAutopilotCarStateData(gnssInfo: GnssInfo?) {
+    override fun onChassisLocationWGS84(gnssInfo: GnssInfo?) {
         if (isOldVersion.get()) {
             if (isRTKEnabled()) {
                 send(RTKStatus("RTK", 0))
@@ -95,7 +102,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
 
     private fun isRTKEnabled(): Boolean {
         val code = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageCode()
-        val gnssInfo = CallerAutopilotCarStatusListenerManager.getCurrentGnssInfo()
+        val gnssInfo = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
         return CallerAutoPilotManager.isConnected() && (
                 code != "EHW_RTK" &&
                         code != "EHW_GNSS" &&
@@ -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/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.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/UpgradeApiService.java

@@ -0,0 +1,28 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
+
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+import retrofit2.http.Body;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+
+/**
+ * @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,93 @@
+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.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.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.AppUtils;
+
+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 {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "UpgradeAppInfo onNext info == null");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+
+    }
+
+}

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,14 @@
 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.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
 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.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.AppUtils
-import com.zhjt.mogo_core_function_devatools.upgrade.network.UpgradeVersionNetWorkModel
 
 class UpgradeManager : IDownload {
 
@@ -25,23 +21,9 @@ 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")
-        })
-    }
 
     fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) {
-//        val downLoadUrl = map?.get(downLoadKey)
-//        downLoadUrl?.let {
         DownloadUtils.downLoad(
             context,
             downloadUrl,
@@ -50,7 +32,6 @@ class UpgradeManager : IDownload {
             5,
             this
         )
-//        }
     }
 
     override fun onStart(downloadUrl: String?) {

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 ?: "获取最新版本信息失败")
-            }
-        }
-    }
-
-}