Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle

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

@@ -102,7 +102,6 @@ class IdentifyOriginDataDrawer : Identify {
     @SuppressLint("NewApi")
     private fun filterTrafficData(trafficData: List<TrackedObject>): HashMap<String, TrackedObject> {
         mFilterTrafficData.clear()
-        trafficDataUuidList.clear()
         for (data in trafficData) {
             // 过滤掉未知感知数据
             if (TrackerSourceColorHelper.filterData(data)) {
@@ -110,13 +109,12 @@ class IdentifyOriginDataDrawer : Identify {
             }
             var temp: TrackedObject = data
             val uuid = "" + data.uuid
-            //首次过来的数据不添加,首次未添加的感知物在调用完绘制方法后再塞入cache map
             val cacheData = mMarkersCaches[uuid]
             if (cacheData != null) {
                 val color = TrackerSourceColorHelper.getDefaultColor(data)
                 temp = data.toBuilder().setColor(color).build()
-                mFilterTrafficData[uuid] = temp
             }
+            mFilterTrafficData[uuid] = temp
             mMarkersCaches[uuid] = temp
             trafficDataUuidList.add(uuid)
         }

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

@@ -94,21 +94,6 @@ class MapIdentifySubscriber private constructor() : IMoGoIdentifyListener, IMoGo
         }
     }
 
-    override fun updateTrackerFusionData(trackObject: TrackedObject?) {
-        super.updateTrackerFusionData(trackObject)
-        try {
-            if (FunctionBuildConfig.isObuWarningFusionUnion) {
-                ThreadUtils.getSinglePool().execute {
-                    //todo emArrow
-                }
-            } else {
-
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
     override fun updateTrackerWarningInfo(trafficData: TrafficData) {
         super.updateTrackerWarningInfo(trafficData)
         try {

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

@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.business.identify;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
-import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 

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

@@ -101,7 +101,7 @@ class SmallMapView @JvmOverloads constructor(
     fun drawablePolyline() {
         clearPolyline()
         if (mAMap != null) {
-            if (mCoordinatesLatLng.size > 2) {
+            if (mCoordinatesLatLng.size >= 2) {
                 // 设置开始结束Marker位置
                 mStartMarker!!.position = mCoordinatesLatLng[0]
                 mEndMarker!!.position = mCoordinatesLatLng[mCoordinatesLatLng.size - 1]