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

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

@@ -62,7 +62,6 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxroomktx
 
     implementation project(':foudations:mogo-commons')
-    implementation project(':core:mogo-core-data')
     implementation project(':core:mogo-core-utils')
     implementation project(':core:mogo-core-network')
     implementation project(':core:mogo-core-function-call')

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

@@ -26,7 +26,7 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         noticeSocketManager.init(context)
         dispatchAutoPilotManager.init(context)
         cronTaskManager.startCronTask()
-
+        OverviewDb.getDb(context)
         MogoTrafficLightManager.INSTANCE.initServer(context)
         VipCarManager.INSTANCE.initServer(context)
 //        RedLightWarningManager.INSTANCE.listenTrafficLight()
@@ -75,10 +75,6 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         OverViewDataManager.getAllV2XEventsByLineId(MoGoAiCloudClientConfig.getInstance().sn)
     }
 
-    override fun initOverViewDb(context: Context) {
-        OverviewDb.getDb(context)
-    }
-
     override fun onDestroy() {
         noticeSocketManager.release()
         dispatchAutoPilotManager.release()

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

@@ -12,17 +12,17 @@ interface TrafficLightApiService {
 
     //获取前方路口RoadID
     @FormUrlEncoded
-    @POST("ai-roadInfo-service/cross/near")
+    @POST("eagle-eye-dns/ai-roadInfo-service/cross/near")
     suspend fun getFrontRoadID(@FieldMap roadID: Map<String, String>): BaseResponse<RoadIDResult>
 
     //获取前方红绿灯状态
     @FormUrlEncoded
-    @POST("mec-etl-server/light/bgd/channel/realTime")
+    @POST("eagle-eye-dns/mec-etl-server/light/bgd/channel/realTime")
     suspend fun getTrafficLight(@FieldMap status: Map<String, String>): BaseResponse<TrafficLightResult>
 
     //变灯
     @FormUrlEncoded
-    @POST("mec-etl-server/light/bdg/newTask")
+    @POST("eagle-eye-dns/mec-etl-server/light/bdg/newTask")
     suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<TrafficLightControl>
 
 }

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

@@ -1,18 +1,18 @@
 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.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel
 import com.mogo.eagle.core.network.request
-import com.mogo.commons.constants.HostConst.CITY_HOST
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 
 class TrafficLightNetWorkModel {
 
-    private fun getNetWorkApi(baseUrl: String = CITY_HOST): TrafficLightApiService {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): TrafficLightApiService {
         return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
             .create(TrafficLightApiService::class.java)
     }

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

@@ -7,7 +7,7 @@ import retrofit2.http.*
 interface VipApiService {
 
     //查询是否为VIP车辆
-    @GET("/dataService/carUser/getVipStatusBySn")
+    @GET("eagle-eye-dns/dataService/carUser/getVipStatusBySn")
     suspend fun requestVip(@Query("sn") sn: String): BaseResponse<VipRequest>
 
 }

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

@@ -1,17 +1,17 @@
 package com.mogo.eagle.function.biz.v2x.vip.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.v2x.VipRequest
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.request
-import com.mogo.commons.constants.HostConst.DATA_SERVICE_HOST
 
 
 class VipNetWorkModel {
 
-    private fun getNetWorkApi(baseUrl: String = DATA_SERVICE_HOST): VipApiService {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): VipApiService {
         return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
             .create(VipApiService::class.java)
     }

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

@@ -61,13 +61,11 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.mogo_core_res
     } else {
         implementation project(':foudations:mogo-commons')
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:mogo-core-res')

core/function-impl/mogo-core-function-datacenter/README.md

@@ -44,7 +44,7 @@ MogoObuManager.getInstance().init(Context context);
 ```
 ## 连接
 ```java
-//默认192.168.8.199
+//默认192.168.1.199
 MogoObuManager.getInstance().connect();
 //自定义 IP
 MogoObuManager.getInstance().connect(String ip);

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

@@ -55,23 +55,18 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxroomktx
 
     implementation rootProject.ext.dependencies.mogoaicloudtelematic
-
-    implementation rootProject.ext.dependencies.mogoobu
     implementation rootProject.ext.dependencies.amapnavi3dmap
+    implementation project(':libraries:mogo-obu')
+    implementation project(':libraries:mogo-adas')
+    implementation project(':libraries:mogo-adas-data')
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
-
-        implementation project(':libraries:mogo-adas')
         implementation rootProject.ext.dependencies.mogocommons
     } else {
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
-
-        implementation project(':libraries:mogo-adas')
         implementation project(':foudations:mogo-commons')
     }
 }

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

@@ -526,23 +526,13 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-    /**
-     * OBU预警事件
-     *
-     * @param header         头
-     * @param obuWarningData 数据
-     */
-    override fun onObuWarningData(header: MessagePad.Header?, obuWarningData: ObuWarningEvent.ObuWarningData?) {
-        CallerObuDcCombineListenerManager.invokeObuDcData(obuWarningData)
-    }
-
     /**
      * OBU 红绿灯预警信息
      *
      * @param header          头
      * @param spatWarningData 数据
      */
-    override fun onoObuSpatWarning(header: MessagePad.Header?, spatWarningData: ObuScene.SpatWarningData?) {
+    override fun onObuSpatWarning(header: MessagePad.Header?, spatWarningData: ObuScene.SpatWarningData?) {
         CallerObuWarningSpatListenerManager.invokeObuSpatWarning(spatWarningData!!)
     }
     /**
@@ -551,7 +541,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
      * @param header         头
      * @param rsiWarningData 数据
      */
-    override fun onoObuRsiWarning(header: MessagePad.Header?, rsiWarningData: ObuScene.RsiWarningData?) {
+    override fun onObuRsiWarning(header: MessagePad.Header?, rsiWarningData: ObuScene.RsiWarningData?) {
         CallerObuWarningRsiListenerManager.invokeObuRsiWarning(rsiWarningData!!)
     }
 
@@ -561,7 +551,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
      * @param header         头
      * @param rsmWarningData 数据
      */
-    override fun onoObuRsmWarning(header: MessagePad.Header?, rsmWarningData: ObuScene.RsmWarningData?) {
+    override fun onObuRsmWarning(header: MessagePad.Header?, rsmWarningData: ObuScene.RsmWarningData?) {
         CallerObuWarningRsmListenerManager.invokeObuRsmWarning(rsmWarningData!!)
     }
     /**
@@ -570,7 +560,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
      * @param header       头
      * @param mapMatchData 数据
      */
-    override fun onoObuObuMapMath(header: MessagePad.Header?, mapMatchData: ObuScene.MapMatchData?) {
+    override fun onObuMapMath(header: MessagePad.Header?, mapMatchData: ObuScene.MapMatchData?) {
         CallerObuMapMathListenerManager.invokeObuMapMath(mapMatchData!!)
     }
 

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

@@ -17,7 +17,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84Lis
 import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
-import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.support.obu.model.MogoObuHvBasicsData
@@ -89,6 +88,11 @@ object MoGoLocationDispatcher :
         lastGnssLocation.lastReceiveTime = TimeUtils.getNowMills()
         // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
         mapLocation?.let {
+            //agps 高德
+            //agps_rtk 高德-高精
+            lastGnssLocation.locType = 1000 // 定位类型为WGS84进行转译的坐标
+            lastGnssLocation.satellite = 4
+
             lastGnssLocation.cityName = it.city
             lastGnssLocation.cityCode = it.cityCode
             lastGnssLocation.provider = it.provider
@@ -145,6 +149,9 @@ object MoGoLocationDispatcher :
             lastGaoDeLocation.satelliteTime = it.time
             lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
 
+            lastGaoDeLocation.locType = 1 // 定位类型为高德坐标(网路或者硬件定位)
+            lastGaoDeLocation.satellite = 4
+
             lastGaoDeLocation.cityName = it.city
             lastGaoDeLocation.cityCode = it.cityCode
             lastGaoDeLocation.provider = it.provider
@@ -228,6 +235,11 @@ object MoGoLocationDispatcher :
 
         // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
         mapLocation?.let {
+            //agps 高德
+            //agps_rtk 高德-高精
+            lastOBULocation.locType = 1000 // 定位类型为WGS84进行转译的坐标
+            lastOBULocation.satellite = 4
+
             lastOBULocation.cityName = it.city
             lastOBULocation.cityCode = it.cityCode
             lastOBULocation.provider = it.provider

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

@@ -22,8 +22,7 @@ class MoGoObuProvider : IMoGoObuProvider {
     private val TAG = "MoGoObuProvider"
 
     private var mContext: Context? = null
-    private val busObuIp = "192.168.8.199"
-    private val taxiObuIp = "192.168.1.199"
+    private val taxiObuIp = "192.168.1.199" //obu的taxi和bus的ip已经全部统一成1网段ip
 
     override val functionName: String
         get() = TAG
@@ -37,35 +36,16 @@ class MoGoObuProvider : IMoGoObuProvider {
         MogoObuDcCombineManager.INSTANCE.init(context)
         CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress())
 
-        //bus乘客版本obu功能去掉
-        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
-            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
-        ) {
-            //不处理
-        } else {
-            mContext = context
-            mContext?.let {
-                if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //bus 司机端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, busObuIp)
-
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //taxi 司机端和乘客端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                }
-            }
+        //bus乘客版本obu功能去掉，大理项目需要全部车辆接收，不在限制
+        mContext = context
+        mContext?.let {
+            val ipAddress = SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
+            //mogo obu
+            MogoPrivateObuNewManager.INSTANCE.connectObu(
+                it,
+                ipAddress,
+                CommonUtils.getIpAddressString()
+            )
         }
     }
 

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

@@ -47,11 +47,11 @@ class ObuTestNewObuReceiver : BroadcastReceiver() {
         val warningList = listOf(warningData1)
         warningMsg.warningData = warningList
 
-        val cvxHvInfoIndInfo = MogoObuRvWarningData(0, vehBasicsMsg, warningMsg)
+//        val cvxHvInfoIndInfo = MogoRvWarningData(0, vehBasicsMsg, warningMsg)
 
-        MogoPrivateObuNewManager.INSTANCE
-            .getMogoObuListener()
-            .onMogoObuRvWarning(cvxHvInfoIndInfo)
+//        MogoPrivateObuNewManager.INSTANCE
+//            .getMogoObuListener()
+//            .onGnssInfo(cvxHvInfoIndInfo)
 
     }
 

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

@@ -41,11 +41,11 @@ class ObuTestNewObuRsiReceiver : BroadcastReceiver() {
 
         val rsiWarningList = listOf(rsiWarning) //TODO
 
-        val cvxObuRsiInfo = MogoObuRsiWarningData(obuStatus, 1, rsiWarningList)
-
-        MogoPrivateObuNewManager.INSTANCE
-            .getMogoObuListener()
-            .onMogoObuRsiWarning(cvxObuRsiInfo)
+//        val cvxObuRsiInfo = MogoObuRsiWarningData(obuStatus, 1, rsiWarningList)
+//
+//        MogoPrivateObuNewManager.INSTANCE
+//            .getMogoObuListener()
+//            .onObuRsiWarning(cvxObuRsiInfo)
 
     }
 

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

@@ -4,6 +4,8 @@ import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.traffic.TrafficData
 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.support.obu.ObuBase
+import com.mogo.support.obu.ObuScene
 import com.mogo.support.obu.model.MogoObuRsiWarningData
 import com.mogo.support.obu.model.MogoObuRsmWarningData
 import com.mogo.support.obu.model.MogoObuRvWarningData
@@ -20,18 +22,18 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU 远车 转换交通元素数据,是否需要
      */
-    fun cvxRvInfoIndInfo2TrafficData(info: MogoObuRvWarningData): TrafficData? {
-        if (info.vehBasicsMsg == null) {
+    fun cvxRvInfoIndInfo2TrafficData(info: ObuBase.VehicleBasics): TrafficData? {
+        if (info == null) {
             CallerLogger.e("$M_OBU$TAG", "cvxRvInfoIndInfo2TrafficData  数据转换异常，请检查参数是否齐全")
             return null
         }
         val trafficData = TrafficData()
         trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_TA_CHE
-        trafficData.uuid = info.vehBasicsMsg.id
-        trafficData.lat = info.vehBasicsMsg.latitude
-        trafficData.lon = info.vehBasicsMsg.longitude
-        trafficData.heading = info.vehBasicsMsg.heading
-        trafficData.speed = info.vehBasicsMsg.speed
+        trafficData.uuid = info.id
+        trafficData.lat = info.latitude
+        trafficData.lon = info.longitude
+        trafficData.heading = info.heading
+        trafficData.speed = info.speed
 
         return trafficData
     }
@@ -39,25 +41,25 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU RSU道路事件预警信息 转换交通元素数据  标牌 为何要显示level
      */
-    fun cvxRtiThreatIndInfo2TrafficData(info: MogoObuRsiWarningData): TrafficData? {
-        if (info.warningMsg == null || info.warningMsg.size < 1 || info.warningMsg[0].position == null) {
+    fun cvxRtiThreatIndInfo2TrafficData(info: ObuScene.RsiWarningData): TrafficData? {
+        if (info.warningMsgList == null || info.warningMsgList.size < 1 || info.warningMsgList[0].position == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
         }
         val trafficData = TrafficData()
         trafficData.type = TrafficTypeEnum.TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG
-        trafficData.uuid = info.warningMsg[0].signSerialNum.toString()
-        trafficData.lat = info.warningMsg[0].position.latitude
-        trafficData.lon = info.warningMsg[0].position.longitude
-        trafficData.threatLevel = info.warningMsg[0].warningLevel
+        trafficData.uuid = info.warningMsgList[0].signSerialNum.toString()
+        trafficData.lat = info.warningMsgList[0].position.position.positionLatLon.latitude
+        trafficData.lon = info.warningMsgList[0].position.position.positionLatLon.longitude
+        trafficData.threatLevel = info.warningMsgList[0].warningLevel
         return trafficData
     }
 
     /**
      * OBU 预警事件 转换交通元素数据 他车预警
      */
-    fun cvxV2vThreatIndInfo2TrafficData(info: MogoObuRvWarningData): TrafficData? {
-        if (info == null || info.vehBasicsMsg == null || info.warningMsg == null) {
+    fun cvxV2vThreatIndInfo2TrafficData(info: ObuScene.RvWarningData): TrafficData? {
+        if (info?.vehBasicsMsg == null || info.warningMsg == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
         }
@@ -68,8 +70,8 @@ object TrafficDataConvertUtilsNew {
         trafficData.heading = info.vehBasicsMsg.heading
         trafficData.speed = info.vehBasicsMsg.speed
         // 判断车辆V2X预警级别，调整车辆颜色
-        if (info.warningMsg.warningData != null) {
-            trafficData.threatLevel = info.warningMsg.warningData[0].warningLevel
+        if (info.warningMsg.warningDataList != null) {
+            trafficData.threatLevel = info.warningMsg.warningDataList[0].warningLevel
         } else {
             trafficData.threatLevel = 1
         }
@@ -81,7 +83,7 @@ object TrafficDataConvertUtilsNew {
     /**
      * OBU 弱势交通参与者信息 转换交通元素数据
      */
-    fun cvxPtcThreatIndInfo2TrafficData(info: MogoObuRsmWarningData): TrafficData? {
+    fun cvxPtcThreatIndInfo2TrafficData(info: ObuScene.RsmWarningData): TrafficData? {
         if (info.participant == null) {
             CallerLogger.e("$M_OBU$TAG", "数据转换异常，请检查参数是否齐全")
             return null
@@ -121,8 +123,8 @@ object TrafficDataConvertUtilsNew {
         }
 
         // 判断车辆V2X预警级别，调整车辆颜色
-        if (info.warningMsg != null && info.warningMsg.warningData != null) {
-            trafficData.threatLevel = info.warningMsg.warningData[0].warningLevel
+        if (info.warningMsg != null && info.warningMsg.warningDataList != null) {
+            trafficData.threatLevel = info.warningMsg.warningDataList[0].warningLevel
         } else {
             trafficData.threatLevel = 1
         }

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

@@ -136,7 +136,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
         super.onTrafficLightPlusSource(light, remain, lightSource)
 
         if (lightSource == DataSourceType.OBU) {
-            hasObuLightStatus = true //todo 会存在优先级高的数据没有回调，导致没有数据出现
+            hasObuLightStatus = true
         }
 
         CallerTrafficLightListenerManager.showTrafficLight(light, lightSource)

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

@@ -84,18 +84,17 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
     implementation rootProject.ext.dependencies.flexbox
     implementation rootProject.ext.dependencies.androidautoSize
+    implementation rootProject.ext.dependencies.koomnative
+    implementation rootProject.ext.dependencies.koomxhook
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_res
     }else {
-        implementation project(':foudations:mogo-aicloud-services-sdk')
         implementation project(':foudations:mogo-commons')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-res')
     }
 }

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

@@ -5,6 +5,8 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.EnvConfig
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.constants.MogoServicePaths
@@ -16,10 +18,11 @@ import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
-import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager
+import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl
+import com.zhjt.mogo_core_function_devatools.koom.KoomInitTask
 import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangManager.Companion.moFangManager
 import com.zhjt.mogo_core_function_devatools.monitor.MonitorManager
@@ -46,6 +49,9 @@ class DevaToolsProvider : IDevaToolsProvider {
     }
 
     override fun initBiz() {
+        if (DebugConfig.isDebug()) {
+            KoomInitTask.init(AbsMogoApplication.getApp())
+        }
         ttsManager.initTts(mContext!!) //todo
         //链路相关
         traceManager.init(mContext!!)
@@ -148,6 +154,10 @@ class DevaToolsProvider : IDevaToolsProvider {
         upgradeManager.downLoadPackage(mContext!!, downloadKey, downloadUrl)
     }
 
+    override fun updateUpgradeProgress() {
+        upgradeManager.updateUpgradeProgress(mContext!!)
+    }
+
     override fun showStatusBar(ctx: Context, container: ViewGroup) {
         StatusManager.init(ctx)
         StatusManager.show(container)

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

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

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

@@ -17,6 +17,7 @@ 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.ObuUpgradeAppNetWorkManager
 import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeAppNetWorkManager
 import mogo.telematics.pad.MessagePad
 
@@ -160,4 +161,13 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
             .getAppUpgradeInfo(mContext, mAddress, role.toString() + "")
     }
 
-}
+    /**
+     * 司机屏 处理obu升级即可,乘客屏不需要处理 TODO OBU的角色
+     *
+     */
+    fun queryObuUpgrade() {
+        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, role.toString() + "")
+    }
+
+}
+

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

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.main
+package com.zhjt.mogo_core_function_devatools.koom
 
 import android.app.Application
 import android.os.Build

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

@@ -8,7 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import com.mogo.eagle.core.data.mofang.MfConstants
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateMfStatusView
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager.invokeMoFangStatus
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_F
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
@@ -96,7 +96,7 @@ class MoFangManager private constructor() {
                 BluetoothDevice.ACTION_ACL_CONNECTED -> { //蓝牙设备已连接
                     if (!isMfConnect) {
 //                        showBondedDevice(mBluetoothAdapter)
-                        updateMfStatusView(TAG, true)
+                        invokeMoFangStatus(true)
                         isMfConnect = true
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, true) }
                     }
@@ -106,7 +106,7 @@ class MoFangManager private constructor() {
                 BluetoothDevice.ACTION_ACL_DISCONNECTED -> { //蓝牙设备已断开 主动更新
                     CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver  ACTION_ACL_DISCONNECTED ----- isMfConnect = $isMfConnect ")
                     if (isMfConnect) {
-                        updateMfStatusView(TAG, false)
+                        invokeMoFangStatus(false)
                         isMfConnect = false
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, false) }
                     }

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

@@ -0,0 +1,95 @@
+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 获取obu升级信息
+ * @since: 3/25/22
+ */
+public class ObuUpgradeAppNetWorkManager {
+    private static volatile ObuUpgradeAppNetWorkManager requestNoticeManager;
+    private final UpgradeApiService mUpgradeApiService;
+    private static final String TAG = "ObuUpgrade";
+
+    private ObuUpgradeAppNetWorkManager() {
+        mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost())
+                .create(UpgradeApiService.class);
+    }
+
+    public static ObuUpgradeAppNetWorkManager getInstance() {
+        if (requestNoticeManager == null) {
+            synchronized (ObuUpgradeAppNetWorkManager.class) {
+                if (requestNoticeManager == null) {
+                    requestNoticeManager = new ObuUpgradeAppNetWorkManager();
+                }
+            }
+        }
+        return requestNoticeManager;
+    }
+
+    /**
+     * 获取obu升级信息
+     * mac ：工控机mac地址
+     * screenType ： 类型
+     */
+    public void getObuUpgradeInfo(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, "getObuUpgradeInfo 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, "getObuUpgradeInfo 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, "getObuUpgradeInfo 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/UpgradeManager.kt

@@ -1,7 +1,12 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
+import android.app.NotificationManager
 import android.content.Context
+import androidx.core.app.NotificationCompat
+import com.elegant.utils.UiThreadHandler
+import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateStatusBarDownloadView
 import com.mogo.eagle.core.utilcode.breakpoint.Config
 import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
 import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
@@ -110,4 +115,36 @@ class UpgradeManager : IDownload {
             }
         }
     }
+
+    fun updateUpgradeProgress(context: Context) {
+        val builder = NotificationCompat.Builder(context)
+        //        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
+        builder.setContentTitle("下载")
+        builder.setContentText("正在下载")
+        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        CallerDevaToolsUpgradeListenerManager.addListener(
+            TAG,
+            object : IMogoDevaToolsUpgradeListener {
+                override fun onStart(url: String?) {}
+                override fun onPause(url: String?) {}
+                override fun onProgress(url: String?, length: Int) {
+                    builder.setProgress(100, length, false)
+                    manager.notify(0x3, builder.build())
+                    //下载进度提示
+                    builder.setContentText("已下载$length%")
+                    updateStatusBarDownloadView(true, "download", length)
+                }
+
+                override fun onFinished(url: String?) {
+                    builder.setContentText("已下载" + 100 + "%")
+                    UiThreadHandler.postDelayed({
+                        manager.cancel(0x3)
+                        updateStatusBarDownloadView(false, "download", 100)
+                    }, 1000)
+                }
+
+                override fun onError(url: String?, errorMsg: String?) {}
+            })
+    }
+
 }

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

@@ -68,8 +68,7 @@ dependencies {
 
 //    debugImplementation rootProject.ext.dependencies.debugleakcanary
 //    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
-
-    implementation rootProject.ext.dependencies.mogoobu
+    implementation project(':libraries:mogo-obu')
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
 
@@ -80,20 +79,17 @@ dependencies {
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
 
         compileOnly rootProject.ext.dependencies.mogocommons
-        compileOnly rootProject.ext.dependencies.mogo_core_res
+        api rootProject.ext.dependencies.mogo_core_res
         compileOnly rootProject.ext.dependencies.mogo_core_utils
-        compileOnly rootProject.ext.dependencies.mogo_core_function_map
-        compileOnly rootProject.ext.dependencies.mogo_core_function_devatools
         compileOnly rootProject.ext.dependencies.mogo_core_function_datacenter
         compileOnly rootProject.ext.dependencies.mogo_core_function_call
         compileOnly project(':libraries:mogo-adas')
     } else {
-        api project(':test:crashreport-upgrade')
         api project(':test:crashreport-apmbyte')
 
         compileOnly project(':core:function-impl:mogo-core-function-datacenter')
         compileOnly project(':foudations:mogo-commons')
-        compileOnly project(':core:mogo-core-res')
+        api project(':core:mogo-core-res')
         compileOnly project(':core:mogo-core-utils')
         compileOnly project(':core:mogo-core-function-call')
         compileOnly project(':libraries:mogo-adas')

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.mogo.eagle.core.function.hmi">
 
+
+    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.BIND_APPWIDGET" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -39,10 +56,11 @@
             android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:resizeableActivity="false"
             android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
+            android:screenOrientation="${SCREEN_ORIENTATION}"
             android:stateNotNeeded="true"
             android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
@@ -67,7 +85,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.PassengerLauncherActivity"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -99,7 +116,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.VideoAdAtc"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -121,6 +137,16 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.mogo.eagle.core.function.main.AppListActivity"
+            android:exported="true"
+            android:launchMode="singleTask">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN"/>-->
+            <!--                <category android:name="android.intent.category.LAUNCHER"/>-->
+            <!--            </intent-filter>-->
+        </activity>
+
         <meta-data
             android:name="MAP_SDK_VERSION111111"
             android:value="${MAP_SDK_VERSION}" />

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

@@ -87,10 +87,6 @@ class MoGoHmiProvider : IMoGoHmiProvider {
         )
     }
 
-    override fun updateMfStatus(tag: String, status: Boolean) {
-        CallerHmiViewControlListenerManager.updateMfStatus(StatusBarView.TAG, tag, status)
-    }
-
     /**
      * 不展示顶部弹窗，其它保留
      */

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

@@ -635,6 +635,33 @@ internal class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
+        //v2n车端预警
+        tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isV2NFromCar = isChecked
+            if (!FunctionBuildConfig.isV2NFromCar) {
+                tbV2NFromCar.isChecked = false
+            }
+        }
+
+        tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
+        //云端感知绘制
+        tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isDrawAiCloudFusion = isChecked
+            if (!FunctionBuildConfig.isDrawAiCloudFusion) {
+                tbDrawAiCloudFusion.isChecked = false
+            }
+        }
+
+        tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
+        //roma
+        tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isRomaMode = isChecked
+            if (!FunctionBuildConfig.isRomaMode) {
+                tbDrawRomaMode.isChecked = false
+            }
+        }
+
         //重启工控机所有节点
         btnIpcReboot.onClick {
             CallerAutoPilotControlManager.sendIpcReboot()

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

@@ -175,11 +175,7 @@ internal class SOPSettingView @JvmOverloads constructor(
         tbObu.isChecked = CallerObuApiManager.isConnected()
         tbObu.setOnCheckedChangeListener { _, isChecked ->
             if (!isChecked) {
-                if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
-                    CallerObuApiManager.resetObuIpAddress("192.168.1.199")
-                } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-                    CallerObuApiManager.resetObuIpAddress("192.168.8.199")
-                }
+                CallerObuApiManager.resetObuIpAddress("192.168.1.199")
             } else {
                 //断开链接
                 CallerObuApiManager.disConnectObu()

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

@@ -77,8 +77,11 @@ class PncActionsView @JvmOverloads constructor(
                 UiThreadHandler.post {
                     var actions: String? = null
                     planningActionMsg.actionMsg?.let { it ->
-                        actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number)
-
+                        try {
+                            actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number)
+                        } catch (e:Exception){
+                            e.printStackTrace()
+                        }
                         //如果是存在云端红绿灯数据条件下，设置云端数据
                         if (PncActionsHelper.isWaitingTrafficlight(it.drivingState.number, it.drivingAction.number)
                             && mTrafficLightResult != null

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

@@ -11,8 +11,8 @@ import android.view.animation.Animation
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import chassis.Chassis
+import com.mogo.eagle.core.function.api.map.angle.*
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning
 import com.mogo.eagle.core.function.hmi.R
 import kotlinx.android.synthetic.main.view_turn_light_status.view.*
 import kotlinx.coroutines.Dispatchers
@@ -55,7 +55,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
             //根据左右进行显示和隐藏，实际要判断每个来的时间和频度
             when (directionLight) {
                 Chassis.LightSwitch.LIGHT_LEFT -> { //左转向
-                    CallerVisualAngleManager.changeVisualAngle(Turning(true))
+                    CallerVisualAngleManager.changeAngle(Turning(true))
                     showNormalAnimation()
                     left_select_image.visibility = View.VISIBLE
                     right_select_image.visibility = View.GONE
@@ -63,7 +63,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
                     setAnimation(left_select_image)
                 }
                 Chassis.LightSwitch.LIGHT_RIGHT -> { //右转向
-                    CallerVisualAngleManager.changeVisualAngle(Turning(true))
+                    CallerVisualAngleManager.changeAngle(Turning(true))
                     showNormalAnimation()
                     left_select_image.visibility = View.GONE
                     right_select_image.visibility = View.VISIBLE
@@ -71,7 +71,7 @@ class TurnLightViewStatus @JvmOverloads constructor(
                     setAnimation(right_select_image)
                 }
                 else -> { //消失
-                    CallerVisualAngleManager.changeVisualAngle(Turning(false))
+                    CallerVisualAngleManager.changeAngle(Turning(false))
                     animationDisappear()
                 }
             }

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

@@ -4,7 +4,13 @@ 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.function.api.devatools.IMoGoDevaToolsListener
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import kotlinx.android.synthetic.main.view_blue_tooth.view.*
+import kotlinx.android.synthetic.main.view_status_bar.view.*
 
 /**
  * 魔戒蓝牙控件
@@ -14,10 +20,38 @@ class BlueToothView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+) : RelativeLayout(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
+
+    companion object{
+        private const val TAG = "BlueToothView"
+    }
 
     init {
         LayoutInflater.from(context).inflate(R.layout.view_blue_tooth, this, true)
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val isBluetoothConnect =
+            SharedPrefsMgr.getInstance(context).getBoolean(MfConstants.BLUETOOTH_STATUS, false)
+        if (isBluetoothConnect) {
+            mofangStatus(true)
+        }
+        CallerDevaToolsListenerManager.addListener(TAG, this)
+    }
+
+    override fun mofangStatus(status: Boolean) {
+        super.mofangStatus(status)
+        if (status) {
+            mofangView.setImageResource(R.drawable.icon_bluetooth_p)
+        } else {
+            mofangView.setImageResource(R.drawable.blue_tooth)
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerDevaToolsListenerManager.removeListener(TAG)
+    }
+
 }

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

@@ -7,14 +7,13 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.data.mofang.MfConstants
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.BarUtils
 import kotlinx.android.synthetic.main.view_status_bar.view.*
 import java.util.concurrent.CopyOnWriteArrayList
 
@@ -38,12 +37,12 @@ class StatusBarView @JvmOverloads constructor(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        viewStatusBarRight.addView(BatteryGroupView(this.context))
-        val isBluetoothConnect =
-            SharedPrefsMgr.getInstance(context).getBoolean(MfConstants.BLUETOOTH_STATUS, false)
-        if (isBluetoothConnect) {
-            updateMfStatus("MoFangManager", true)
+        post {
+            val params: ViewGroup.LayoutParams = getLayoutParams()
+            params.height = BarUtils.getStatusBarHeight()
+            layoutParams = params
         }
+        viewStatusBarRight.addView(BatteryGroupView(this.context))
 
         //添加view控制
         CallerHmiViewControlListenerManager.addListener(TAG,this)
@@ -106,14 +105,6 @@ class StatusBarView @JvmOverloads constructor(
         }
     }
 
-    override fun updateMfStatus(tag: String, status: Boolean) {
-        if (status) {
-            viewMofangStatus.setImageResource(R.drawable.icon_bluetooth_p)
-        } else {
-            viewMofangStatus.setImageResource(R.drawable.blue_tooth)
-        }
-    }
-
     private fun setTextColor(color: Int) {
         viewTextClock.setTextColor(color)
         viewStatusBarTag.setTextColor(color)

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

@@ -11,7 +11,9 @@ 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.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.main.AppListActivity
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_version_name.view.*
@@ -44,6 +46,12 @@ class VersionNameView @JvmOverloads constructor(
             showCurrentPadVersion()
             showCurrentMapVersion()
         }
+
+        // 调试入口，应对M1、M2没有安装Launcher的情况
+        setOnLongClickListener {
+            ActivityUtils.startActivity(AppListActivity::class.java)
+            true
+        }
     }
 
     /**

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

@@ -0,0 +1,40 @@
+package com.mogo.eagle.core.function.main
+
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.main.adapter.AppListAdapter
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import kotlinx.android.synthetic.main.activity_app_list.*
+
+
+/**
+ * 系统应用列表，调试使用，暂不对外显示开放，只通过隐藏后门进入
+ */
+class AppListActivity : AppCompatActivity(), AppListAdapter.OnItemClickedListener {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        BarUtils.hideStatusBarAndSticky(this.window)
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+        )
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_app_list)
+
+        val linearLayoutManager = GridLayoutManager(this, 6) //第二个参数为网格的列数
+        recyclerViewAppList.layoutManager = linearLayoutManager
+
+        recyclerViewAppList.itemAnimator = DefaultItemAnimator()
+        val appListAdapter =
+            AppListAdapter(this)
+        recyclerViewAppList.adapter = appListAdapter
+    }
+
+    override fun onItemClicked(appListAdapter: AppListAdapter, position: Int) {
+        ActivityUtils.startLauncherActivity(appListAdapter.getItem(position).packageName)
+    }
+}

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

@@ -8,9 +8,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.alibaba.android.arouter.launcher.ARouter
 import com.kwai.koom.base.MonitorManager.addMonitorConfig
 import com.kwai.koom.nativeoom.leakmonitor.LeakListener
 import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor.start
@@ -20,11 +18,9 @@ import com.mogo.commons.analytics.AnalyticsUtils
 import com.mogo.commons.context.ContextHolderUtil
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.commons.mvp.BaseFragment
 import com.mogo.commons.mvp.MvpActivity
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
-import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -38,12 +34,9 @@ import com.mogo.eagle.core.function.main.modules.MogoModulesManager
 import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils
 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.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils
-import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper
-import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ProcessUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -104,12 +97,12 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         decorView.clipToPadding = false
         var statusBarView = decorView.findViewWithTag<View>("status_bar")
         if (statusBarView == null) {
-            statusBarView = StatusBarView(this)
+            statusBarView = statusBar
             statusBarView.setTag("status_bar")
         }
         val statusBarLP = FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,
-            BarUtils.getStatusBarHeight()
+            ViewGroup.LayoutParams.WRAP_CONTENT,
         )
         statusBarLP.topMargin = 0
         statusBarLP.gravity = Gravity.TOP
@@ -117,11 +110,17 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
     }
 
     /**
-     * 修改statusBar 重写实现，需要继承 StatusBarView，xml中基础系统控件不要修改其id，拿来即用
+     * 修改statusBar重新赋值
      * @return StatusBarView
      */
-    protected val statusBarView: StatusBarView
-        get() = StatusBarView(this)
+    protected var statusBar: View?=null
+        get() {
+            return if (field == null) {
+                StatusBarView(this)
+            }else{
+                field
+            }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -353,30 +352,4 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         }
     }
 
-    /**
-     * 由于应用是单页面的，所以采用Fragment将各模块的UI进行分割解耦合
-     *
-     * @param newFragment 功能UI
-     * @param tagName     UI绑定的Tag
-     * @param containerId 要加入的资源ID
-     */
-    private fun addFragment(newFragment: Fragment, tagName: String, containerId: Int) {
-        var fragment = supportFragmentManager.findFragmentByTag(tagName)
-        if (fragment == null) {
-            fragment = newFragment
-        }
-        if (fragment == null) {
-            e(
-                SceneConstant.M_HMI + TAG,
-                "add fragment fail  cause fragment == null, container is " + ResourcesHelper.getResNameById(
-                    applicationContext, containerId
-                )
-            )
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .replace(containerId, fragment, tagName)
-            .commitAllowingStateLoss()
-    }
-
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -13,7 +13,6 @@ import android.os.Handler;
 import android.os.Process;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 
@@ -32,6 +31,7 @@ import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
+import com.mogo.eagle.core.utilcode.util.ActivityUtils;
 import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -46,8 +46,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import me.jessyan.autosize.utils.AutoSizeUtils;
-
 /**
  * 针对作为Launcher的情况，做个性化操作
  *
@@ -78,6 +76,11 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     private long pressEDownTime = 0;
     private long pressEUpTime = 0;
 
+    private int clickTime = 300; //单击
+    private int clickTimeInterval = 330;
+    private int longPressTime = 670;
+    private int longPressTimeInterval = 700;
+
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -89,6 +92,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     @Override
     protected void onResume() {
         super.onResume();
+        ActivityUtils.setDefaultL(this);
     }
 
     @Override
@@ -251,7 +255,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressADownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent A down pressADownTime = " + pressADownTime + "---" + (pressADownTime - startPressTime) + "----isCombinationKey = " + isCombinationKey + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressADownTime - startPressTime) > 360 && (pressADownTime - startPressTime) < 1300 && pressBDownTime > 0) {
+                    if ((pressADownTime - startPressTime) > clickTimeInterval && (pressADownTime - startPressTime) < longPressTime && pressBDownTime > 0) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 A 按AB组合 +1 ");
                         }
@@ -260,7 +264,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                     }
 
                     if (isCombinationKey != 3 && isCombinationKey != 1) {
-                        if ((pressADownTime - startPressTime) > 1320) {
+                        if ((pressADownTime - startPressTime) > longPressTimeInterval) {
                             if (isShowToast) {
                                 ToastUtils.showShort("方块 长按A -2 ");
                             }
@@ -271,7 +275,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressAUpTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent A up    pressAUpTime = " + pressAUpTime + "---" + (pressAUpTime - startPressTime) + "--pressBDownTime = " + pressBDownTime);
-                    if ((pressAUpTime - startPressTime) < 350 && isCombinationKey != 3) {
+                    if ((pressAUpTime - startPressTime) < clickTime && isCombinationKey != 3) {
                         isCombinationKey = 1;
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击A -1 ");
@@ -292,7 +296,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressBDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent B down pressBDownTime = " + pressBDownTime + "--差-" + (pressBDownTime - startPressTime) + "---isCombinationKey = " + isCombinationKey + "--pressADownTime = " + pressADownTime);
-                    if ((pressBDownTime - startPressTime) > 360 && (pressBDownTime - startPressTime) < 1300 && pressADownTime > 0) {
+                    if ((pressBDownTime - startPressTime) > clickTimeInterval && (pressBDownTime - startPressTime) < longPressTime && pressADownTime > 0) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 B 按AB组合 +1 ");
                         }
@@ -300,7 +304,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                         isCombinationKey = 3;
                     }
                     if (isCombinationKey != 3 && isCombinationKey != 1) {
-                        if ((pressBDownTime - startPressTime) > 1320) {
+                        if ((pressBDownTime - startPressTime) > longPressTimeInterval) {
                             if (isShowToast) {
                                 ToastUtils.showShort("方块 长按B 无操作 ");
                             }
@@ -310,7 +314,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     pressBUpTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent B up   pressBUpTime = " + pressBUpTime + "--差-" + (pressBUpTime - startPressTime) + "--pressADownTime = " + pressADownTime);
-                    if ((pressBUpTime - startPressTime) < 350 && isCombinationKey != 3) {
+                    if ((pressBUpTime - startPressTime) < clickTime && isCombinationKey != 3) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击B  0 ");
                         }
@@ -332,7 +336,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressCDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按C 无操作 time dif = " + (pressCDownTime - startPressTime));
-                    if ((pressCDownTime - startPressTime) > 1320) {
+                    if ((pressCDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按C 无操作 ");
                         }
@@ -341,7 +345,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                     pressCUpTime = System.currentTimeMillis();
                     isPressEnd = false;
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击C ← 向左变道 time dif = " + (pressCUpTime - startPressTime));
-                    if ((pressCUpTime - startPressTime) < 350) {
+                    if ((pressCUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击C ← 向左变道 ");
                         }
@@ -353,7 +357,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressDDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按D 无操作 time dif = " + (pressDDownTime - startPressTime));
-                    if ((pressDDownTime - startPressTime) > 1320) {
+                    if ((pressDDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按D 无操作 ");
                         }
@@ -362,7 +366,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                     pressDUpTime = System.currentTimeMillis();
                     isPressEnd = false;
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击D → 向右变道 time dif = " + (pressDUpTime - startPressTime));
-                    if ((pressDUpTime - startPressTime) < 350) {
+                    if ((pressDUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击D → 向右变道 ");
                         }
@@ -374,7 +378,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                 if (event.getAction() == KeyEvent.ACTION_DOWN) {
                     pressEDownTime = System.currentTimeMillis();
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按E 鸣笛 time dif = " + (pressEDownTime - startPressTime));
-                    if ((pressEDownTime - startPressTime) > 1320) {
+                    if ((pressEDownTime - startPressTime) > longPressTimeInterval) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 长按E 鸣笛 ");
                         }
@@ -394,7 +398,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
                     pressEUpTime = System.currentTimeMillis();
                     isPressEnd = false;
                     CallerLogger.INSTANCE.d(M_F + "MoFangManager", "方块 单击E 开启自动驾驶 time dif = " + (pressEUpTime - startPressTime));
-                    if ((pressEUpTime - startPressTime) < 350) {
+                    if ((pressEUpTime - startPressTime) < clickTime) {
                         if (isShowToast) {
                             ToastUtils.showShort("方块 单击E 开启自动驾驶 ");
                         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -3,35 +3,23 @@ package com.mogo.eagle.core.function.main;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
 
 import android.annotation.SuppressLint;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Process;
 
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-
 import com.bytedance.boost_multidex.BoostMultiDex;
-import com.elegant.utils.UiThreadHandler;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.MogoModule;
 import com.mogo.commons.module.MogoModulePaths;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
-import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
-import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener;
-import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ProcessUtils;
 import com.mogo.eagle.core.utilcode.util.SPUtils;
 
@@ -41,7 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
- * 默认初始化一些基础服务配置  todo 分离 overView业务 和 msgBox去各自模块中 --- 扶风
+ * 默认初始化一些基础服务配置  todo 分离 msgBox去自己的模块中 --- 扶风
  */
 public abstract class MainMoGoApplication extends AbsMogoApplication {
 
@@ -55,23 +43,16 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             return;
         }
         start = System.currentTimeMillis();
-        connectAmiIp();
         // Crash 日志收集
         initCrashConfig();
         initLogConfig();
         initTipToast();
         initModules();
-        //查询是否有版本的更新
-        queryAppUpgrade();
         if (ProcessUtils.isMainProcess(this)) {
-            initOverviewDb();
-            if (DebugConfig.isDebug()) {
-                initKoom();
-            }
             clearMessageBoxTable();
             CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
         }
-        upgradeProgressListener();
+        CallerDevaToolsManager.INSTANCE.updateUpgradeProgress();
     }
 
     @Override
@@ -80,15 +61,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         return true;
     }
 
-    private void queryAppUpgrade() {
-        UiThreadHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                CallerDevaToolsManager.INSTANCE.queryAppUpgrade();
-            }
-        },9000);
-    }
-
     @SuppressLint("SimpleDateFormat")
     private void clearMessageBoxTable() {
         new Thread(() -> {
@@ -121,56 +93,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         }).start();
     }
 
-    private void upgradeProgressListener() {
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
-//        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
-        builder.setContentTitle("下载");
-        builder.setContentText("正在下载");
-        final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-
-        CallerDevaToolsUpgradeListenerManager.INSTANCE.addListener(TAG, new IMogoDevaToolsUpgradeListener() {
-            @Override
-            public void onStart(@Nullable String url) {
-
-            }
-
-            @Override
-            public void onPause(@Nullable String url) {
-
-            }
-
-            @Override
-            public void onProgress(@Nullable String url, int length) {
-                builder.setProgress(100, length,false);
-                manager.notify(0x3, builder.build());
-                //下载进度提示
-                builder.setContentText("已下载" + length + "%");
-                CallerHmiManager.INSTANCE.updateStatusBarDownloadView(true, "download", length);
-            }
-
-            @Override
-            public void onFinished(@Nullable String url) {
-                builder.setContentText("已下载" + 100 + "%");
-                UiThreadHandler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        manager.cancel(0x3);
-                        CallerHmiManager.INSTANCE.updateStatusBarDownloadView(false, "download", 100);
-                    }
-                }, 1000);
-            }
-
-            @Override
-            public void onError(@Nullable String url, @Nullable String errorMsg) {
-
-            }
-        });
-    }
-
-    private void initKoom() {
-        KoomInitTask.INSTANCE.init(this);
-    }
-
     /**
      * 初始化异常采集配置
      */
@@ -193,18 +115,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         CallerDevaToolsManager.INSTANCE.init();
     }
 
-    private void initOverviewDb() {
-        CallerFuncBizManager.getBizProvider().initOverViewDb(this);
-    }
-
-    /**
-     * 连接ami
-     */
-    private void connectAmiIp() {
-        String ipAddress = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().getBaseContext()).getString(MoGoConfig.OBU_IP, "192.168.1.199");
-//        AmiClientManager.getInstance().setObuIp(ipAddress);
-    }
-
     private void initModules() {
         CallerLogger.INSTANCE.d(M_HMI + TAG, "initModules");
         // OBU 模块

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java

@@ -45,7 +45,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 /**
- * 针对作为Launcher的情况，做个性化操作
+ * 针对作为Launcher的情况，做个性化操作 TODO 测试用的，可删除
  *
  * @author tongchenfei
  */

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

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.widget.TextureVideoView
 
 /**
- * 视频广告
+ * 视频广告 TODO 测试用的，可删除
  */
 class VideoAdAtc : AppCompatActivity() {
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/adapter/AppListAdapter.java

@@ -0,0 +1,92 @@
+package com.mogo.eagle.core.function.main.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.eagle.core.function.hmi.R;
+import com.mogo.eagle.core.utilcode.util.AppUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class AppListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private OnItemClickedListener mOnItemClickedListener;
+
+    public interface OnItemClickedListener {
+        void onItemClicked(AppListAdapter appListAdapter, int position);
+    }
+
+    public static class AppViewHolder extends RecyclerView.ViewHolder {
+        public ImageView iconIv;
+        public TextView nameTv;
+
+        public AppViewHolder(View itemView) {
+            super(itemView);
+            iconIv = (ImageView) itemView.findViewById(R.id.list_item_app_icon_iv);
+            nameTv = (TextView) itemView.findViewById(R.id.list_item_app_name_tv);
+        }
+    }
+
+    private ArrayList<String> showApps = new ArrayList<>();
+
+    public AppListAdapter(OnItemClickedListener onItemClickedListener) {
+        // 设置被允许展示的APP
+        showApps.add("com.android.settings");
+
+        mOnItemClickedListener = onItemClickedListener;
+        mApps = new ArrayList<>();
+        for (AppUtils.AppInfo appInfo : AppUtils.getAppsInfo()) {
+            if (!appInfo.isSystem()) {
+                mApps.add(appInfo);
+            } else {
+                if (showApps.contains(appInfo.getPackageName())) {
+                    mApps.add(appInfo);
+                }
+            }
+        }
+    }
+
+    private List<AppUtils.AppInfo> mApps;
+
+    public AppUtils.AppInfo getItem(int position) {
+        return mApps.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mApps.size();
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_app_list, parent, false);
+        return new AppViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        AppViewHolder itemViewHolder = (AppViewHolder) holder;
+        itemViewHolder.iconIv.setImageDrawable(mApps.get(position).getIcon());
+        itemViewHolder.nameTv.setText(mApps.get(position).getName());
+        itemViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnItemClickedListener != null) {
+                    mOnItemClickedListener.onItemClicked(AppListAdapter.this, position);
+                }
+            }
+        });
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/res/layout/activity_app_list.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recyclerViewAppList"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/main_splash_bg"
+    android:clipToPadding="false"
+    android:padding="20dp"
+    android:scrollbarStyle="outsideOverlay"
+    android:scrollbars="vertical"
+    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:spanCount="6"
+    tools:itemCount="11"
+    tools:listitem="@layout/item_app_list" />

core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_app_list.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="250dp"
+    android:layout_height="250dp"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingStart="10dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="10dp"
+    android:paddingBottom="10dp">
+
+    <ImageView
+        android:id="@+id/list_item_app_icon_iv"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:src="@drawable/icon_ad" />
+
+    <TextView
+        android:id="@+id/list_item_app_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:singleLine="true"
+        android:text="应用名称"
+        android:textColor="@color/color_FFFFFF"
+        android:textSize="30dp" />
+
+</LinearLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml

@@ -5,10 +5,11 @@
     android:layout_height="@dimen/dp_54">
 
     <ImageView
-        android:scaleType="fitXY"
-        android:src="@drawable/blue_tooth"
+        android:id="@+id/mofangView"
         android:layout_width="@dimen/dp_54"
         android:layout_height="@dimen/dp_54"
+        android:scaleType="fitXY"
+        android:src="@drawable/blue_tooth"
         tools:ignore="ContentDescription" />
 
 </RelativeLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -242,6 +242,42 @@
                 android:textOn="关闭感知优化模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbV2NFromCar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启车端V2N预警"
+                android:textOn="关闭车端V2N预警"
+                android:textSize="@dimen/dp_24" />
+
+            <ToggleButton
+                android:id="@+id/tbDrawAiCloudFusion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启云端感知绘制"
+                android:textOn="关闭云端感知绘制"
+                android:textSize="@dimen/dp_24" />
+
+            <ToggleButton
+                android:id="@+id/tbDrawRomaMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启漫游模式"
+                android:textOn="关闭漫游模式"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_pnc_actions.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_100">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tvHmiPncActions"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml

@@ -29,6 +29,7 @@
         android:textColor="@color/color_2C2E30"
         android:textSize="@dimen/dp_35" />
 
+    <!--Wifi状态-->
     <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
         android:layout_width="@dimen/dp_54"
         android:layout_height="@dimen/dp_54"
@@ -36,8 +37,7 @@
         android:layout_marginStart="@dimen/dp_18" />
 
     <!--魔方连接状态-->
-    <ImageView
-        android:id="@+id/viewMofangStatus"
+    <com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/blue_tooth"

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

@@ -75,13 +75,10 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_function_call
 
         implementation rootProject.ext.dependencies.mogomap
-        implementation rootProject.ext.dependencies.mogomapapi
     } else {
         implementation project(':foudations:mogo-commons')
         implementation project(':core:mogo-core-res')
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
-        implementation project(':core:function-impl:mogo-core-function-datacenter')
         implementation project(':core:mogo-core-function-call')
         implementation project(":libraries:mogo-map")
     }

