[2.13.0-arch-opt] merge

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
-import com.mogo.eagle.core.data.deva.net.UrlConfig
+import com.mogo.eagle.core.data.app.UrlConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.launcher.BuildConfig

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt

@@ -3,7 +3,7 @@ package com.mogo.eagle.function.biz
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.eagle.core.data.camera.CameraEntity
+import com.mogo.eagle.core.data.biz.camera.CameraEntity
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.biz.IMoGoFuncBizProvider

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt

@@ -7,7 +7,7 @@ import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
@@ -228,64 +228,67 @@ class DispatchAutoPilotManager private constructor() :
     }
 
     private fun testEZhouStart() {
-        val adasAutoPilotLocReceiverBean = DispatchAdasAutoPilotLocReceiverBean(
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU,
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START,
-            "1",
-            26.825571122,
-            112.5762410415,
-            "起点---5号跑道",
-            26.825571122,
-            112.5762410415,
-            "终点---鄂州机场",
-            "5分钟",
-            "AR453航班",
-            "你车需执行编号ca1098次航班的引导任务，从A区A1到B区B1",
-            System.currentTimeMillis(),
-            ArrayList<MogoLatLng>()
-        )
+        val adasAutoPilotLocReceiverBean =
+            DispatchAdasAutoPilotLocReceiverBean(
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU,
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START,
+                "1",
+                26.825571122,
+                112.5762410415,
+                "起点---5号跑道",
+                26.825571122,
+                112.5762410415,
+                "终点---鄂州机场",
+                "5分钟",
+                "AR453航班",
+                "你车需执行编号ca1098次航班的引导任务，从A区A1到B区B1",
+                System.currentTimeMillis(),
+                ArrayList<MogoLatLng>()
+            )
         receiverBean = adasAutoPilotLocReceiverBean
         CallerHmiManager.showDispatchDialog(adasAutoPilotLocReceiverBean)
     }
 
     private fun testEZhouStop() {
-        val adasAutoPilotLocReceiverBean = DispatchAdasAutoPilotLocReceiverBean(
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU,
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP,
-            "1",
-            0.0,
-            0.0,
-            "",
-            0.0,
-            0.0,
-            "",
-            "",
-            "",
-            "",
-            System.currentTimeMillis(),
-            ArrayList<MogoLatLng>()
-        )
+        val adasAutoPilotLocReceiverBean =
+            DispatchAdasAutoPilotLocReceiverBean(
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU,
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP,
+                "1",
+                0.0,
+                0.0,
+                "",
+                0.0,
+                0.0,
+                "",
+                "",
+                "",
+                "",
+                System.currentTimeMillis(),
+                ArrayList<MogoLatLng>()
+            )
         receiverBean = adasAutoPilotLocReceiverBean
         CallerHmiManager.showDispatchDialog(adasAutoPilotLocReceiverBean)
     }
 
     private fun testHengYangStart() {
-        val adasAutoPilotLocReceiverBean = DispatchAdasAutoPilotLocReceiverBean(
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG,
-            DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START,
-            "2",
-            26.825571122,
-            112.5762410415,
-            "衡阳科学城",
-            26.825571122,
-            112.5762410415,
-            "衡阳首钢集团",
-            "",
-            "",
-            "",
-            System.currentTimeMillis(),
-            ArrayList<MogoLatLng>()
-        )
+        val adasAutoPilotLocReceiverBean =
+            DispatchAdasAutoPilotLocReceiverBean(
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG,
+                DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START,
+                "2",
+                26.825571122,
+                112.5762410415,
+                "衡阳科学城",
+                26.825571122,
+                112.5762410415,
+                "衡阳首钢集团",
+                "",
+                "",
+                "",
+                System.currentTimeMillis(),
+                ArrayList<MogoLatLng>()
+            )
         receiverBean = adasAutoPilotLocReceiverBean
         CallerHmiManager.showDispatchDialog(adasAutoPilotLocReceiverBean)
     }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/DispatchServiceModel.kt

