Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.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-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/build.gradle

@@ -60,17 +60,14 @@ dependencies {
     implementation rootProject.ext.dependencies.amapnavi3dmap
 
     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-devatools/build.gradle

@@ -88,14 +88,11 @@ dependencies {
     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-hmi/build.gradle

@@ -82,8 +82,6 @@ dependencies {
         compileOnly rootProject.ext.dependencies.mogocommons
         compileOnly 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')

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/java/com/mogo/eagle/core/function/business/identify/TrackObj.java

@@ -55,8 +55,8 @@ public class TrackObj {
     }
 
     private void correct() {
-//        calAverageSpeedAndType();
+        calAverageSpeedAndType();
-//        calLoc();
+        calLoc();
 //        calHeading();
     }
 

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();
     }
 

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-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/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/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

@@ -39,9 +39,7 @@ class AiRoadMarker {
     private val marker by lazy { AtomicReference<Marker>() }
 
     private val overlayManager by lazy {
-        CallerMapUIServiceManager.getOverlayManager(
+        CallerMapUIServiceManager.getOverlayManager()
-            AbsMogoApplication.getApp()
-        )
     }
 
     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,18 +1,18 @@
 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.IMogoMarker
-import com.mogo.map.marker.*
+import com.mogo.map.overlay.IMogoPolyline
-import com.mogo.map.overlay.*
+import com.mogo.map.overlay.MogoPolylineOptions
-import java.util.concurrent.atomic.*
+import java.util.concurrent.atomic.AtomicReference
-import kotlin.Pair
-import kotlin.collections.ArrayList
 
 class V2XAiRoadEventMarker {
 
@@ -20,7 +20,7 @@ class V2XAiRoadEventMarker {
 
     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"]
@@ -68,9 +68,9 @@ class V2XAiRoadEventMarker {
                     options.width(5f)
                     options.zIndex(75000f)
                     options.maxIndex(800000f)
-                    val line = overlayManager.addPolyline(options)
+                    val line = overlayManager?.addPolyline(options)
-                    current.set(Pair(line, wrapper.markers))
+                    line?.let {
-                    if (line != null) {
+                        current.set(Pair(line, wrapper.markers))
                         line.isVisible = true
                         wrapper.addLine(line)
                     }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java

@@ -40,10 +40,9 @@ public interface IMogoMapService extends IProvider {
     /**
      * 覆盖物操作
      *
-     * @param context
      * @return
      */
-    IMogoOverlayManager getOverlayManager(Context context);
+    IMogoOverlayManager getOverlayManager();
 
     /**
      * 获取高德定位服务

core/mogo-core-function-call/build.gradle

@@ -59,11 +59,10 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogocommons
     } else {
+        implementation project(':core:mogo-core-utils')
+        implementation project(':foudations:mogo-commons')
         implementation project(':libraries:mogo-adas')
         api project(':libraries:mogo-map-api')
-        implementation project(':foudations:mogo-commons')
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-utils')
         api project(':core:mogo-core-function-api')
     }
 }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt

@@ -30,8 +30,8 @@ object CallerMapUIServiceManager {
         return serviceProvider?.markerService
     }
 
-    fun getOverlayManager(context: Context): IMogoOverlayManager?{
+    fun getOverlayManager(): IMogoOverlayManager?{
-        return serviceProvider?.getOverlayManager(context)
+        return serviceProvider?.overlayManager
     }
 
     fun getGDLocationServer(context: Context):IMogoGDLocationClient?{

libraries/mogo-adas-data/src/main/proto/message_pad.proto

@@ -90,6 +90,15 @@ message Trajectory
     repeated TrajectoryPoint points = 1;
 }
 
+enum AdditionalAttribute
+{
+    ATTR_UNKNOWN = 0;
+    ATTR_ZOMBIE = 1; // 僵尸车
+    ATTR_ROAD_CONSTRUCTION = 2; // 道路施工区域
+    ATTR_STATIC = 3; // 静止障碍物
+    ATTR_ACCIDENT = 4; // 事故车
+}
+
 // message definition for MsgTypeTrackedObjects
 message SubSource
 {
@@ -125,6 +134,7 @@ message TrackedObject
     repeated TrackedSource tracked_source = 14;
     repeated Location polygon = 15;
     geometry.Point center = 16;
+    AdditionalAttribute add_attribute = 17; // 事件类型
 }
 
 message TrackedObjects
@@ -178,7 +188,7 @@ message AutopilotState
 message PlanningObject
 {
     uint32 uuid = 1; 
-    uint32 type = 2; //影响自车决策的类型, 和感知的障碍物类型不是一回事   0是leading障碍物，1是避障和择机的障碍物
+    uint32 type = 2; //影响自车决策的类型, 和感知的障碍物类型不是一回事
 }
 
 message PlanningObjects

libraries/mogo-map/build.gradle

@@ -63,8 +63,6 @@ dependencies {
         implementation project(':core:mogo-core-utils')
         implementation project(':libraries:mogo-map-api')
         implementation project(':foudations:mogo-commons')
-
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call') //todo 解除依赖
     }
 }