core/function-impl/mogo-core-function-map/src/main/AndroidManifest.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.eagle.core.function.view">
+    package="com.mogo.eagle.core.function.map">
 
+    <application>
+
+        <receiver android:name="com.mogo.eagle.core.function.business.ai.AiCloudRangeBroadcastReceiver">
+            <intent-filter>
+                <action android:name="com.map.aiCloud.notification" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+    </application>
 </manifest>

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt

@@ -2,10 +2,12 @@ package com.mogo.eagle.core.function
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
 import com.mogo.eagle.core.function.business.MapPointCloudSubscriber
 import com.mogo.eagle.core.function.business.SpeedLimitDataManager
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.aiCloudIdentifyDataManager
 import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber
 import com.mogo.eagle.core.function.business.routeoverlay.MogoRouteOverlayManager
 
@@ -20,6 +22,7 @@ class MapBizProvider :IMoGoFunctionServerProvider{
         MogoRouteOverlayManager.getInstance().init()
         MapPointCloudSubscriber.instance
         SpeedLimitDataManager.getInstance().start()
+        aiCloudIdentifyDataManager.init(AbsMogoApplication.getApp())
     }
 
     override fun onDestroy() {

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt

@@ -0,0 +1,306 @@
+package com.mogo.eagle.core.function.angle
+
+import android.content.*
+import android.os.*
+import android.util.*
+import androidx.lifecycle.*
+import androidx.lifecycle.Lifecycle.Event
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.data.config.*
+import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.data.map.*
+import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine
+import com.mogo.eagle.core.function.api.map.angle.*
+import com.mogo.eagle.core.function.api.map.angle.Scene
+import com.mogo.eagle.core.function.call.autopilot.*
+import com.mogo.eagle.core.function.call.map.*
+import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener
+import com.mogo.eagle.core.utilcode.kotlin.*
+import com.mogo.eagle.core.utilcode.mogo.*
+import com.mogo.eagle.core.utilcode.mogo.logger.*
+import com.zhidaoauto.map.sdk.open.tools.*
+import kotlinx.coroutines.*
+import kotlinx.coroutines.android.*
+import java.util.*
+import java.util.concurrent.atomic.*
+
+@Route(path = MogoServicePaths.PATH_VISUAL_ANGLE)
+class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
+
+    override val functionName: String
+        get() = "VisualAngleChange"
+    
+    companion object {
+        const val TAG = "VisualAngleChange"
+    }
+
+    private val triggerLocation = AtomicReference<MogoLocation>()
+
+    private val distanceOfCarToStopLine = AtomicReference(0.0)
+
+    private val travelled by lazy { AtomicReference(0.0) }
+
+    /**
+     * 业务实体，不对外暴露
+     * @param target: 目标场景
+     * @param isDisplay: 是否正在展示
+     * @param triggerTime: 触发时间
+     */
+    private data class Record(val target: Scene, var isDisplay: Boolean = false, var triggerTime: Long): Comparable<Record> {
+        override fun compareTo(other: Record): Int {
+            //如果时间一样，优先级越高，越靠近堆顶
+            return other.target.priority - target.priority
+        }
+    }
+
+    private val queue by lazy {
+        PriorityQueue<Record>()
+    }
+
+    private val listener = object : OnRoadListener {
+        private val roadId = AtomicReference<String>()
+        private val triggerRoadId = AtomicReference<String>()
+
+        override fun onRoadIdInfo(roadId: String) {
+            this.roadId.set(roadId)
+            Log.d(TAG, "-- onRoadIdInfo --: prev: ${this.triggerRoadId.get()} -> curr: $roadId")
+            val loc = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+            var triggerClose = false
+            val distance = distanceOfCarToStopLine.get() +  5
+            if (hasCrossRoad && distance > 0) {
+                val prev = triggerLocation.get()
+                if (prev != null && loc != null) {
+                    travelled.set(MapTools.distance(loc.longitude, loc.latitude, prev.longitude, prev.latitude) + travelled.get())
+                    triggerLocation.set(loc)
+                }
+                val oldRoadId = triggerRoadId.get()
+                Log.d(TAG, "-- onRoadIdInfo --: travelled --: ${travelled.get()}")
+                if ((travelled.get() > distance) && oldRoadId != null && oldRoadId != roadId) {
+                    distanceOfCarToStopLine.set(0.0)
+                    hasCrossRoad = false
+                    triggerRoadId.set(null)
+                    travelled.set(0.0)
+                    triggerLocation.set(null)
+                    Log.d(TAG, "-- onRoadIdInfo --: trigger close --")
+                    triggerClose = true
+                }
+            }
+            if (triggerClose) {
+                changeAngle(CrossRoad(false))
+            }
+        }
+
+
+        override fun onStopLineInfo(info: StopLine) {
+            Log.d(TAG, "-- onStopLineInfo --: ${info.distanceOfCarToStopLine}")
+            if (!hasCrossRoad && info.distanceOfCarToStopLine <= 30.0) {
+                hasCrossRoad = true
+                triggerRoadId.set(this.roadId.get())
+                distanceOfCarToStopLine.set(info.distanceOfCarToStopLine)
+                triggerLocation.set(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02())
+                changeAngle(CrossRoad(true))
+            }
+        }
+    }
+
+    override fun init(context: Context?) {
+        if (Thread.currentThread() != Looper.getMainLooper().thread) {
+            scope.launch {
+                initListen(context)
+            }
+        } else {
+            initListen(context)
+        }
+    }
+
+    private fun initListen(ctx: Context?) {
+        ctx ?: return
+        ctx.lifeCycleOwner.lifecycle.addObserver(object : LifecycleEventObserver {
+            override fun onStateChanged(source: LifecycleOwner, event: Event) {
+                if (event == ON_DESTROY) {
+                    CallerMapRoadListenerManager.unRegisterRoadListener("VisualAngleChange")
+                }
+            }
+        })
+        CallerMapRoadListenerManager.registerRoadListener("VisualAngleChange", listener)
+    }
+
+    @Volatile
+    private var hasCrossRoad = false
+
+
+    private var scope: CoroutineScope = acquireScope()
+        @Synchronized
+        get() {
+            if (field.isActive) {
+                return field
+            }
+            val scope = acquireScope()
+            field = scope
+            return field
+        }
+
+    private var defaultDelayJob: Job? = null
+
+    private fun acquireScope(): CoroutineScope {
+        return CoroutineScope(Handler(Looper.getMainLooper()).asCoroutineDispatcher("change-visual-angle") + SupervisorJob())
+    }
+
+
+    override fun onDestroy() {
+        CallerMapRoadListenerManager.unRegisterRoadListener("VisualAngleChange")
+    }
+
+    @Volatile
+    private var mLevel:Boolean = false
+
+    override fun updateLongSightLevel(level:Boolean){
+        mLevel = level
+    }
+
+    override fun changeAngle(scene: Scene) {
+        val appIdentityMode = FunctionBuildConfig.appIdentityMode
+        if (AppIdentityModeUtils.isBus(appIdentityMode) && AppIdentityModeUtils.isPassenger(appIdentityMode)) {
+            return
+        }
+        if(mLevel){
+            return
+        }
+        val triggerTime = SystemClock.elapsedRealtime()
+        scope.launch {
+            Log.d(TAG, "--- 1 ---")
+            val displayed = getDisplayed()
+            if (displayed == null) {
+                Log.d(TAG, "--- 2 ---")
+                if (scene is Turning) {
+                    if (!scene.open) {
+                        changeAngle(Default())
+                        return@launch
+                    }
+                }
+                if (scene is CrossRoad) {
+                    if (!scene.open) {
+                        changeAngle(Default())
+                        return@launch
+                    }
+                }
+                doRealVisualAngleChange(triggerTime, scene, null)
+            } else {
+                val prev = displayed.target
+                Log.d(TAG, "--- 3 --- old: $prev -> cur: $scene")
+                val prevTriggerTime = displayed.triggerTime
+                if (scene !is Default && prev.priority > scene.priority && (prev is RoadEvent || prev is TooClose)) {
+                    val displayDuration = triggerTime - prevTriggerTime
+                    Log.d(TAG, "--- 4 ---:场景[$prev], 已展示时长: duration: $displayDuration")
+                    if (displayDuration < prev.displayThreshold) {
+                        Log.d(TAG, "--- 5 --- 场景[$prev]:仍在保护展示时长内，直接return")
+                        return@launch
+                    } else {
+                        Log.d(TAG, "--- 6 --- 场景[$prev]:已过保护展示时长，从展示的队列中移除，显示默认视角")
+                        queue -= displayed
+                        changeAngle(Default())
+                        return@launch
+                    }
+                }
+                if (prev is Turning && scene is Turning) {
+                    val isOpen = scene.open
+                    if (!isOpen) {
+                        Log.d(TAG, "--- 7 --- 场景[$scene], 收到关闭通知")
+                        queue -= displayed
+                        changeAngle(Default())
+                        return@launch
+                    }
+                }
+                if (prev is CrossRoad && scene is CrossRoad) {
+                    val isOpen = scene.open
+                    if (!isOpen) {
+                        Log.d(TAG, "--- 8 --- old: $prev -> cur: $scene")
+                        queue -= displayed
+                        changeAngle(Default())
+                        return@launch
+                    }
+                }
+                if (prev.priority == scene.priority) {
+                    Log.d(TAG, "--- 9 --- 场景[$prev]正在展示，尚未收到关闭，优先级一致，直接return")
+                    return@launch
+                }
+                if (prev.priority > scene.priority && prev.displayThreshold < 0) {
+                    Log.d(TAG, "--- 10 --- 场景[$prev]正在展示，尚未收到关闭，场景，依然展示当前场景，直接return")
+                    return@launch
+                }
+                doRealVisualAngleChange(triggerTime, scene, displayed)
+            }
+        }
+    }
+
+    private fun CoroutineScope.doRealVisualAngleChange(triggerTime: Long, target: Scene, displayed: Record? = null) {
+        if (target is Default) {
+            Log.d(TAG, "--- doRealVisualAngleChange --- 1 ---")
+            displayed?.also {
+                queue -= it
+            }
+            defaultDelayJob?.safeCancel()
+            launch {
+                val delay = target.unit.toMillis(target.delay)
+                Log.d(TAG, "--- doRealVisualAngleChange --- 2 ---")
+                delay(delay)
+                Log.d(TAG, "--- doRealVisualAngleChange --- 3 ---")
+                doChangeAngle(Record(target, triggerTime = triggerTime))
+            }.also { itx ->
+                itx.invokeOnCompletion {
+                    if (it is CancellationException) {
+                        Log.d(TAG, "--- doRealVisualAngleChange --- 4 ---")
+                    }
+                }
+                defaultDelayJob = itx
+            }
+        } else {
+            Log.d(TAG, "--- doRealVisualAngleChange --- 5 ---")
+            defaultDelayJob?.safeCancel()
+            if (displayed == null || displayed.target.priority <= target.priority) {
+                Log.d(TAG, "--- doRealVisualAngleChange --- 6 ---")
+                displayed?.also {
+                    queue -= it
+                }
+                if (target is Turning) {
+                    if (!target.open) {
+                        Log.d(TAG, "--- doRealVisualAngleChange --- 7 ---")
+                        changeAngle(Default())
+                        return
+                    }
+                }
+                if (target is CrossRoad) {
+                    if (!target.open) {
+                        Log.d(TAG, "--- doRealVisualAngleChange --- 8 ---")
+                        changeAngle(Default())
+                        return
+                    }
+                }
+                Log.d(TAG, "--- doRealVisualAngleChange --- 10 ---")
+                doChangeAngle(Record(target, triggerTime = triggerTime))
+            }
+        }
+    }
+
+    @OptIn(InternalCoroutinesApi::class)
+    private fun doChangeAngle(record: Record) {
+        val angle = record.target.angle
+        CallerMapUIServiceManager.getMapUIController()?.also {
+            Log.d(TAG, "--- doChangeAngle ---： ${record.target}")
+            if (record.target !is Default) {
+                record.isDisplay = true
+                kotlinx.coroutines.internal.synchronized(queue) {
+                    queue += record
+                }
+            }
+            it.changeMapVisualAngle(angle, null)
+        }
+    }
+
+    /**
+     * 是否有正在展示的
+     */
+    @Synchronized
+    private fun getDisplayed() = queue.firstOrNull()
+}

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt

