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

2023-03-03 10:46:39 +08:00
parent a1dafa0427 1080307662
commit e4f0e4be87
197 changed files with 593 additions and 1025 deletions
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
@@ -3,14 +3,14 @@ package com.mogo.eagle.core.function.call.autopilot
 import android.os.SystemClock
 import chassis.SpecialVehicleTaskCmdOuterClass
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.mogo.eagle.core.data.EnvConfig
-import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.deva.chain.ChainLogParam
@@ -148,6 +148,13 @@ object CallerDevaToolsManager {
        devaToolsProviderApi?.showBadCaseManagerView(context)
    }

+    /**
+     * 工控机异常上报列表
+     */
+    fun showReportListWindow(context: Context,isShow: Boolean){
+        devaToolsProviderApi?.showReportListWindow(context,isShow)
+    }
+
    /**
     * 下载指定包
     */
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
@@ -3,14 +3,14 @@ package com.mogo.eagle.core.function.call.hmi
 import android.content.Context
 import android.view.ViewGroup
 import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.map.Infrastructure
-import com.mogo.eagle.core.data.notice.NoticeNormalData
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener

@@ -165,19 +165,6 @@ object CallerHmiManager {
        hmiProviderApi?.dismissDispatchDialog()
    }

-    /**
-     * 展示工控机监控上报数据
-     * @param errorReportList 错误级别上报数据列表
-     * @param warningReportList 提醒级别上报数据列表
-     * @param reportLevel 1:error级别  2:warning级别
-     */
-    fun showIPCReportWindow(
-        errorReportList: ArrayList<ReportEntity>,
-        warningReportList: ArrayList<ReportEntity>,
-        reportLevel: Int
-    ) {
-        hmiProviderApi?.showIPCReportWindow(errorReportList, warningReportList, reportLevel)
-    }

    fun showVideoDialog(infList: List<Infrastructure>) {
        hmiProviderApi?.showVideoDialog(infList)
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/mofang/CallerMofangListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/mofang/CallerMofangListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.mofang

-import com.mogo.eagle.core.function.api.mofang.IMoGoMoFangListener
+import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangListener
 import com.mogo.eagle.core.function.call.base.CallerBase

 /**
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.call.obu

 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuProvider
 import com.mogo.eagle.core.function.call.base.CallerBase

 /**
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuConnectListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuConnectListenerManager.kt
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.call.obu

 import com.mogo.eagle.core.data.obu.ObuStatusInfo
-import com.mogo.eagle.core.function.api.obu.IMoGoObuConnectListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuConnectListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.util.GsonUtils

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuInfoListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuInfoListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuInfoListener
 import com.mogo.eagle.core.function.call.base.CallerBase

 /**
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuLocationWGS84Listener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuLocationWGS84Listener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import mogo.telematics.pad.MessagePad

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningMapListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningMapListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.ObuScene

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuSaveMessageListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuSaveMessageListenerManager.kt
@@ -1,8 +1,8 @@
 package com.mogo.eagle.core.function.call.obu

 import com.mogo.eagle.core.data.enums.DataSourceType
-import com.mogo.eagle.core.function.api.obu.IMoGoObuSaveMessageListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsiListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuSaveMessageListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRsiListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.ObuScene

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningListenerManager.kt
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.call.obu

 import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuStatusListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import mogo.telematics.pad.MessagePad

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsiListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsiListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsiListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRsiListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.ObuScene

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsmListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsmListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsmListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRsmListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.ObuScene

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRvListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRvListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRvListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRvListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.model.MogoObuRvWarningData

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningSpatListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningSpatListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obu

-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningSpatListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningSpatListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.support.obu.ObuScene

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obucombine/CallerObuDcCombineListenerManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.call.obucombine

-import com.mogo.eagle.core.function.api.obucombine.IMoGoObuDcCombineListener
+import com.mogo.eagle.core.function.api.datacenter.obu.obucombine.IMoGoObuDcCombineListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import mogo.v2x.ObuWarningEvent
 import java.util.concurrent.ConcurrentHashMap
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt
@@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.call.v2x

 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
 import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.base.CallerBase

--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerV2XWarningListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerV2XWarningListenerManager.kt
@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.call.v2x

 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.eagle.core.function.api.v2x.IV2XEventListener
+import com.mogo.eagle.core.function.api.hmi.warning.IV2XEventListener
 import com.mogo.eagle.core.function.call.base.CallerBase

 object CallerV2XWarningListenerManager : CallerBase<IV2XEventListener>() {