@@ -6,8 +6,8 @@ import com.mogo.commons.context.ContextHolderUtil
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo.RouteModels
 import com.mogo.eagle.core.data.autopilot.AutopilotStatus
-import com.mogo.eagle.core.data.dispatch.ReportDispatchResult
-import com.mogo.eagle.core.data.dispatch.ReportedRoute
+import com.mogo.eagle.core.data.biz.dispatch.ReportDispatchResult
+import com.mogo.eagle.core.data.biz.dispatch.ReportedRoute
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.RequestOptions
 import com.mogo.eagle.core.network.SubscribeImpl
@@ -45,7 +45,10 @@ class DispatchServiceModel private constructor() {
         valuesBean.reason = reason
         autopilotStatus.values = valuesBean
         val sn = MoGoAiCloudClientConfig.getInstance().sn
-        val reportedRoute = ReportedRoute(sn, autopilotStatus.values)
+        val reportedRoute = ReportedRoute(
+            sn,
+            autopilotStatus.values
+        )
         val map: MutableMap<String, Any> = HashMap()
         map["sn"] = sn
         map["data"] = GsonUtil.jsonFromObject(reportedRoute)
@@ -75,7 +78,10 @@ class DispatchServiceModel private constructor() {
      */
     fun uploadAutopilotRoute(list: List<RouteModels?>?) {
         val sn = MoGoAiCloudClientConfig.getInstance().sn
-        val reportedRoute = ReportedRoute(sn, GsonUtil.jsonFromObject(list))
+        val reportedRoute = ReportedRoute(
+            sn,
+            GsonUtil.jsonFromObject(list)
+        )
         val map: MutableMap<String, String> = HashMap()
         map["sn"] = sn
         map["data"] = GsonUtil.jsonFromObject(reportedRoute)
@@ -109,7 +115,11 @@ class DispatchServiceModel private constructor() {
         onError: ((String) -> Unit)? = null
     ) {
         val sn = MoGoAiCloudClientConfig.getInstance().sn
-        val reportDispatchResult = ReportDispatchResult(sn, dispatchResultType)
+        val reportDispatchResult =
+            ReportDispatchResult(
+                sn,
+                dispatchResultType
+            )
         val map: MutableMap<String, Any> = HashMap()
         map["sn"] = sn
         map["data"] = GsonUtil.jsonFromObject(reportDispatchResult)

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt

@@ -5,8 +5,8 @@ import android.os.Looper
 import android.os.Message
 import com.mogo.commons.constants.HostConst
 import com.mogo.commons.utils.RetryWithDelay
-import com.mogo.eagle.core.data.camera.CameraEntity
-import com.mogo.eagle.core.data.camera.ReqLiveCarBean
+import com.mogo.eagle.core.data.biz.camera.CameraEntity
+import com.mogo.eagle.core.data.biz.camera.ReqLiveCarBean
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/net/ICameraListServices.kt

@@ -1,6 +1,6 @@
 package com.mogo.eagle.function.biz.monitoring.net
 
-import com.mogo.eagle.core.data.camera.*
+import com.mogo.eagle.core.data.biz.camera.*
 import io.reactivex.Observable
 import io.reactivex.Single
 import retrofit2.http.*

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt

@@ -5,13 +5,13 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
-import com.mogo.eagle.core.data.notice.NoticeNormalData
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import java.lang.Class
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.data.msgbox.NoticeFrCloudMsg
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.network.utils.GsonUtil
 
 /**

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/INoticeApiService.java

@@ -1,8 +1,8 @@
 package com.mogo.eagle.function.biz.notice.network;
 
 import com.mogo.eagle.core.data.BaseData;
-import com.mogo.eagle.core.data.notice.NoticeNormalDetail;
-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalDetail;
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStyleInfo;
 
 import java.util.Map;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/network/NoticeNetWorkManager.java

@@ -6,9 +6,9 @@ import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.commons.constants.HostConst;
 import com.mogo.eagle.core.data.BaseData;
-import com.mogo.eagle.core.data.notice.NoticeNormalDetail;
-import com.mogo.eagle.core.data.notice.NoticeRequest;
-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalDetail;
+import com.mogo.eagle.core.data.biz.notice.NoticeRequest;
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStyleInfo;
 
 import com.mogo.eagle.core.function.api.biz.IMoGoNoticeNetCallBack;
 import com.mogo.eagle.core.network.utils.GsonUtil;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.data.obu.MogoObuConst
-import com.mogo.eagle.core.function.api.obu.IMoGoObuSaveMessageListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuSaveMessageListener
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.obu.CallerObuSaveMessageListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt

@@ -1,6 +1,7 @@
 package com.mogo.eagle.function.biz.v2x.redlightwarning
 
 import android.util.Log
+import com.mogo.eagle.core.data.biz.trafficlight.*
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP_GREEN
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
@@ -10,8 +11,7 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
-import com.mogo.eagle.core.data.trafficlight.*
-import com.mogo.eagle.core.data.trafficlight.TrafficLightStatusHelper.getCurrentRoadTrafficLight
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightStatusHelper.getCurrentRoadTrafficLight
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt

@@ -3,8 +3,11 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.core
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
+import com.mogo.eagle.core.data.biz.trafficlight.RoadIDResult
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightControl
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.isInRange
 import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightApiService.kt

@@ -1,9 +1,9 @@
 package com.mogo.eagle.function.biz.v2x.trafficlight.network
 
 import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.eagle.core.data.trafficlight.RoadIDResult
-import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.RoadIDResult
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightControl
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
 import retrofit2.http.FieldMap
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.POST

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -3,7 +3,7 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.network
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.eagle.core.data.trafficlight.*
+import com.mogo.eagle.core.data.biz.trafficlight.*
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt

@@ -14,10 +14,10 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
-import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
-import com.mogo.eagle.core.data.trafficlight.isGreen
-import com.mogo.eagle.core.data.trafficlight.isRed
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight
+import com.mogo.eagle.core.data.biz.trafficlight.isGreen
+import com.mogo.eagle.core.data.biz.trafficlight.isRed
 import com.mogo.eagle.core.data.v2x.VipMessage
 import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager

core/function-impl/mogo-core-function-datacenter/build.gradle

@@ -46,29 +46,21 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.androidxccorektx
-        implementation rootProject.ext.dependencies.androidxappcompat
-        implementation project(':libraries:mogo-obu')
-        implementation project(':libraries:mogo-adas')
-        implementation project(":foudations:mogo-aicloud-services-sdk")
-        implementation project(':core:mogo-core-data')
-    } else {
-        implementation rootProject.ext.dependencies.androidxccorektx
-        implementation rootProject.ext.dependencies.androidxappcompat
-        implementation rootProject.ext.dependencies.arouter
-        implementation rootProject.ext.dependencies.rxandroid
-        kapt rootProject.ext.dependencies.aroutercompiler
-        implementation rootProject.ext.dependencies.androidxroomruntime
-        kapt rootProject.ext.dependencies.androidxroomcompiler
-        implementation rootProject.ext.dependencies.androidxroomktx
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.rxandroid
 
-        implementation project(':libraries:mogo-obu')
-        implementation project(':libraries:mogo-adas')
-        implementation rootProject.ext.dependencies.mogoaicloudtelematic
-        implementation project(':core:mogo-core-function-call')
-        implementation project(":foudations:mogo-commons")
-    }
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.androidxroomruntime
+    kapt rootProject.ext.dependencies.androidxroomcompiler
+    implementation rootProject.ext.dependencies.androidxroomktx
+
+    implementation project(':libraries:mogo-obu')
+    implementation project(':libraries:mogo-adas')
+    implementation rootProject.ext.dependencies.mogoaicloudtelematic
+    implementation project(':core:mogo-core-function-call')
+    implementation project(":foudations:mogo-commons")
 }
 
 //apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt

@@ -10,7 +10,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.toAutoPilotLine
 import com.mogo.eagle.core.data.autopilot.toRouteInfo
-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.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
@@ -19,8 +19,8 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C
 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_CONNECT_STATUS
 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.trafficlight.toTrafficLightDetail
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.toTrafficLightDetail
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider
 import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt

@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.datacenter.autopilot.server
 
-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.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt

@@ -8,7 +8,6 @@ import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
-import com.mogo.eagle.core.data.telematic.TelematicConstant
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.setDemoMode
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.setIgnoreConditionDraw
@@ -31,7 +30,10 @@ import mogo.telematics.pad.MessagePad
 
 class TeleMsgHandler : IMsgHandler {
 
-    private val TAG = "TeleMsgHandler"
+    companion object{
+        private const val BUSINESS_STRING = 100
+        private const val TAG = "TeleMsgHandler"
+    }
 
     @Volatile
     private var isFirstDisc = true
@@ -124,8 +126,8 @@ class TeleMsgHandler : IMsgHandler {
                         }
                     }
                 }
-                TelematicConstant.BUSINESS_STRING -> {
-                    CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.BUSINESS_STRING, it.body)
+                BUSINESS_STRING -> {
+                    CallerTelematicListenerManager.invokeReceivedMsg(BUSINESS_STRING, it.body)
                 }
                 else -> {
                 }
@@ -171,8 +173,8 @@ class TeleMsgHandler : IMsgHandler {
                         invokeNettyConnResult("司机屏SN未获取到，不发送给乘客屏")
                     }
                 }
-                TelematicConstant.BUSINESS_STRING -> {
-                    CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.BUSINESS_STRING, it.body)
+                BUSINESS_STRING -> {
+                    CallerTelematicListenerManager.invokeReceivedMsg(BUSINESS_STRING, it.body)
                 }
                 else -> {
                 }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt

@@ -5,7 +5,7 @@ import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisGnssListener
 import com.mogo.eagle.core.function.api.map.listener.IGaoDeMapLocationListener
-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.autopilot.CallerChassisGnssListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt

@@ -5,7 +5,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.obu.MogoObuConst
-import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuProvider
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt

@@ -6,10 +6,10 @@ import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningMapListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsiListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsmListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningSpatListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningMapListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRsiListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningRsmListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuWarningSpatListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.obu.*

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt

@@ -2,9 +2,9 @@ package com.mogo.eagle.core.function.datacenter.v2x
 
 import android.content.Context
 import android.os.Handler
+import com.mogo.eagle.core.data.biz.trafficlight.*
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
 import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Looper
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.msgbox.*
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxInfo

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

@@ -8,7 +8,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.EnvConfig
-import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.deva.chain.ChainLogParam
 import com.mogo.eagle.core.data.deva.scene.SceneModule

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

@@ -8,8 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.GridLayoutManager
-import com.mogo.eagle.core.data.badcase.RecordTypeEntity
-import com.mogo.eagle.core.data.badcase.TopicEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordTypeEntity
+import com.mogo.eagle.core.data.deva.badcase.TopicEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager

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

@@ -12,10 +12,10 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import bag_manager.BagManagerOuterClass
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
-import com.mogo.eagle.core.data.badcase.SubBagEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.SubBagEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
@@ -425,7 +425,7 @@ class BadCaseManagerView @JvmOverloads constructor(
                     if(titleBagInfo.itemType == 1){
                         val bagIterator = bagManagerEntity.bagsInfoResp.iterator()
                         var hasBag = false
-                        var bagBagInfo: BagInfoEntity ?= null
+                        var bagBagInfo: BagInfoEntity?= null
                         while(bagIterator.hasNext()){
                             bagBagInfo = bagIterator.next()
                             if(bagBagInfo.itemType == 0){

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

@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.data.badcase.RecordCaseEntity;
+import com.mogo.eagle.core.data.deva.badcase.RecordCaseEntity;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;

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

@@ -14,8 +14,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.data.badcase.RecordTypeEntity;
-import com.mogo.eagle.core.data.badcase.TopicEntity;
+import com.mogo.eagle.core.data.deva.badcase.RecordTypeEntity;
+import com.mogo.eagle.core.data.deva.badcase.TopicEntity;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;

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

@@ -13,10 +13,10 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagInfoEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
-import com.mogo.eagle.core.data.badcase.RecordCaseEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.RecordCaseEntity
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener

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

@@ -17,8 +17,8 @@ import android.widget.TextView
 import com.google.android.flexbox.FlexboxLayout
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
-import com.mogo.eagle.core.data.badcase.BagDescriptionEntity
-import com.mogo.eagle.core.data.badcase.BagManagerEntity
+import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
+import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.RecordBagMsg

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 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 com.mogo.eagle.core.data.deva.bindingcar.BindingCarInfo;
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo;
 
 import io.reactivex.Observable;
 import okhttp3.RequestBody;

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

@@ -6,7 +6,7 @@ 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.deva.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.obu.MogoObuConst

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

@@ -4,9 +4,9 @@ import android.content.Context
 import com.mogo.commons.constants.HostConst
 import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
-import com.mogo.eagle.core.data.bindingcar.BindingCarInfo
-import com.mogo.eagle.core.data.bindingcar.BindingCarRequest
-import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
+import com.mogo.eagle.core.data.deva.bindingcar.BindingCarInfo
+import com.mogo.eagle.core.data.deva.bindingcar.BindingCarRequest
+import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBindingCarDialog
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showModifyBindingCarDialog

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

@@ -9,8 +9,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.view.KeyEvent
 import com.mogo.commons.context.ContextHolderUtil
-import com.mogo.eagle.core.data.mofang.MfConstants
-import com.mogo.eagle.core.function.api.mofang.IMoGoMoFangListener
+import com.mogo.eagle.core.data.deva.mofang.MfConstants
+import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorChangeLaneLeft
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorChangeLaneRight
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorSetAcceleratedSpeed
@@ -33,7 +33,7 @@ import java.util.*
  * 魔方连接状态和设备管理
  */
 @SuppressLint("StaticFieldLeak")
-class MoFangManager private constructor() : IMoGoMoFangListener{
+class MoFangManager private constructor() : IMoGoMoFangListener {
 
     companion object {
         val moFangManager: MoFangManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
@@ -163,7 +163,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener{
      * 魔方按键处理
      */
     override fun onMofangHandle(keyCode: Int, action: Int): Boolean {
-        val bluetoothName = SharedPrefsMgr.getInstance(ContextHolderUtil.getContext()).getString(MfConstants.BLUETOOTH_NAME)
+        val bluetoothName = SharedPrefsMgr.getInstance(ContextHolderUtil.getContext()).getString(
+            MfConstants.BLUETOOTH_NAME)
         if (bluetoothName == "MINI_KEYBOARD") {
             if (!isPressEnd) {
                 isPressEnd = true

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

@@ -5,7 +5,7 @@ import android.content.Context
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager

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

@@ -6,7 +6,7 @@ import android.util.DisplayMetrics
 import android.view.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.zhjt.mogo_core_function_devatools.R
 import com.zhjt.mogo_core_function_devatools.report.adapter.ReportListAdapter

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

@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.zhjt.mogo_core_function_devatools.R
 

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

@@ -5,7 +5,7 @@ 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.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager

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

@@ -3,18 +3,16 @@ 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 android.util.Log;
 
 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.data.obu.MogoObuConst;
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.obu.CallerObuApiManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.AppUtils;
+
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;

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

@@ -1,13 +1,12 @@
 package com.zhjt.mogo_core_function_devatools.upgrade;
 
-import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
 
 import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
 import retrofit2.http.Headers;
 import retrofit2.http.POST;
-import retrofit2.http.Query;
 
 /**
  * @author lixiaopeng

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

@@ -7,7 +7,7 @@ import android.content.Context;
 import com.elegant.utils.UiThreadHandler;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.constants.HostConst;
-import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
+import com.mogo.eagle.core.data.deva.bindingcar.UpgradeAppInfo;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -58,10 +58,6 @@ dependencies {
     implementation rootProject.ext.dependencies.mogoaicloudtrafficlive
     implementation rootProject.ext.dependencies.material
 
-    kapt rootProject.ext.dependencies.androidxroomcompiler
-    implementation rootProject.ext.dependencies.androidxroomruntime
-    implementation rootProject.ext.dependencies.androidxroomktx
-
     //Crash日志收集
 //    implementation rootProject.ext.dependencies.crashSdk
     implementation rootProject.ext.dependencies.boostmultidex
@@ -75,22 +71,12 @@ dependencies {
     implementation rootProject.ext.dependencies.cicle_indicator
     implementation rootProject.ext.dependencies.koomnative
     implementation rootProject.ext.dependencies.koomxhook
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
 
-        compileOnly rootProject.ext.dependencies.mogocommons
-        api rootProject.ext.dependencies.mogo_core_res
-        compileOnly rootProject.ext.dependencies.mogo_core_utils
-        compileOnly rootProject.ext.dependencies.mogo_core_function_datacenter
-        compileOnly rootProject.ext.dependencies.mogo_core_function_call
-    } else {
-        api project(':test:crashreport-apmbyte')
-
-        compileOnly project(':core:function-impl:mogo-core-function-datacenter')
-        implementation project(':foudations:mogo-commons')
-        api project(':core:mogo-core-res')
-        compileOnly project(':core:mogo-core-utils')
-        compileOnly project(':core:mogo-core-function-call')
-    }
+    api project(':test:crashreport-apmbyte')
+    compileOnly project(':core:function-impl:mogo-core-function-datacenter')
+    implementation project(':foudations:mogo-commons')
+    api project(':core:mogo-core-res')
+    compileOnly project(':core:mogo-core-function-call')
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeBroadcastReceiver.kt

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
-import com.mogo.eagle.core.data.notice.NoticeNormalData
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.util.SharedPrefs

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt

@@ -8,18 +8,17 @@ import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
-import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_FRAGMENT_HMI
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 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.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListAdapter.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.mogo.eagle.core.data.camera.CameraEntity
+import com.mogo.eagle.core.data.biz.camera.CameraEntity
 import com.mogo.eagle.core.function.hmi.R
 
 class CameraListAdapter : Adapter<CameraListAdapter.CameraListHolder> {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt

@@ -20,7 +20,7 @@ import com.mogo.cloud.live.manager.LiveStreamManagerImpl
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive
-import com.mogo.eagle.core.data.camera.CameraEntity
+import com.mogo.eagle.core.data.biz.camera.CameraEntity
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.msgbox.*
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.msgbox.*
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchAirportDialog.java

@@ -7,7 +7,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean;
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager;
 import com.mogo.eagle.core.function.hmi.R;
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchBaseDialog.java

@@ -7,7 +7,7 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean;
 import com.mogo.eagle.core.function.hmi.R;
 
 public abstract class DispatchBaseDialog extends Dialog {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchCarsDialog.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean;
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager;
 import com.mogo.eagle.core.function.hmi.R;
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/DispatchDialogManager.java

@@ -1,14 +1,14 @@
 package com.mogo.eagle.core.function.hmi.ui.notice;
 
-import static com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU;
-import static com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG;
-import static com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START;
-import static com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP;
+import static com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_EZHOU;
+import static com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_SOURCE_HENGYANG;
+import static com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_START;
+import static com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean.DISPATCH_TYPE_STOP;
 
 import android.content.Context;
 
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean;
+import com.mogo.eagle.core.data.biz.dispatch.DispatchAdasAutoPilotLocReceiverBean;
 
 public class DispatchDialogManager {
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.hmi.ui.notice.traffic.NoticeTrafficDialog;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt

@@ -10,7 +10,7 @@ import androidx.lifecycle.LifecycleObserver
 import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
-import com.mogo.eagle.core.data.notice.NoticeNormalData
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeNormalBannerView.java

@@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.mogo.eagle.core.data.notice.NoticeNormalData;
+import com.mogo.eagle.core.data.biz.notice.NoticeNormalData;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
 import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform;

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficAdapter.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.eagle.core.data.notice.NoticeValue;
+import com.mogo.eagle.core.data.biz.notice.NoticeValue;
 import com.mogo.eagle.core.function.hmi.R;
 
 import java.util.ArrayList;

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt

@@ -14,10 +14,10 @@ import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat
-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo
-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo.NoticeTrafficAccountInfo
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
-import com.mogo.eagle.core.data.notice.NoticeValue
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStyleInfo
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStyleInfo.NoticeTrafficAccountInfo
+import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
+import com.mogo.eagle.core.data.biz.notice.NoticeValue
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager.bizProvider

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/AccelerationFloatWindow.kt

@@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.data.gnss.AccelerationEntity
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.BarUtils
-import java.lang.reflect.Field
 
 /**
  * @author XuXinChao

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/CameraLiveView.kt

@@ -6,7 +6,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
-import com.mogo.eagle.core.data.camera.CameraEntity
+import com.mogo.eagle.core.data.biz.camera.CameraEntity
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
 import com.mogo.eagle.core.data.enums.SidePattern
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -41,12 +41,12 @@ import com.mogo.eagle.core.data.gnss.AccelerationEntity
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.MogoObuConst
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
-import com.mogo.eagle.core.data.report.ReportEntity
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuConnectListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuInfoListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuConnectListener
+import com.mogo.eagle.core.function.api.datacenter.obu.IMoGoObuInfoListener
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
 import com.mogo.eagle.core.data.enums.SidePattern
+import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt

@@ -6,8 +6,8 @@ import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
-import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper
-import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.deva.bindingcar.AdUpgradeStateHelper
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.enums.SidePattern
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui.tools
 import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
-import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper
+import com.mogo.eagle.core.data.deva.bindingcar.AdUpgradeStateHelper
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt

@@ -13,7 +13,7 @@ import android.widget.FrameLayout
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
-import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.temp.EventLogout
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt

@@ -10,9 +10,9 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_ACTIONS
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
-import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
-import com.mogo.eagle.core.data.trafficlight.isRed
+import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight
+import com.mogo.eagle.core.data.biz.trafficlight.isRed
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.RelativeLayout
-import com.mogo.eagle.core.data.mofang.MfConstants
+import com.mogo.eagle.core.data.deva.mofang.MfConstants
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.hmi.R

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt

@@ -6,8 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
-import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper
-import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.deva.bindingcar.AdUpgradeStateHelper
+import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt

@@ -11,7 +11,7 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 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.v2x.CallerV2XWarningListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ThreadUtils

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt

@@ -10,7 +10,7 @@ import android.view.animation.LinearInterpolator
 import android.widget.RelativeLayout
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 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.v2x.CallerV2XWarningListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt

@@ -4,7 +4,7 @@ import android.os.Handler
 import android.os.Message
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 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.obu.CallerObuWarningListenerManager
 import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler
 import mogo.telematics.pad.MessagePad

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/MapIdentifySubscriber.kt

@@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.traffic.TrafficData
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
 import com.mogo.eagle.core.function.api.base.IMoGoSubscriber
 import com.mogo.eagle.core.function.api.map.marker.IMoGoIdentifyListener
-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.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuWarningListenerManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java

@@ -160,11 +160,14 @@ public class TrackManager {
     }
 
     public void clearAll() {
-        MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).clearAllMarker();
         cellIdCaches.clear();
         trafficDataUuid.clear();
         WarningHelper.INSTANCE.clear();
-        mMarkersCaches.forEach((uuid, trackObj) -> trackObj.clear());
+        mMarkersCaches.forEach((uuid, trackObj) -> {
+            trackObj.clear();
+            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                    .removeMarker(uuid);
+        });
         mMarkersCaches.clear();
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.business.identify
 import android.annotation.SuppressLint
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import mogo.telematics.pad.MessagePad.*
 
 object TrackerSourceColorHelper {
@@ -65,6 +66,11 @@ object TrackerSourceColorHelper {
         //僵尸车
         if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
             color = "#AE7887FF"
+            CallerMapUIServiceManager.getMapUIController()?.let {
+                if(it.isDayMode){
+                    color = "#AD7488FF"
+                }
+            }
         }
 
         // pnc预警

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.deva.net
+package com.mogo.eagle.core.data.app
 
 import com.google.gson.annotations.SerializedName
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/CameraEntity.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 data class CameraEntity(
     var flvUrl: String?="",

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/CameraListInfo.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 import androidx.annotation.Keep
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/CameraStreamEntity.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/LiveCarCameraInfo.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/OpenCameraStreamEntity.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/camera/ReqLiveCarBean.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.camera
+package com.mogo.eagle.core.data.biz.camera
 
 import androidx.annotation.Keep
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/DispatchAdasAutoPilotLocReceiverBean.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.dispatch;
+package com.mogo.eagle.core.data.biz.dispatch;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/EndLatLon.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.dispatch;
+package com.mogo.eagle.core.data.biz.dispatch;
 
 public class EndLatLon {
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/ReportDispatchResult.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.dispatch;
+package com.mogo.eagle.core.data.biz.dispatch;
 
 public class ReportDispatchResult {
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/dispatch/ReportedRoute.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.dispatch;
+package com.mogo.eagle.core.data.biz.dispatch;
 
 
 import com.mogo.eagle.core.data.autopilot.AutopilotStatus;

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeNormalData.kt

@@ -0,0 +1,37 @@
+package com.mogo.eagle.core.data.biz.notice
+
+import androidx.annotation.Keep
+import java.io.Serializable
+
+/**
+ * @description 普通公告数据类型
+ *
+ * @author lixiaopeng
+ * @since  2021/10/29
+ */
+@Keep
+data class NoticeNormalData(
+    var appIcon: String = "", //目标app icon图标地址
+    var title: String = "", //标题
+    var content: String = "", //内容
+    var dbId: String = "", //公告id
+    var imageUrl: String = "", //图片地址
+    var videoUrl: String = "", //视频地址
+    var fileType: Int = 0, // 1图片，2视频
+    val tts: String = "",  //语音播报词
+    val speedLimit: Int = 0, //超过速度后延迟显示
+    var showTimeout: Int = 0, //显示等待时长
+    var showTimeoutShadow: Int = 0, //  显示等待时长备份
+    var QRCode: String = "", //二维码地址
+    var mainSchema: String = "", //schema跳转协议
+    val mainVoiceCmd: List<String>? = null, //触发主schema 命令词
+    val cancelVoiceCmd: List<String>? = null, //隐藏当前push命令词
+    val buttons: List<Button>? = null, //底部buttons列表
+    var timestamp: Long = System.currentTimeMillis()
+): Serializable
+
+data class Button(
+        val text: String = "",   // button名称
+        val action: String = "", //scheme 协议
+        val voiceCmd: List<String>? = null //注册命令词
+): Serializable

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeNormalDetail.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.notice
+package com.mogo.eagle.core.data.biz.notice
 
 import androidx.annotation.Keep
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeRequest.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.notice;
+package com.mogo.eagle.core.data.biz.notice;
 
 /**
  * @author Jing

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeTrafficStyleInfo.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.notice;
+package com.mogo.eagle.core.data.biz.notice;
 
 import com.mogo.eagle.core.data.BaseData;
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeTrafficStylePushData.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.notice;
+package com.mogo.eagle.core.data.biz.notice;
 
 import java.io.Serializable;
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/notice/NoticeValue.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.notice;
+package com.mogo.eagle.core.data.biz.notice;
 
 import java.io.Serializable;
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/BaseLaneInfoList.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.trafficlight
+package com.mogo.eagle.core.data.biz.trafficlight
 
 //驶入路口需要经过路段
 class BaseLaneInfoList(val tileId: Int, val roadId: String, val laneNo: Int) {

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/ChangeLightRequestData.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.trafficlight
+package com.mogo.eagle.core.data.biz.trafficlight
 
 class ChangeLightRequestData(
     val lightId: Int,          //红绿灯ID

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/RoadArrow.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.data.trafficlight
+package com.mogo.eagle.core.data.biz.trafficlight
 
 //道路地面要素，转向标识
 class RoadArrow {