@@ -0,0 +1,91 @@
+package com.mogo.eagle.core.function.business.ai
+
+import android.content.Context
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.business.ai.net.AiCloudIdentifyNetWorkModel
+import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
+import com.mogo.map.listener.IMogoMapListener
+import com.mogo.map.uicontroller.VisualAngleMode
+import mogo.yycp.api.proto.SocketDownData
+
+class AiCloudIdentifyDataManager : IMogoMapListener {
+
+    companion object {
+        private const val TAG = "AiCloudIdentifyData"
+
+        var START_METRE = 200
+        var END_METRE = 2000
+
+        @JvmStatic
+        val aiCloudIdentifyDataManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+            AiCloudIdentifyDataManager()
+        }
+    }
+
+    private val aiCloudIdentifyNetWorkModel = AiCloudIdentifyNetWorkModel()
+    private var showAiCloud = false
+
+    fun init(mContext: Context) {
+        MogoAiCloudSocketManager.getInstance(mContext)
+            .registerOnMessageListener(
+                0x040003, //低频数据
+                object : IMogoOnMessageListener<SocketDownData.SocketDownDataProto> {
+                    override fun target(): Class<SocketDownData.SocketDownDataProto> {
+                        return SocketDownData.SocketDownDataProto::class.java
+                    }
+
+                    override fun onMsgReceived(obj: SocketDownData.SocketDownDataProto?) {
+                        if (!FunctionBuildConfig.isDrawAiCloudFusion) {
+                            MapIdentifySubscriber.instance.clearAiCloudRoma()
+                            return
+                        }
+                        obj?.let {
+                            obj.data?.let {
+                                if (showAiCloud) {
+                                    if (it.allListList == null || it.allListList.size == 0) {
+                                        MapIdentifySubscriber.instance.clearAiCloudRoma()
+                                        return
+                                    }
+                                    MapIdentifySubscriber.instance.renderAiCloudResult(it.allListList)
+                                }
+                            }
+                        }
+                    }
+                })
+        requestRangeOfIdentify()
+    }
+
+    fun requestRangeOfIdentify() {
+        aiCloudIdentifyNetWorkModel.requestIdentifyRange({
+            CallerLogger.d(
+                M_MAP + TAG,
+                "requestIdentifyRange ok startRange:$START_METRE, endRange:$END_METRE"
+            )
+        }, {
+            CallerLogger.d(
+                M_MAP + TAG,
+                "requestIdentifyRange error : $it , startRange:$START_METRE, endRange:$END_METRE"
+            )
+        })
+    }
+
+    override fun onMapVisualAngleChanged(visualAngleMode: VisualAngleMode) {
+        super.onMapVisualAngleChanged(visualAngleMode)
+        when {
+            visualAngleMode.isRoma -> {
+                showAiCloud = true
+                FunctionBuildConfig.isDrawIdentifyData = false
+            }
+            else -> {
+                showAiCloud = false
+                FunctionBuildConfig.isDrawIdentifyData = true
+                MapIdentifySubscriber.instance.clearAiCloudRoma()
+            }
+        }
+    }
+
+}

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudRangeBroadcastReceiver.kt

@@ -0,0 +1,30 @@
+package com.mogo.eagle.core.function.business.ai
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.START_METRE
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.aiCloudIdentifyDataManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
+
+class AiCloudRangeBroadcastReceiver : BroadcastReceiver() {
+
+    companion object {
+        private const val TAG = "AiCloudRangeBroadcastReceiver"
+        private const val START_RANGE = "startRange"
+        private const val END_RANGE = "endRange"
+
+        // adb shell am broadcast -a com.map.aiCloud.notification --ei startRange 140 --ei endRange 2000
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val startRange = intent.getIntExtra(START_RANGE, START_METRE)
+        val endRange = intent.getIntExtra(END_RANGE, END_METRE)
+        START_METRE = startRange
+        END_METRE = endRange
+        CallerLogger.d("$M_MAP$TAG", "startRange:$startRange, endRange:$endRange")
+        aiCloudIdentifyDataManager.requestRangeOfIdentify()
+    }
+}

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt

@@ -0,0 +1,63 @@
+package com.mogo.eagle.core.function.business.ai.net
+
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.BaseResponse
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE
+import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.START_METRE
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.network.apiCall
+import com.mogo.eagle.core.network.request
+import com.zhjt.service_biz.FuncConfig
+
+class AiCloudIdentifyNetWorkModel {
+
+    companion object {
+        val aiCloudIdentifyNetWorkModel by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+            AiCloudIdentifyNetWorkModel()
+        }
+    }
+
+    private fun getHost(): String {
+        var host = "http://dzt-city.zhidaozhixing.com"
+        when (DebugConfig.getNetMode()) {
+            DebugConfig.NET_MODE_DEV,
+            DebugConfig.NET_MODE_QA -> host = "http://dzt-qa-city.zhidaozhixing.com"
+        }
+        return host
+    }
+
+    private fun getNetWorkApi(baseUrl: String = getHost()): IAiCloudIdentifyApiService {
+        return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
+            .create(IAiCloudIdentifyApiService::class.java)
+    }
+
+    fun requestIdentifyRange(
+        onSuccess: (() -> Unit),
+        onError: ((String) -> Unit)
+    ) {
+        request<BaseResponse<Any>> {
+            val map = mutableMapOf<String, Any>()
+            start {
+                map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
+                map["status"] = true
+                map["startMetre"] = START_METRE
+                map["endMetre"] = END_METRE
+                map["type"] = 1
+            }
+            loader {
+                apiCall {
+                    getNetWorkApi().identifyRange(map)
+                }
+            }
+            onSuccess {
+                onSuccess.invoke()
+            }
+            onError {
+                it.message?.let { errorMsg ->
+                    onError.invoke(errorMsg)
+                }
+            }
+        }
+    }
+}

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt

@@ -0,0 +1,13 @@
+package com.mogo.eagle.core.function.business.ai.net
+
+import com.mogo.eagle.core.data.BaseResponse
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface IAiCloudIdentifyApiService {
+
+    @Headers("Content-type:application/json;charset=UTF-8")
+    @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet")
+    suspend fun identifyRange(@Body map: MutableMap<String, Any>): BaseResponse<Any>
+}

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

@@ -3,16 +3,35 @@ package com.mogo.eagle.core.function.business.identify
 import com.mogo.eagle.core.data.traffic.TrafficData
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
+import mogo.yycp.api.proto.SocketDownData
 
 interface Identify {
 
-    fun renderAdasRecognizedResult(resultList: List<TrackedObject>?)
+    fun renderAdasRecognizedResult(resultList: List<TrackedObject>?) {
 
-    fun renderPlanningWarningObj(planningObjects: List<MessagePad.PlanningObject>?)
+    }
+
+    fun renderAiCloudResult(resultList: List<SocketDownData.CloudRoadDataProto>) {
+
+    }
+
+    fun renderPlanningWarningObj(planningObjects: List<MessagePad.PlanningObject>?) {
+
+    }
 
     fun renderOBUWarningObj(exist: Boolean, obuTrafficData: TrafficData) {
 
     }
 
-    fun clearOldMarker()
+    fun clearOldMarker() {
+
+    }
+
+    fun clearAiMarker() {
+
+    }
+
+    fun getIdentifyObj(uuid: String): TrackedObject? {
+        return null
+    }
 }

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

@@ -0,0 +1,102 @@
+package com.mogo.eagle.core.function.business.identify
+
+import android.annotation.SuppressLint
+import androidx.collection.ArraySet
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
+import com.mogo.map.MogoMarkerManager
+import mogo.yycp.api.proto.SocketDownData
+import java.util.concurrent.ConcurrentHashMap
+
+class IdentifyAiCloudDataDrawer : Identify {
+
+    companion object {
+        private const val TAG = "IdentifyDataDrawer"
+    }
+
+    /**
+     * 上一帧数据的缓存
+     */
+    private val mMarkersCaches = ConcurrentHashMap<String, SocketDownData.CloudRoadDataProto>()
+
+    /**
+     * 记录每次实际绘制的交通元素UUID
+     */
+    @SuppressLint("NewApi")
+    private val trafficDataUuidList = ArraySet<String>()
+
+    /**
+     * 过滤后的数据集合
+     */
+    @SuppressLint("NewApi")
+    private val mFilterTrafficData = HashMap<String, SocketDownData.CloudRoadDataProto>()
+
+    @SuppressLint("NewApi")
+    override fun renderAiCloudResult(resultList: List<SocketDownData.CloudRoadDataProto>) {
+        if (resultList.isEmpty()) {
+            clearOldMarker()
+            w(TAG, "感知数据为空无需渲染……")
+            return
+        }
+        if (!MogoStatusManager.getInstance().isVrMode) {
+            clearOldMarker()
+            w(TAG, "渲染 adas 识别的数据 当前不是VR模式")
+            return
+        }
+
+        //清除缓存
+        for (data in resultList) {
+            if (trafficDataUuidList.size > 0 && trafficDataUuidList.contains("" + data.uuid)) {
+                trafficDataUuidList.remove("" + data.uuid)
+            }
+        }
+
+        //清除缓存,删除marker
+        val it: MutableIterator<*> = trafficDataUuidList.iterator()
+        while (it.hasNext()) {
+            val key = it.next() as String
+            it.remove()
+            mMarkersCaches.remove(key)
+            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                .removeMarker(key.hashCode().toString())
+        }
+
+        val filterList = filterTrafficData(resultList)
+        if (filterList.size > 0) {
+            // 绘制新数据
+            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                .updateBatchAiMarkerPosition(filterList)
+        }
+    }
+
+    /**
+     * 数据过滤器
+     *
+     * @return 过滤后的数据集合
+     */
+    @SuppressLint("NewApi")
+    private fun filterTrafficData(trafficData: List<SocketDownData.CloudRoadDataProto>): HashMap<String, SocketDownData.CloudRoadDataProto> {
+        mFilterTrafficData.clear()
+        trafficDataUuidList.clear()
+        for (data in trafficData) {
+            val uuid = "" + data.uuid
+            mMarkersCaches[uuid] = data
+            trafficDataUuidList.add(uuid)
+            mFilterTrafficData[uuid] = data
+        }
+        return mFilterTrafficData
+    }
+
+    @SuppressLint("NewApi")
+    override fun clearAiMarker() {
+        trafficDataUuidList.clear()
+        mMarkersCaches.forEach { (uuid, _) ->
+            mMarkersCaches.remove(uuid)
+            MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                .removeMarker(uuid.hashCode().toString())
+        }
+        mFilterTrafficData.clear()
+    }
+
+}

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

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuWarningListenerManager
 import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
+import mogo.yycp.api.proto.SocketDownData
 
 object IdentifyFactory : Identify, IMoGoObuStatusListener {
 
@@ -22,7 +23,12 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
         internal val beautifyDataDrawer = IdentifyBeautifyDataDrawer()
     }
 
+    object AiIdentify {
+        internal val aiCloudDataDrawer = IdentifyAiCloudDataDrawer()
+    }
+
     private var identify: Identify? = null
+    private var aiCloudIdentify: Identify? = null
 
     init {
         identify = if (FunctionBuildConfig.isBeautyMode) {
@@ -30,14 +36,17 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
         } else {
             DriverIdentify.originDataDrawer
         }
+        aiCloudIdentify = AiIdentify.aiCloudDataDrawer
         CallerObuWarningListenerManager.addListener(TAG, this)
     }
 
     private const val MSG_DATA_TRACK = 0
-    private const val MSG_DATA_WARNING = 1
-    private const val MSG_DATA_OBU_WARNING_UPDATE = 2
-    private const val MSG_DATA_OBU_WARNING_REMOVE = 3
-    private const val MSG_DATA_CLEAR = 4
+    private const val MSG_DATA_AI_TRACK = 1
+    private const val MSG_DATA_WARNING = 2
+    private const val MSG_DATA_OBU_WARNING_UPDATE = 3
+    private const val MSG_DATA_OBU_WARNING_REMOVE = 4
+    private const val MSG_DATA_CLEAR = 5
+    private const val MSG_DATA_AI_CLEAR = 6
 
     // 维护一个线程定时轮询数据进行地图绘制
     private val mDrawerHandler: Handler =
@@ -63,6 +72,11 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
                             identify!!.renderAdasRecognizedResult(msg.obj as List<TrackedObject>?)
                         }
                     }
+                    MSG_DATA_AI_TRACK -> {
+                        if (msg.obj is List<*>) {
+                            aiCloudIdentify!!.renderAiCloudResult(msg.obj as List<SocketDownData.CloudRoadDataProto>)
+                        }
+                    }
                     MSG_DATA_WARNING -> {
                         if (msg.obj is List<*>) {
                             identify!!.renderPlanningWarningObj(msg.obj as List<MessagePad.PlanningObject>?)
@@ -81,6 +95,9 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
                     MSG_DATA_CLEAR -> {
                         identify!!.clearOldMarker()
                     }
+                    MSG_DATA_AI_CLEAR -> {
+                        aiCloudIdentify!!.clearAiMarker()
+                    }
                 }
             }
         }
@@ -92,6 +109,13 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
         mDrawerHandler.sendMessage(message)
     }
 
+    override fun renderAiCloudResult(resultList: List<SocketDownData.CloudRoadDataProto>) {
+        val message = Message.obtain()
+        message.what = MSG_DATA_AI_TRACK
+        message.obj = resultList
+        mDrawerHandler.sendMessage(message)
+    }
+
     override fun renderPlanningWarningObj(planningObjects: List<MessagePad.PlanningObject>?) {
         val message = Message.obtain()
         message.what = MSG_DATA_WARNING
@@ -105,6 +129,16 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener {
         mDrawerHandler.sendMessage(message)
     }
 
+    override fun clearAiMarker() {
+        val message = Message.obtain()
+        message.what = MSG_DATA_AI_CLEAR
+        mDrawerHandler.sendMessage(message)
+    }
+
+    override fun getIdentifyObj(uuid: String): TrackedObject? {
+        return identify?.getIdentifyObj(uuid)
+    }
+
     override fun updateTrackerWarningInfo(trafficData: TrafficData) {
         super.updateTrackerWarningInfo(trafficData)
         val message = Message.obtain()

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

@@ -1,12 +1,17 @@
 package com.mogo.eagle.core.function.business.identify
 
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_IDENTIFY
 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.call.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
+import mogo.yycp.api.proto.SocketDownData
 
 /**
  * 订阅感知数据的订阅者
@@ -14,7 +19,8 @@ import mogo.telematics.pad.MessagePad.TrackedObject
  *
  * @author donghongyu
  */
-class MapIdentifySubscriber private constructor() : IMoGoSubscriber,
+@Route(path = PATH_IDENTIFY)
+class MapIdentifySubscriber private constructor() : IMoGoIdentifyListener, IMoGoSubscriber,
     IMoGoAutopilotIdentifyListener {
 
     private val TAG = "MapIdentifySubscriber"
@@ -36,7 +42,6 @@ class MapIdentifySubscriber private constructor() : IMoGoSubscriber,
 
     override fun onDestroy() {
         CallerAutopilotIdentifyListenerManager.removeListener(TAG)
-
     }
 
     override fun onAutopilotIdentifyDataUpdate(trafficData: List<TrackedObject>?) {
@@ -53,6 +58,26 @@ class MapIdentifySubscriber private constructor() : IMoGoSubscriber,
         }
     }
 
+    fun renderAiCloudResult(cloudData: List<SocketDownData.CloudRoadDataProto>) {
+        try {
+            if (FunctionBuildConfig.isDrawAiCloudFusion) {
+                ThreadUtils.getSinglePool().execute {
+//                    aiCloudDataDrawer.renderAiCloudResult(cloudData)
+                    IdentifyFactory.renderAiCloudResult(cloudData)
+                }
+            } else {
+                clearAiCloudRoma()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    fun clearAiCloudRoma() {
+//        aiCloudDataDrawer.clearAiMarker()
+        IdentifyFactory.clearAiMarker()
+    }
+
     override fun onAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
         try {
             if (FunctionBuildConfig.isDrawIdentifyData && FunctionBuildConfig.debugTrackerProvider == 0) {
@@ -67,7 +92,12 @@ class MapIdentifySubscriber private constructor() : IMoGoSubscriber,
         }
     }
 
-    override fun onAutopilotWarnMessage(warn: MessagePad.Warn?) {
+    override fun getIdentifyObj(uuid: String): TrackedObject? {
+        return IdentifyFactory.getIdentifyObj(uuid)
+    }
+
+    override fun init(context: Context?) {
 
     }
+
 }

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

@@ -55,8 +55,8 @@ public class TrackObj {
     }
 
     private void correct() {
-//        calAverageSpeedAndType();
-//        calLoc();
+        calAverageSpeedAndType();
+        calLoc();
 //        calHeading();
     }
 
@@ -107,18 +107,18 @@ public class TrackObj {
 
     private void calHeading() {
         //更正数据,速度小于LIMIT_SPEED使用上一帧数据
-        if (relativeStatic()) {
-            if (roadAngle != 0.0) {
-                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(lon, lat, -1);
-                if (centerLine != null && centerLine.getAngle() != 0) {
-                    cacheData = cacheData.toBuilder().setHeading(centerLine.getAngle()).build();
-                } else {
-                    cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build();
-                }
-            } else {
-                cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build();
-            }
-        }
+//        if (relativeStatic()) {
+//            if (roadAngle != 0.0) {
+//                CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(lon, lat, -1);
+//                if (centerLine != null && centerLine.getAngle() != 0) {
+//                    cacheData = cacheData.toBuilder().setHeading(centerLine.getAngle()).build();
+//                } else {
+//                    cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build();
+//                }
+//            } else {
+//                cacheData = cacheData.toBuilder().setHeading(circleQueue.getLastFrame().getHeading()).build();
+//            }
+//        }
     }
 
     public double getRecentlyTime() {

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

@@ -9,9 +9,8 @@ object TrackerSourceColorHelper {
 
     @SuppressLint("NewApi")
     fun filterData(data: TrackedObject): Boolean {
-        if (!FunctionBuildConfig.isDrawUnknownIdentifyData && data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
-            || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_501.type ||  data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_502.type
-                ) {
+        if (!FunctionBuildConfig.isDrawUnknownIdentifyData && (data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type
+                    || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_501.type || data.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_502.type)) {
             return true
         }
         var trackIPCFilter = true

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java

@@ -41,7 +41,7 @@ public class MogoMapService implements IMogoMapService {
     }
 
     @Override
-    public IMogoOverlayManager getOverlayManager(Context context) {
+    public IMogoOverlayManager getOverlayManager() {
         return MogoOverlayManager.getInstance();
     }
 
@@ -52,6 +52,5 @@ public class MogoMapService implements IMogoMapService {
 
     @Override
     public void init(Context context) {
-        CallerVisualAngleManager.INSTANCE.init(context);
     }
 }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/BaseDrawer.java

@@ -5,7 +5,7 @@ import android.content.Context;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.function.impl.marker.AdasRecognizedType;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 
 /**
  * @author congtaowang

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapCameraInfoView.java

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.map.marker.MogoMarkerOptions;
 
 /**

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerBaseView.java

@@ -12,7 +12,7 @@ import android.widget.LinearLayout;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.eagle.core.utilcode.util.ViewUtils;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/MapMarkerView.java

@@ -13,7 +13,7 @@ import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.eagle.core.data.map.PoiWrapper;
 import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.eagle.core.data.config.CloudPoiManager;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/view/OnlineCarMarkerView.java

@@ -5,7 +5,7 @@ import android.graphics.BitmapFactory;
 import android.view.View;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.map.marker.IMogoMarker;
 
 import java.lang.ref.SoftReference;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/CarOverlay.java

@@ -14,7 +14,7 @@ import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
 import com.amap.api.maps.model.Polyline;
 import com.autonavi.amap.mapcore.IPoint;
-import com.mogo.eagle.core.function.view.R;
+import com.mogo.eagle.core.function.map.R;
 
 import java.util.concurrent.ScheduledExecutorService;
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MakerWithCount.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.function.view.R
+import com.mogo.eagle.core.function.map.R
 import kotlinx.android.synthetic.main.view_maker_with_count.view.*
 
 class MakerWithCount @JvmOverloads constructor(

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/V2XMarkerView.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.function.view.R
+import com.mogo.eagle.core.function.map.R
 
 class V2XMarkerView @JvmOverloads constructor(
     context: Context,

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt

@@ -22,7 +22,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
-import com.mogo.eagle.core.function.view.R
+import com.mogo.eagle.core.function.map.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt

@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
+import android.view.View
 import android.widget.RelativeLayout
 import android.widget.TextView
 import ch.hsr.geohash.GeoHash
@@ -16,7 +17,6 @@ import com.amap.api.maps.CameraUpdate
 import com.amap.api.maps.CameraUpdateFactory
 import com.amap.api.maps.TextureMapView
 import com.amap.api.maps.model.*
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.Infrastructure
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.v2x.V2XEvent
@@ -28,6 +28,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showVideoDialog
+import com.mogo.eagle.core.function.map.R
 import com.mogo.eagle.core.function.smp.MakerWithCount
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.callback
@@ -37,7 +38,6 @@ import com.mogo.eagle.core.function.smp.MarkerDrawerManager.planningPoints
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.startLoopCalCarLocation
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.updateRoutePoints
 import com.mogo.eagle.core.function.smp.V2XMarkerView
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isTaxi
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import me.jessyan.autosize.utils.AutoSizeUtils
@@ -52,7 +52,20 @@ class OverMapView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr), IMoGoChassisLocationGCJ02Listener {
+) : RelativeLayout(context, attrs, defStyleAttr), IMoGoChassisLocationGCJ02Listener,
+    IMoGoPlanningRottingListener {
+
+    // =============自定义属性相关=============
+    private var mapStylePath: String? = null
+    private var mapStyleExtraPath: String? = null
+    private var carDrawable: Int = -1
+    private var compassDrawable: Int = -1
+    private var startPointDrawable: Int = -1
+    private var endPointDrawable: Int = -1
+    private var arrivedDrawable: Int = -1
+    private var unArrivedDrawable: Int = -1
+    private var resetDrawable: Int = -1
+
     private var mMapView: TextureMapView? = null
     private var mAMap: AMap? = null
     private val zoomLevel = 15
@@ -93,6 +106,20 @@ class OverMapView @JvmOverloads constructor(
 
     init {
         try {
+            val typedArray = context.obtainStyledAttributes(attrs, R.styleable.OverMapView)
+            mapStylePath = typedArray.getString(R.styleable.OverMapView_mapStylePath)
+            mapStyleExtraPath = typedArray.getString(R.styleable.OverMapView_mapStyleExtraPath)
+            carDrawable = typedArray.getResourceId(R.styleable.OverMapView_carDrawable, -1)
+            compassDrawable = typedArray.getResourceId(R.styleable.OverMapView_compassDrawable, -1)
+            startPointDrawable =
+                typedArray.getResourceId(R.styleable.OverMapView_startPointDrawable, -1)
+            endPointDrawable =
+                typedArray.getResourceId(R.styleable.OverMapView_endPointDrawable, -1)
+            arrivedDrawable = typedArray.getResourceId(R.styleable.OverMapView_arrivedDrawable, -1)
+            unArrivedDrawable =
+                typedArray.getResourceId(R.styleable.OverMapView_unArrivedDrawable, -1)
+            resetDrawable = typedArray.getResourceId(R.styleable.OverMapView_resetDrawable, -1)
+            typedArray.recycle()
             initView(context)
         } catch (e: Exception) {
             e.printStackTrace()
@@ -128,22 +155,19 @@ class OverMapView @JvmOverloads constructor(
     }
     // =================必须通知高德地图生命周期的变化=================
 
+    fun hideResetView() {
+        overLayerView?.visibility = View.GONE
+    }
+
     private fun initView(context: Context) {
         mContext = context
         val smpView = LayoutInflater.from(context).inflate(R.layout.module_overview_map_view, this)
         mMapView = smpView.findViewById(R.id.aMapView)
         overLayerView = findViewById(R.id.overLayer)
-        if (isTaxi(FunctionBuildConfig.appIdentityMode)) {
-            overLayerView?.background = resources.getDrawable(R.drawable.amap_reset)
-            arrivedBitmap = BitmapDescriptorFactory.fromResource(R.drawable.taxi_map_arrow_arrived)
-            unArrivedBitmap =
-                BitmapDescriptorFactory.fromResource(R.drawable.taxi_map_arrow_un_arrive)
-        } else {
-            overLayerView?.background = resources.getDrawable(R.drawable.amap_reset_bus)
-            arrivedBitmap = BitmapDescriptorFactory.fromResource(R.drawable.arrow_arrived_img)
-            unArrivedBitmap = BitmapDescriptorFactory.fromResource(R.drawable.amap_bus_smooth_route)
-        }
-        CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener)
+        overLayerView?.background = resources.getDrawable(if (resetDrawable != -1) resetDrawable else R.drawable.amap_reset)
+        arrivedBitmap = BitmapDescriptorFactory.fromResource(if (arrivedDrawable != -1) arrivedDrawable else R.drawable.taxi_map_arrow_arrived)
+        unArrivedBitmap = BitmapDescriptorFactory.fromResource(if (unArrivedDrawable != -1) unArrivedDrawable else R.drawable.taxi_map_arrow_un_arrive)
+        CallerPlanningRottingListenerManager.addListener(TAG, this)
         initAMapView(context)
         // 注册定位监听
         CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
@@ -156,19 +180,12 @@ class OverMapView @JvmOverloads constructor(
         mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
         mAMap = mMapView!!.map
         mCustomMapStyleOptions = CustomMapStyleOptions()
-        if (isTaxi(FunctionBuildConfig.appIdentityMode)) {
+
+        if (!mapStylePath.isNullOrEmpty() && !mapStyleExtraPath.isNullOrEmpty()) {
             mCustomMapStyleOptions!!.styleData =
-                MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data")
+                MapAssetStyleUtils.getAssetsStyle(getContext(), mapStylePath)
             mCustomMapStyleOptions!!.styleExtraData =
-                MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data")
-        } else {
-            mCustomMapStyleOptions!!.styleData =
-                MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style_bus.data")
-            mCustomMapStyleOptions!!.styleExtraData =
-                MapAssetStyleUtils.getAssetsExtraStyle(
-                    getContext(),
-                    "over_view_style_extra_bus.data"
-                )
+                MapAssetStyleUtils.getAssetsExtraStyle(getContext(), mapStyleExtraPath)
         }
         mAMap?.setOnMapLoadedListener {
             Log.d(TAG, "---onMapLoaded---")
@@ -226,53 +243,26 @@ class OverMapView @JvmOverloads constructor(
      * 自定义导航View和路况状态
      */
     private fun customOptions() {
-        if (isTaxi(FunctionBuildConfig.appIdentityMode)) {
-            mCarMarker = mAMap!!.addMarker(
-                MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.map_car_icon))
-                    .anchor(0.5f, 0.5f)
-            )
-            mCompassMarker = mAMap!!.addMarker(
-                MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.amap_custom_corner))
-                    .anchor(0.5f, 0.5f)
-            )
-        } else {
-            mCarMarker = mAMap!!.addMarker(
-                MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.map_bus_icon))
-                    .anchor(0.5f, 0.5f)
-            )
-            mCompassMarker = mAMap!!.addMarker(
-                MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.amap_bus_corner))
-                    .anchor(0.5f, 0.5f)
-            )
-        }
+        mCarMarker = mAMap!!.addMarker(
+            MarkerOptions()
+                .icon(BitmapDescriptorFactory.fromResource(if (carDrawable != -1) carDrawable else R.drawable.map_car_icon))
+                .anchor(0.5f, 0.5f)
+        )
+        mCompassMarker = mAMap!!.addMarker(
+            MarkerOptions()
+                .icon(BitmapDescriptorFactory.fromResource(if (compassDrawable != -1) compassDrawable else R.drawable.amap_custom_corner))
+                .anchor(0.5f, 0.5f)
+        )
         mStartMarker = mAMap!!.addMarker(
             MarkerOptions()
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_start))
+                .icon(BitmapDescriptorFactory.fromResource(if (startPointDrawable != -1) startPointDrawable else R.drawable.module_small_map_view_dir_start))
         )
         mEndMarker = mAMap!!.addMarker(
             MarkerOptions()
-                .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_end))
+                .icon(BitmapDescriptorFactory.fromResource(if (endPointDrawable != -1) endPointDrawable else R.drawable.module_small_map_view_dir_end))
         )
     }
 
-    private val moGoAutopilotPlanningListener: IMoGoPlanningRottingListener =
-        object : IMoGoPlanningRottingListener {
-            /**
-             * 根据全路径获取起始点和经停点进行导航路线绘制
-             * 自动驾驶启动后获得数据,获取全路径的具体时间要进行路测
-             * 室内某个bag包自动驾驶启动8s后返回
-             */
-            override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
-                globalPathResp?.let {
-                    handlePlanningData(it.wayPointsList)
-                }
-            }
-        }
-
     fun handlePlanningData(locationList: List<MessagePad.Location>?) {
         if (locationList.isNullOrEmpty()) return
         val list: List<MessagePad.Location> = locationList
@@ -557,10 +547,14 @@ class OverMapView @JvmOverloads constructor(
         for (i in coordinates.indices) {
             if (i <= locIndex) {
                 // 已走过的置灰
-                textureList.add(arrivedBitmap)
+                arrivedBitmap?.let {
+                    textureList.add(it)
+                }
             } else {
                 // 未走过的纹理
-                textureList.add(unArrivedBitmap)
+                unArrivedBitmap?.let {
+                    textureList.add(it)
+                }
             }
             texIndexList.add(i)
         }
@@ -593,4 +587,15 @@ class OverMapView @JvmOverloads constructor(
         }
 
     }
+
+    /**
+     * 根据全路径获取起始点和经停点进行导航路线绘制
+     * 自动驾驶启动后获得数据,获取全路径的具体时间要进行路测
+     * 室内某个bag包自动驾驶启动8s后返回
+     */
+    override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
+        globalPathResp?.let {
+            handlePlanningData(it.wayPointsList)
+        }
+    }
 }

core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="OverMapView">
+        <!-- 地图样式asset目录下的路径 -->
+        <attr name="mapStylePath" format="string" />
+        <attr name="mapStyleExtraPath" format="string" />
+        <!-- 自车模型图片 -->
+        <attr name="carDrawable" format="reference" />
+        <!-- 罗盘图片 -->
+        <attr name="compassDrawable" format="reference" />
+        <!-- 起点图片 -->
+        <attr name="startPointDrawable" format="reference" />
+        <!-- 终点图片 -->
+        <attr name="endPointDrawable" format="reference" />
+        <!-- 已走过路线的图片 -->
+        <attr name="arrivedDrawable" format="reference" />
+        <!-- 未走过路线的图片 -->
+        <attr name="unArrivedDrawable" format="reference" />
+        <!-- 重置位置图片 -->
+        <attr name="resetDrawable" format="reference" />
+    </declare-styleable>
+</resources>

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

@@ -40,32 +40,20 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation rootProject.ext.dependencies.androidxccorektx
-    implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.arouter
-    implementation project(path: ':foudations:mogo-commons')
     kapt rootProject.ext.dependencies.aroutercompiler
+
     implementation rootProject.ext.dependencies.android_start_up
-    implementation rootProject.ext.dependencies.mogocustommap
     implementation rootProject.ext.dependencies.thread_opt
+    
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_res
-        implementation rootProject.ext.dependencies.mogo_core_data
-        implementation rootProject.ext.dependencies.mogo_core_utils
-        implementation rootProject.ext.dependencies.mogo_core_function_api
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.crashreport
-        implementation rootProject.ext.dependencies.mogomap
-        implementation rootProject.ext.dependencies.mogomapapi
     } else {
-        implementation project(':core:mogo-core-res')
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-function-api')
         implementation project(':core:mogo-core-function-call')
         implementation project(":test:crashreport")
-        implementation project(':libraries:mogo-map')
-        implementation project(":libraries:mogo-map-api")
     }
+    implementation project(':foudations:mogo-commons')
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-startup/build/generated/source/buildConfig/debug/com/mogo/eagle/core/function/startup/BuildConfig.java

@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.mogo.eagle.core.function.startup;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.eagle.core.function.startup";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.mogo.eagle.core.function.startup";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "";
-}

core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$start_up.java

@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.mogo.eagle.core.function.startup.MogoStartUpProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Group$$start_up implements IRouteGroup {
-  @Override
-  public void loadInto(Map<String, RouteMeta> atlas) {
-    atlas.put("/start_up/api", RouteMeta.build(RouteType.PROVIDER, MogoStartUpProvider.class, "/start_up/api", "start_up", null, -1, -2147483648));
-  }
-}

core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctionstartup.java

@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IProviderGroup;
-import com.mogo.eagle.core.function.startup.MogoStartUpProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Providers$$mogocorefunctionstartup implements IProviderGroup {
-  @Override
-  public void loadInto(Map<String, RouteMeta> providers) {
-    providers.put("com.mogo.eagle.core.function.api.startup.IStartUpProvider", RouteMeta.build(RouteType.PROVIDER, MogoStartUpProvider.class, "/start_up/api", "start_up", null, -1, -2147483648));
-  }
-}

core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctionstartup.java

@@ -1,17 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.alibaba.android.arouter.facade.template.IRouteRoot;
-import java.lang.Class;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Root$$mogocorefunctionstartup implements IRouteRoot {
-  @Override
-  public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
-    routes.put("start_up", ARouter$$Group$$start_up.class);
-  }
-}

core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt

@@ -111,10 +111,12 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         clientConfig.isUseOriginSocket = true
         // 设置是否输出网络日志
         clientConfig.isShowNetDebugLog = false
+//        clientConfig.passportUrl //todo yakun
+//        clientConfig.socketBaseUrl
+//        clientConfig.socketTechUrl
         // 设置是否是直播推流的主播
         clientConfig.isAnchor = true
         when (DebugConfig.getCarMachineType()) {
-            DebugConfig.CAR_MACHINE_TYPE_BYD -> clientConfig.thirdPartyAppKey = "bydauto"
             DebugConfig.CAR_MACHINE_TYPE_LENOVO -> clientConfig.thirdPartyAppKey = "pfieouqg"
             else -> clientConfig.thirdPartyAppKey = "wbvpzgar"
         }
@@ -133,9 +135,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         } else {
             clientConfig.thirdPartyDeviceId = Utils.getDevicesId()
         }
-        // 设置循环检测间隔时间（每隔2小时loop一次httpDnsConfig）
-        clientConfig.loopCheckDelay = (60 * 60 * 2 * 1000).toLong()
-        //设置长链接的secretKey  //todo 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
+        //设置长链接的secretKey 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
         clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ"
 
         clientConfig.iHttpDnsCurrentLocation = object : IHttpDnsCurrentLocation {

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

@@ -62,7 +62,6 @@ dependencies {
     implementation rootProject.ext.dependencies.localbroadcastmanager
     implementation rootProject.ext.dependencies.arouter
     implementation rootProject.ext.dependencies.rxandroid
-    implementation rootProject.ext.dependencies.flexbox
     kapt rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.protobuf_java
     implementation rootProject.ext.dependencies.protobuf_java_util
@@ -71,19 +70,14 @@ dependencies {
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogocommons
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.mogo_core_res
-        compileOnly rootProject.ext.dependencies.mogomap
     } else {
         implementation project(":foudations:mogo-commons")
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:mogo-core-res')
-        implementation project(':libraries:mogo-adas')
-        compileOnly project(':libraries:mogo-map')
     }
 }
 

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt

@@ -1,5 +1,6 @@
 package com.mogo.eagle.core.function.v2x.events
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Handler
@@ -16,6 +17,7 @@ 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_CLOUD
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N
 import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.enums.EventTypeHelper
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
@@ -26,15 +28,17 @@ 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.traffic.TrafficData
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
+import com.mogo.eagle.core.function.api.map.angle.*
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Default
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.TooClose
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.v2x.events.alarm.V2XAlarmServer
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi
@@ -43,12 +47,11 @@ import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_H
 import com.mogo.eagle.core.function.v2x.events.receiver.SceneBroadcastReceiver
 import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager
 import com.mogo.eagle.core.function.v2x.events.utils.toRoadMarker
+import com.mogo.eagle.core.function.v2x.events.utils.toV2XRoadEventEntity
 import com.mogo.eagle.core.function.v2x.internal.V2XManager
 import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback
 import com.mogo.eagle.core.function.v2x.internal.config.V2XConfig
-import com.mogo.eagle.core.function.v2x.internal.data.V2XAdvanceWarning
-import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerCardResult
-import com.mogo.eagle.core.function.v2x.internal.data.V2XWarningTarget
+import com.mogo.eagle.core.function.v2x.internal.data.*
 import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent
 import com.mogo.eagle.core.function.v2x.road.V2XEventServiceApi
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -71,9 +74,10 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
+import mogo.telematics.pad.MessagePad
 
-
-object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, IV2XCallback {
+object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, IV2XCallback,
+    IMoGoAutopilotIdentifyListener {
 
     private const val TAG = "V2XEventManager"
 
@@ -115,11 +119,13 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback,
     private fun registerListener() {
         V2XManager.addCallback(this)
         CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
+        CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
     }
 
     private fun unRegisterListener() {
         V2XManager.removeCallback(this)
         CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
         mogoMarkersHandler.unregisterMarkerClickListener(CARD_TYPE_ROAD_CONDITION)
     }
 
@@ -196,11 +202,9 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback,
                 handleWarningTargetEvent(event.data)
             }
             is V2XEvent.RoadAI -> {
-                /*
-                TODO zhongchao 先注掉，编译通过
                 if(FunctionBuildConfig.isV2NFromCar){
                     return
-                }*/
+                }
                 handleRoadMarkerEvent(event.data.toRoadMarker())
             }
 
@@ -208,7 +212,47 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback,
                 handleRoadMarkerEvent(event.data.toRoadMarker())
             }
             else -> {
-                Logger.d(TAG, "other event: $event")
+                Logger.e(TAG, "onAck other event: $event")
+            }
+        }
+    }
+
+    @SuppressLint("NewApi")
+    override fun onAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
+        super.onAutopilotIdentifyPlanningObj(planningObjects)
+        if(!FunctionBuildConfig.isV2NFromCar){
+            return
+        }
+        planningObjects?.let {
+            if (it.isNotEmpty()) {
+                val first = it.stream()
+                    .filter { planningObj: MessagePad.PlanningObject -> planningObj.type >= 1000 }
+                    .findFirst()
+                if (first.isPresent) {
+                    val poiType = when (first.get().type) {
+//                        1004 -> { //V2N_RSM,静止事件，包括异常停车、异常静止障碍物
+//                        }
+                        1005 -> { //V2N_RSI,施工事件，包括锥桶或者挡板围城的施工场景，是个多边形包围区域
+                            EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType
+                        }
+                        1007 -> { //三角牌
+                            EventTypeEnumNew.FOURS_ACCIDENT_04.poiType
+                        }
+                        else -> {
+                            return
+                        }
+                    }
+                    CallerLogger.d("$M_V2X$TAG", "poiType : $poiType , 触发道路事件")
+                    val trackedObj =
+                        CallerMapIdentifyManager.getIdentifyObj(first.get().uuid.toString())
+                    trackedObj?.let { t ->
+                        CallerLogger.d("$M_V2X$TAG", "polygon size : ${(t.polygonList.size)}")
+                        val v2XMessageEntity = V2XMessageEntity<V2XRoadEventEntity>()
+                        v2XMessageEntity.type = V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING
+                        v2XMessageEntity.content = t.toRoadMarker(poiType).toV2XRoadEventEntity()
+                        V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity)
+                    }
+                }
             }
         }
     }
@@ -328,13 +372,13 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback,
                             val change = changeVisualAngle
                             override fun onShow() {
                                 if (change) {
-                                    CallerVisualAngleManager.changeVisualAngle(TooClose)
+                                    CallerVisualAngleManager.changeAngle(TooClose)
                                 }
                             }
 
                             override fun onDismiss() {
                                 if (change) {
-                                    CallerVisualAngleManager.changeVisualAngle(Default())
+                                    CallerVisualAngleManager.changeAngle(Default())
                                 }
                             }
                         }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java

@@ -37,7 +37,7 @@ public class V2XAlarmServer {
             CopyOnWriteArrayList<V2XRoadEventEntity> v2XRoadEventEntityList,
             MogoLocation currentLocation) {
         try {
-            Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation );
+            //Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation );
             if (!showedEvents.isEmpty()) {
                 Iterator<V2XRoadEventEntity> iterator = showedEvents.iterator();
                 while (iterator.hasNext()) {
@@ -54,18 +54,18 @@ public class V2XAlarmServer {
                     }
                 }
             }
-            Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation);
+            //Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation);
             if (currentLocation != null && v2XRoadEventEntityList != null) {
                 // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告
                 for (V2XRoadEventEntity v2XRoadEventEntity : v2XRoadEventEntityList) {
                     // 0、道路事件必须有朝向，角度>=0;
-                    Logger.d(TAG, "entity:" + v2XRoadEventEntity.getLocation());
+                    //Logger.d(TAG, "entity:" + v2XRoadEventEntity.getLocation());
                     if (v2XRoadEventEntity.getLocation().getAngle() >= 0) {
                         // 计算车辆距离指定气泡的距离
                         MarkerLocation eventLocation = v2XRoadEventEntity.getLocation();
                         // 1、判断是否到达了触发距离,20 ~ 500,
                         double distance = v2XRoadEventEntity.getDistance();
-                        Logger.d(TAG, "distance:" + distance);
+                        //Logger.d(TAG, "distance:" + distance);
                         if (distance <= 500) {
                             if (EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) {
                                 if (distance > 25) {
@@ -76,7 +76,7 @@ public class V2XAlarmServer {
                             double carBearing = currentLocation.getHeading();
                             double eventBearing = eventLocation.getAngle();
                             double diffAngle = DrivingDirectionUtils.getAngleDiff(carBearing, eventBearing);
-                            Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle);
+                            //Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle);
                             if (diffAngle <= 20) {
                                 // 3、计算当前车辆行驶方向与事件位置之间夹角《20度，保证道路事件在车辆前方
                                 double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi(
@@ -87,12 +87,12 @@ public class V2XAlarmServer {
                                         (int) currentLocation.getHeading()
                                 );
 
-                                Logger.d(TAG, "eventAngle:" + eventAngle);
+                                //Logger.d(TAG, "eventAngle:" + eventAngle);
                                 if (0 <= eventAngle && eventAngle <= 20) {
                                     if (showedEvents.contains(v2XRoadEventEntity)) {
                                         return null;
                                     }
-                                    Logger.d(TAG, "showed---");
+                                    //Logger.d(TAG, "showed---");
                                     showedEvents.add(v2XRoadEventEntity);
                                     return v2XRoadEventEntity;
                                 }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java

@@ -55,7 +55,7 @@ public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineMan
                 options.add(locations.get(i));
             }
             // 绘制线的对象
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp());
+            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
             if (overlay != null) {
                 mMogoPolyline = overlay.addPolyline(options);
                 mMogoPolyline.setTransparency(0.5f);

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java

@@ -54,7 +54,7 @@ public class MoGoStopPolylineManager implements IMoGoStopPolylineManager {
                 options.add(locations.get(i));
             }
             // 绘制线的对象
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp());
+            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
             if (overlay != null) {
                 mMogoPolyline = overlay.addPolyline(options);
             }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java

@@ -90,18 +90,18 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                 // 清除上次的道路事件， 这里注意，道路事件的触发和这里是异步操作会触发异常
                 mV2XRoadEventEntityArrayList.clear();
                 // 获取探路以及新鲜事儿
-                List<V2XMarkerExploreWay> exploreWayList = markerCardResult.getExploreWay();
+                List<MarkerExploreWay> exploreWayList = markerCardResult.getExploreWay();
                 if (exploreWayList != null) {
-                    for (V2XMarkerExploreWay markerExploreWay : exploreWayList) {
+                    for (MarkerExploreWay markerExploreWay : exploreWayList) {
                         if (EventTypeEnumNew.isRoadEvent(markerExploreWay.getPoiType())) {
-                            V2XMarkerLocation markerLocation = markerExploreWay.getLocation();
+                            MarkerLocation markerLocation = markerExploreWay.getLocation();
                             // 记录道路事件
                             V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
-                            v2XRoadEventEntity.setLocation(EntityUtilsKt.toMarkerLocation(markerLocation));
+                            v2XRoadEventEntity.setLocation(markerLocation);
                             // 探路目前只有上报拥堵
                             String poi = markerExploreWay.getPoiType();
                             v2XRoadEventEntity.setPoiType(poi);
-                            v2XRoadEventEntity.setNoveltyInfo(EntityUtilsKt.toMarkExploreWay(markerExploreWay, markerCardResult.getExtras()));
+                            v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
                             v2XRoadEventEntity.setExpireTime(20000);
                             mV2XRoadEventEntityArrayList.add(v2XRoadEventEntity);
                         }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java

@@ -62,7 +62,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager {
             }
             // 绘制线的对象
 
-            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp());
+            IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
             if (overlay != null) {
                 mMogoPolyline = overlay.addPolyline(options);
             }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt

@@ -7,7 +7,6 @@ import android.os.Looper
 import android.view.animation.DecelerateInterpolator
 import androidx.core.util.Pair
 import com.mogo.cloud.commons.utils.*
-import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.call.autopilot.*
@@ -39,9 +38,7 @@ class AiRoadMarker {
     private val marker by lazy { AtomicReference<Marker>() }
 
     private val overlayManager by lazy {
-        CallerMapUIServiceManager.getOverlayManager(
-            AbsMogoApplication.getApp()
-        )
+        CallerMapUIServiceManager.getOverlayManager()
     }
 
     private val START_COLOR = Color.parseColor("#002ABAD9")

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt

@@ -1,80 +1,56 @@
 package com.mogo.eagle.core.function.v2x.events.scenario.scene.road
 
-import android.graphics.*
+import android.graphics.Color
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
-import com.mogo.eagle.core.data.map.*
+import com.mogo.eagle.core.data.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.context
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.v2xMarker
 import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper
-import com.mogo.map.*
-import com.mogo.map.marker.*
-import com.mogo.map.overlay.*
-import java.util.concurrent.atomic.*
-import kotlin.Pair
-import kotlin.collections.ArrayList
+import com.mogo.map.marker.IMogoMarker
+import com.mogo.map.overlay.IMogoPolyline
+import com.mogo.map.overlay.MogoPolylineOptions
+import java.util.concurrent.atomic.AtomicReference
 
 class V2XAiRoadEventMarker {
 
     private val current = AtomicReference<Pair<IMogoPolyline?, List<IMogoMarker>?>>()
 
-    private val v2xLocation = AtomicReference<MogoLocation>()
-
-    private val overlayManager by lazy { MogoOverlayManager.getInstance() }
+    private val overlayManager by lazy { CallerMapUIServiceManager.getOverlayManager() }
 
     fun drawMarkers(entity: V2XRoadEventEntity, wrapper: MarkerWrapper) {
-        val extra = entity.noveltyInfo.extras["polygon"]
+        val polygon = entity.noveltyInfo.polygon
         v2xMarker()?.drawableAlarmPOI(context(), entity, null)?.also {
             wrapper.addMarker(it)
         }
-        if (extra is List<*> && entity.poiType != EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.poiType) {
-            if (extra.size > 0) {
-                val polygons: MutableList<androidx.core.util.Pair<Double, Double>> = ArrayList()
-                for (i in extra.indices) {
-                    val o = extra[i]!! as? androidx.core.util.Pair<*, *> ?: continue
-                    val first = o.first
-                    val second = o.second
-                    if (first == null || second == null) {
-                        continue
-                    }
-                    if (first !is Double || second !is Double) {
-                        continue
-                    }
-                    polygons.add(androidx.core.util.Pair.create(second, first))
-                }
-                if (polygons.size > 0) {
-                    val l2 = entity.noveltyInfo?.location ?: return
-                    v2xLocation.set(MogoLocation().also {
-                        it.longitude = l2.lon; it.latitude = l2.lat; it.heading = l2.angle
-                    })
+        if (polygon != null && polygon.isNotEmpty() && entity.poiType != EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.poiType) {
+            val options = MogoPolylineOptions()
+            val colors = ArrayList<Int>()
+            colors.add(Color.argb(204, 237, 172, 21))
+            colors.add(Color.argb(0, 255, 255, 255))
+            options.colorValues(colors)
+            val points = ArrayList<MogoLatLng>()
 
-                    val options = MogoPolylineOptions()
-                    val colors = ArrayList<Int>()
-                    colors.add(Color.argb(204, 237, 172, 21))
-                    colors.add(Color.argb(0, 255, 255, 255))
-                    options.colorValues(colors)
-                    val points = ArrayList<MogoLatLng>()
-
-                    for (p in polygons) {
-                        points.add(MogoLatLng(p.first, p.second))
-                    }
-                    if (points.size > 2) {
-                        points.add(points[0])
-                    }
-                    options.points(points)
-                    options.useGradient(true)
-                    options.useFacade(true)
-                    options.setGps(true)
-                    options.width(5f)
-                    options.zIndex(75000f)
-                    options.maxIndex(800000f)
-                    val line = overlayManager.addPolyline(options)
-                    current.set(Pair(line, wrapper.markers))
-                    if (line != null) {
-                        line.isVisible = true
-                        wrapper.addLine(line)
-                    }
-                }
+            for (p in polygon) {
+                points.add(MogoLatLng(p.first, p.second))
+            }
+            if (points.size > 2) {
+                points.add(points[0])
+            }
+            options.points(points)
+            options.useGradient(true)
+            options.useFacade(true)
+            options.setGps(true)
+            options.width(5f)
+            options.zIndex(75000f)
+            options.maxIndex(800000f)
+            val line = overlayManager?.addPolyline(options)
+            line?.let {
+                current.set(Pair(line, wrapper.markers))
+                line.isVisible = true
+                wrapper.addLine(line)
             }
         }
     }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java

@@ -1,9 +1,7 @@
 package com.mogo.eagle.core.function.v2x.events.scenario.scene.road;
 
 import android.util.Log;
-
 import androidx.core.util.Pair;
-
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
 import com.mogo.eagle.core.data.map.entity.MarkerLocation;
@@ -15,7 +13,6 @@ import com.mogo.eagle.core.function.v2x.events.remove.MarkerRemoveManager;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
 import com.mogo.map.marker.IMogoMarker;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -34,10 +31,21 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
             if (marker != null) {
                 if (entity != null) {
                     Log.d("RWJ", "V2XRoadEventMarker:" + entity.getPoiType());
-                    if (!Objects.equals(entity.getPoiType(), EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.getPoiType())
-                            && !Objects.equals(entity.getPoiType(), EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType())
-                            && !Objects.equals(entity.getPoiType(), EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.getPoiType())
-                            && !Objects.equals(entity.getPoiType(), EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType())) {
+                    if (isAiRoadEvent(entity.getPoiType())) {
+                        MarkerExploreWay noveltyInfo = entity.getNoveltyInfo();
+                        Log.d("RWJ", "V2XRoadEventMarker -> noveltyInfo:" + noveltyInfo);
+                        if (noveltyInfo != null) {
+                            Pair<Double, Double> gpsLocation = noveltyInfo.getGpsLocation();
+                            List<Pair<Double, Double>> polygons = noveltyInfo.getPolygon();
+                            if (gpsLocation != null && polygons != null) {
+                                MarkerLocation location = noveltyInfo.getLocation();
+                                AiRoadMarker.Marker m = new AiRoadMarker.Marker(noveltyInfo.getInfoId(), noveltyInfo.getPoiType(), gpsLocation.second, gpsLocation.first, location.getAngle(), polygons, null, entity);
+                                AiRoadMarker aiMarker = new AiRoadMarker();
+                                aiMarker.marker(m, true, isDrawRoadLine(m.getPoiType()));
+                                AiRoadMarker.aiMakers.put(noveltyInfo.getInfoId(), aiMarker);
+                            }
+                        }
+                    } else {
                         IMogoMarker iMarker = marker.drawableAlarmPOI(BridgeApi.INSTANCE.context(), entity, null);
                         if (iMarker != null) {
                             Log.d("RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- add Marker");
@@ -48,48 +56,6 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
                         } else  {
                             Log.d("RWJ", "V2XRoadEventMarker:" + entity.getPoiType() + "--- return empty marker");
                         }
-                    } else {
-                        MarkerExploreWay noveltyInfo = entity.getNoveltyInfo();
-                        Log.d("RWJ", "V2XRoadEventMarker -> noveltyInfo:" + noveltyInfo);
-                        if (noveltyInfo != null && noveltyInfo.extras != null) {
-                            List<Pair<Double, Double>> polygons = new ArrayList<>();
-                            Pair<Double, Double> gpsLocation = null;
-                            if (noveltyInfo.extras.containsKey("polygon")) {
-                                Object extra = noveltyInfo.extras.get("polygon");
-                                if (extra instanceof List) {
-                                    List l = (List) extra;
-                                    if (l.size() > 0) {
-                                        for (int i = 0; i < l.size(); i++) {
-                                            Object o = l.get(i);
-                                            if (!(o instanceof Pair)) {
-                                                continue;
-                                            }
-                                            Pair p = (Pair) o;
-                                            Object first = p.first;
-                                            Object second = p.second;
-                                            if (first == null || second == null) {
-                                                continue;
-                                            }
-                                            if (!(first instanceof Double) || !(second instanceof Double)) {
-                                                continue;
-                                            }
-                                            polygons.add(Pair.create((Double) first, (Double) second));
-                                        }
-                                    }
-                                }
-                            }
-
-                            if (noveltyInfo.extras.containsKey("gps_location")) {
-                                gpsLocation =  (Pair<Double, Double>) ((List)(noveltyInfo.extras.get("gps_location"))).get(0);
-                            }
-                            if (!polygons.isEmpty() && gpsLocation != null) {
-                                MarkerLocation location = noveltyInfo.getLocation();
-                                AiRoadMarker.Marker m = new AiRoadMarker.Marker(noveltyInfo.getInfoId(), noveltyInfo.getPoiType(), gpsLocation.second, gpsLocation.first, location.getAngle(), polygons, null, entity);
-                                AiRoadMarker aiMarker = new AiRoadMarker();
-                                aiMarker.marker(m, true, isDrawRoadLine(m.getPoiType()));
-                                AiRoadMarker.aiMakers.put(noveltyInfo.getInfoId(), aiMarker);
-                            }
-                        }
                     }
                 }
             }
@@ -98,6 +64,13 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
         }
     }
 
+    private boolean isAiRoadEvent(String poiType) {
+        return Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.getPoiType())
+                && Objects.equals(poiType, EventTypeEnumNew.FOURS_ACCIDENT_04.getPoiType())
+                && Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_JINGZHI.getPoiType())
+                && Objects.equals(poiType, EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType());
+    }
+
     private boolean isDrawRoadLine(String poiType) {
         return EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.getPoiType().equals(poiType);
     }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java

@@ -11,6 +11,8 @@ 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.function.api.hmi.warning.IMoGoWarningStatusListener;
+import com.mogo.eagle.core.function.api.map.angle.Default;
+import com.mogo.eagle.core.function.api.map.angle.RoadEvent;
 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.map.CallerVisualAngleManager;
@@ -151,7 +153,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void onShow() {
         if (isNeedChangeAngle()) {
-            CallerVisualAngleManager.INSTANCE.changeVisualAngle(CallerVisualAngleManager.Scene.RoadEvent.INSTANCE);
+            CallerVisualAngleManager.INSTANCE.changeAngle(RoadEvent.INSTANCE);
         }
         V2XMessageEntity<V2XRoadEventEntity> entity = getV2XMessageEntity();
         if (entity != null) {
@@ -177,7 +179,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     public void onDismiss() {
         CallerHmiManager.INSTANCE.dismissWarning(WarningDirectionEnum.ALERT_WARNING_TOP);
         if (isNeedChangeAngle()) {
-            CallerVisualAngleManager.INSTANCE.changeVisualAngle(new CallerVisualAngleManager.Scene.Default(3, TimeUnit.SECONDS));
+            CallerVisualAngleManager.INSTANCE.changeAngle(new Default(3, TimeUnit.SECONDS));
         }
         release();
     }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java

@@ -10,6 +10,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
@@ -64,8 +65,9 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
         CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 1 --:\n" + (mMarkerEntity == null ? "null" : mMarkerEntity.toString()));
         if (mMarkerEntity != null) {
             CallerLogger.INSTANCE.d(M_V2X + TAG, "----- show --- 2 --:\n" + mMarkerEntity);
-            int v2xType = getV2XTypeForFrontWarning(mMarkerEntity);
-            if (v2xType != 0) {
+            String v2xType = getV2XTypeForFrontWarning(mMarkerEntity);
+            V2XMessageEntity entity = getV2XMessageEntity();
+            if (!v2xType.equals("0")) {
                 if (getAlertContentForFrontWarning(mMarkerEntity).toString() == null
                         || getAlertContentForFrontWarning(mMarkerEntity).toString().isEmpty()
                         || mMarkerEntity.getTts() == null || mMarkerEntity.getTts().isEmpty()) {
@@ -87,19 +89,19 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
         }
     }
 
-    private int getV2XTypeForFrontWarning(V2XWarningTarget entity) {
+    private String getV2XTypeForFrontWarning(V2XWarningTarget entity) {
         switch (entity.getType()) {
             case 1:
             case 11:
                 entity.setTts("注意行人");
-                return 0X2B0201;
+                return EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.getPoiType();
             case 2:
                 entity.setTts("注意自行车");
             case 4:
                 entity.setTts("注意摩托车");
-                return 0X2B0202;
+                return EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.getPoiType();
         }
-        return 0;
+        return "0";
     }
 
     private CharSequence getAlertContentForFrontWarning(V2XWarningTarget entity) {

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt

@@ -4,7 +4,6 @@ import androidx.core.util.Pair
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent
 import com.mogo.eagle.core.data.map.entity.MarkerExploreWay
 import com.mogo.eagle.core.data.map.entity.MarkerLocation
-import com.mogo.eagle.core.data.map.entity.MarkerUserInfo
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker
 import com.mogo.eagle.core.function.v2x.internal.data.*
@@ -13,85 +12,24 @@ import mogo.telematics.pad.MessagePad
 import roadwork.Road
 
 
-fun V2XMarkerLocation?.toMarkerLocation(): MarkerLocation? =
-    if (this == null) null else MarkerLocation().also {
-        it.lon = this.lon
-        it.lat = this.lat
-        it.address = this.address
-        it.angle = this.angle
-    }
-
-fun MarkerExploreWayItem?.toMarkerExploreWayItem(): com.mogo.eagle.core.data.map.entity.MarkerExploreWayItem? =
-    if (this == null) null else com.mogo.eagle.core.data.map.entity.MarkerExploreWayItem().also {
-        it.illegalCount = this.illegalCount
-        it.content = this.content
-        it.url = this.url
-        it.thumbnail = this.thumbnail
-    }
-
-fun V2XMarkerUserInfo?.toMarkerUserInfo(): MarkerUserInfo? =
-    if (this == null) null else MarkerUserInfo().also {
-        it.safeLabelType = this.safeLabelType
-        it.safeLabel = this.safeLabel
-        it.lastActiveweekAvgscore = this.lastActiveweekAvgscore
-        it.gender = this.gender
-        it.userHead = this.userHead
-        it.userName = this.userName
-        it.setAge(this.age)
-    }
-
-fun V2XMarkerExploreWay.toMarkExploreWay(extras: Map<String, Any>? = null): MarkerExploreWay =
-    MarkerExploreWay().also {
-        it.items = this.items?.map { itx -> itx.toMarkerExploreWayItem() }
-        it.userInfo = this.userInfo?.toMarkerUserInfo()
-        it.distance = this.distance
-        it.cityName = this.cityName
-        it.setGenerateTime(this.generateTime)
-        it.infoId = this.infoId
-        it.setFileType(this.fileType)
-        it.setDirection(this.direction)
-        it.location = this.location?.toMarkerLocation()
-        it.sn = this.sn
-        it.canLive = this.canLive != "0"
-        it.poiType = this.poiType
-        it.type = this.type
-        it.infoCheckNode = this.infoCheckNode
-        it.isFabulous = this.isFabulous
-        it.uploadType = this.uploadType
-        it.isCanLive = this.canLive != "0"
-        it.extras = extras
-    }
-
 fun Road.RW_PB.toRoadMarker(): V2XMarkerCardResult =
     V2XMarkerCardResult().also { l1 ->
-        this.roadwork?.polygonList?.takeIf { it.isNotEmpty() }?.also { old ->
-            l1.extras = HashMap<String, List<Pair<Double, Double>>>().also { extra ->
-                extra["polygon"] = old.map { d ->
-                    Pair(d.lon, d.lat)
-                }
-
-                extra["gps_location"] = listOf(
-                    Pair(
-                        this.roadwork?.center?.point?.lon ?: 0.0,
-                        this.roadwork?.center?.point?.lat ?: 0.0
-                    )
-                )
-            }
-        }
         val centerX = this.roadwork?.center?.point?.lon ?: 0.0
         val centerY = this.roadwork?.center?.point?.lat ?: 0.0
         val id = "${centerX}_${centerY}"
-        l1.exploreWay = ArrayList<V2XMarkerExploreWay>().also { l2 ->
-            l2.add(V2XMarkerExploreWay().also { l3 ->
+        l1.exploreWay = ArrayList<MarkerExploreWay>().also { l2 ->
+            l2.add(MarkerExploreWay().also { l3 ->
                 l3.poiType = this.roadwork?.poiType?.toString()
-                l3.generateTime = this.roadwork?.detectTime ?: 0L
-                l3.location = V2XMarkerLocation().also { l4 ->
+                l3.setGenerateTime(this.roadwork?.detectTime ?: 0L)
+                l3.location = MarkerLocation().also { l4 ->
                     val p = CoordinateTransform.WGS84ToGCJ02(this.roadwork?.center?.point?.lon ?: 0.0, this.roadwork?.center?.point?.lat ?: 0.0)
                     l4.lon = p[0]
                     l4.lat = p[1]
                     l4.angle = this.roadwork?.center?.road?.bearing?.toDouble() ?: 0.0
                 }
                 l3.infoId = id
+                l3.gpsLocation = Pair(this.roadwork?.center?.point?.lon ?: 0.0, this.roadwork?.center?.point?.lat ?: 0.0)
+                l3.polygon = this.roadwork?.polygonList?.takeIf { it.isNotEmpty() }?.map { Pair(it.lon, it.lat) }
             })
         }
         AiRoadMarker.aiMakers[id]?.receive()
@@ -99,52 +37,41 @@ fun Road.RW_PB.toRoadMarker(): V2XMarkerCardResult =
 
 fun V2XRoadXData.toRoadMarker(): V2XMarkerCardResult =
     V2XMarkerCardResult().also { l1 ->
-        this.polygon?.takeIf { it.isNotEmpty() }?.also { old ->
-            l1.extras = HashMap<String, List<Pair<Double, Double>>>().also { extra ->
-                extra["polygon"] = old.map { d ->
-                    Pair(d.lon, d.lat)
-                }
-                extra["gps_location"] = listOf(Pair(this.center?.lon ?: 0.0, this.center?.lat ?: 0.0))
-            }
-        }
-
-        l1.exploreWay = ArrayList<V2XMarkerExploreWay>().also { l2 ->
-            l2.add(V2XMarkerExploreWay().also { l3 ->
+        l1.exploreWay = ArrayList<MarkerExploreWay>().also { l2 ->
+            l2.add(MarkerExploreWay().also { l3 ->
                 l3.poiType = this.poiType
-                l3.generateTime = this.detectTime ?: 0L
-                l3.location = V2XMarkerLocation().also { l4 ->
+                l3.setGenerateTime(this.detectTime ?: 0L)
+                l3.location = MarkerLocation().also { l4 ->
                     val p = CoordinateTransform.WGS84ToGCJ02(this.center?.lon ?: 0.0, this.center?.lat ?: 0.0)
                     l4.lon = p[0]
                     l4.lat = p[1]
                     l4.angle = this.centerRoad?.bearing ?: 0.0
                 }
                 l3.infoId = this.index
+                l3.gpsLocation = Pair(this.center?.lon ?: 0.0, this.center?.lat ?: 0.0)
+                l3.polygon = this.polygon?.takeIf { it.isNotEmpty() }?.map { Pair(it.lon, it.lat) }
             })
         }
-
         AiRoadMarker.aiMakers[this.index]?.receive()
     }
 
 fun MessagePad.TrackedObject.toRoadMarker(poiType: String): V2XMarkerCardResult =
     V2XMarkerCardResult().also { l1 ->
-        this.polygonList?.takeIf { it.isNotEmpty() }?.also { old ->
-            l1.extras = HashMap<String, List<Pair<Double, Double>>>().also { extra ->
-                extra["polygon"] = old.map { d -> Pair(d.longitude, d.latitude) }
-                extra["gps_location"] = listOf(Pair(this.longitude, this.latitude))
-            }
-        }
         val id = "${this.longitude}_${this.latitude}"
-        l1.exploreWay = ArrayList<V2XMarkerExploreWay>().also { l2 ->
-            l2.add(V2XMarkerExploreWay().also { l3 ->
+        l1.exploreWay = ArrayList<MarkerExploreWay>().also { l2 ->
+            l2.add(MarkerExploreWay().also { l3 ->
                 l3.poiType = poiType
-                l3.generateTime = 0L
-                l3.location = V2XMarkerLocation().also { l4 ->
+                l3.setGenerateTime(0L)
+                l3.location = MarkerLocation().also { l4 ->
                     val p = CoordinateTransform.WGS84ToGCJ02(this.longitude, this.latitude)
                     l4.lon = p[0]
                     l4.lat = p[1]
                     l4.angle = this.heading
                 }
                 l3.infoId = id
+
+                l3.gpsLocation = Pair(this.longitude, this.latitude)
+                l3.polygon = this.polygonList?.takeIf { it.isNotEmpty() }?.map { Pair(it.longitude, it.latitude) }
             })
         }
         AiRoadMarker.aiMakers[id]?.receive()
@@ -152,14 +79,14 @@ fun MessagePad.TrackedObject.toRoadMarker(poiType: String): V2XMarkerCardResult
 
 fun V2XMarkerCardResult.toV2XRoadEventEntity(): V2XRoadEventEntity =
     V2XRoadEventEntity().also { l1 ->
-        val exploreWayList: List<V2XMarkerExploreWay>? = this.exploreWay
+        val exploreWayList: List<MarkerExploreWay>? = this.exploreWay
         if (!exploreWayList.isNullOrEmpty() && exploreWayList.isNotEmpty()) {
             for (markerExploreWay in exploreWayList) {
                 if (isRoadEvent(markerExploreWay.poiType)) {
                     val markerLocation = markerExploreWay.location
-                    l1.location = markerLocation.toMarkerLocation()
+                    l1.location = markerLocation
                     l1.poiType = markerExploreWay.poiType
-                    l1.noveltyInfo = markerExploreWay.toMarkExploreWay(this.extras)
+                    l1.noveltyInfo = markerExploreWay
                     l1.expireTime = 20000
                 }
             }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt

@@ -209,7 +209,7 @@ object V2XManager {
         if (!started.get()) {
             return
         }
-        V2XLogger.d(TAG, "--- onLocationChanged --[longitude: $longitude, latitude: $latitude]")
+        //V2XLogger.d(TAG, "--- onLocationChanged --[longitude: $longitude, latitude: $latitude]")
         realLongitude.set(longitude)
         realLatitude.set(latitude)
         val oldLon = lastLongitude.get()

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerCardResult.kt

@@ -1,6 +1,8 @@
 package com.mogo.eagle.core.function.v2x.internal.data
 
 import androidx.annotation.Keep
+import com.mogo.eagle.core.data.map.entity.MarkerExploreWay
+import com.mogo.eagle.core.data.map.entity.MarkerLocation
 import java.io.Serializable
 
 @Keep
@@ -41,20 +43,15 @@ class V2XMarkerCardResult: V2XBaseData(), Serializable {
     /**
      * 探路数据集合
      */
-    var exploreWay: List<V2XMarkerExploreWay>? = null
+    var exploreWay: List<MarkerExploreWay>? = null
 
     /**
      * 服务端下发消息时间
      */
     var messageTime: Long = 0
 
-    /**
-     * 额外信息
-     */
-    var extras:  Map<String, Any>? = null
-
     override fun toString(): String {
-        return "MarkerCardResult(dataType=$dataType, carChat=$carChat, shareMusic=$shareMusic, noveltyInfo=$noveltyInfo, onlineCar=$onlineCar, exploreWay=$exploreWay, messageTime=$messageTime, extras=$extras)"
+        return "MarkerCardResult(dataType=$dataType, carChat=$carChat, shareMusic=$shareMusic, noveltyInfo=$noveltyInfo, onlineCar=$onlineCar, exploreWay=$exploreWay, messageTime=$messageTime)"
     }
 }
 
@@ -369,7 +366,7 @@ class V2XMarkerExploreWay: Serializable {
     /**
      * 位置信息
      */
-    var location: V2XMarkerLocation? = null
+    var location: MarkerLocation? = null
 
     /**
      * 车辆方位

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt

@@ -4,6 +4,7 @@ import com.elegant.network.utils.GsonUtil
 import com.elegant.network.utils.SignUtil
 import com.elegant.utils.CommonUtils
 import com.mogo.cloud.network.RetrofitFactory
+import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.function.v2x.internal.V2XManager
 import com.mogo.eagle.core.function.v2x.internal.config.V2XConfig
 import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation
@@ -26,7 +27,7 @@ internal class V2XRefreshModel {
             callback: IV2XRefreshCallback<V2XMarkerResponse>?
         ): Disposable? {
             val config = V2XManager.getConfig()
-            val retrofit = RetrofitFactory.getInstance(config.baseUrl) ?: return null
+            val retrofit = RetrofitFactory.getInstance(HostConst.getEagleHost()) ?: return null
             return retrofit
                 .create(V2XApiService::class.java)
                 .querySnapshotSync(buildParams(longitude, latitude, config))

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt

@@ -9,6 +9,6 @@ import retrofit2.http.POST
 internal interface V2XApiService {
 
     @FormUrlEncoded
-    @POST("/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync")
+    @POST("eagle-eye-dns/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync")
     fun querySnapshotSync(@FieldMap parameters: Map<String, @JvmSuppressWildcards Any>): Maybe<V2XMarkerResponse?>
 }