[2.13.2]fix bug of aicloud fusion problem and add limit of visual long sight

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

@@ -0,0 +1,78 @@
+syntax = "proto3";
+package mogo.yycp.service;
+option java_package = "mogo.yycp.api.proto";
+option java_outer_classname = "SocketDownData";
+/*
+message xxx {
+  // 字段规则：required -> 字段只能也必须出现 1 次
+  // 字段规则：optional -> 字段可出现 0 次或1次
+  // 字段规则：repeated -> 字段可出现任意多次（包括 0）
+  // 类型：int32、int64、sint32、sint64、string、32-bit ....
+  // 字段编号：0 ~ 536870911（除去 19000 到 19999 之间的数字）
+  字段规则 类型 名称 = 字段编号;
+}
+*/
+//返回车机主实体
+message SocketDownDataProto {
+    uint64 seq = 1;
+    uint32 msgType = 2;
+    string sn = 3;
+    LauncherSnapshotProto data = 4;
+    uint64 utcTime = 5;
+    uint64 upUtcTime = 6;
+    string cityCode = 7;
+}
+
+//LauncherSnapshot数据响应VO
+message LauncherSnapshotProto {
+    //总数据集合 RoadDataVo
+    repeated CloudRoadDataProto allList = 1;
+    //前方50米数据集合 RoadDataVo
+    repeated CloudRoadDataProto nearList = 2;
+    //摄像头 RoadDataVo
+    CloudRoadDataProto camera = 3;
+    string msgId = 4;
+    uint64 time = 5;
+    //过期时间
+    uint64 expire = 6;
+}
+//RoadDataVo
+message CloudRoadDataProto {
+    /**物体类型 1-人 2-自行车 3-小轿车 4-摩托车 5-红绿灯 6-bus 8-truck 9-路边摄像头*/
+    uint32 type = 1;
+    /**数据来源 1,"自车数据"  2,"ADAS数据"  3,"路测设备识别数据" */
+    uint32 fromType = 2;
+    /**
+     * 车机上行pgs坐标给lat，lon两个成员变量
+     *
+     * 在下发车机时计算高德经纬度
+     * 1.将gps（lat，lon）给wgslat,wgalon
+     * 2.高德算法算出高德经纬度，给lat,lon
+     */
+    double lat = 3; //gps->gd
+    double lon = 4; //gps->gd
+    double wgslat = 5; //原gps
+    double wgslon = 6; //原gps
+    //车机sn
+    string sn = 7;
+    //车辆UUID
+    string uuid = 8;
+    /** 车牌号 */
+    string cardId = 9;
+    /**速度*/
+    double speed = 10;
+    /**方向*/
+    double heading = 11;
+    /** 系统时间 */
+    uint64 systemTime = 12;
+    /** 星历时间 */
+    uint64 satelliteTime = 13;
+    /**红绿灯状态 1红 2绿 3黄*/
+    uint32 lightStatus = 14;
+    /**红绿灯剩余时间 读秒*/
+    uint32 lightLeftTime = 15;
+    /**视频流直播地址*/
+    string rtmpUrl = 16;
+    /**距离*/
+    double distance = 17;
+}

libraries/mogo-map-api/build.gradle

@@ -55,7 +55,6 @@ dependencies {
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-data')
     }
-    implementation rootProject.ext.dependencies.mogoaicloudsocket
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java

@@ -1,6 +1,5 @@
 package com.mogo.map;
 
-import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.center.CenterLine;
 import com.mogo.map.marker.IMogoMarker;
@@ -14,6 +13,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
 
 /**
  * @author congtaowang

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java

@@ -2,7 +2,6 @@ package com.mogo.map.marker;
 
 import android.content.Context;
 
-import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 
 import java.util.ArrayList;
@@ -11,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
 
 /**
  * @author congtaowang

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.graphics.Point;
 import android.util.Pair;
 
-import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -41,8 +40,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
 
 /**
  * @author congtaowang
@@ -121,10 +122,14 @@ public class AMapWrapper implements IMogoMap {
                 markerOptionsArrayList.add(markerOptions);
             }
         });
+//        markerOptionsArrayList.addAll(cwList);
         long time = markerOptionsArrayList.get(0).getTime();
-        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
+        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0);
+//        cwList.clear();
     }
 
+//    private final CopyOnWriteArrayList<MarkerSimpleData> cwList = new CopyOnWriteArrayList<>();
+
     @SuppressLint("NewApi")
     @Override
     public void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList) {
@@ -138,9 +143,10 @@ public class AMapWrapper implements IMogoMap {
                 markerOptionsArrayList.add(markerOptions);
             }
         });
+//        cwList.addAll(markerOptionsArrayList);
         long time = markerOptionsArrayList.get(0).getTime();
-        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
-
+        //todo 最后一个参数，是否管理锚点的删除
+        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0);
     }
 
     @Override

libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java

@@ -2,7 +2,6 @@ package com.mogo.map;
 
 import android.content.Context;
 
-import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.v2x.CallMarkersClearManager;
 import com.mogo.map.marker.IMogoMarker;
@@ -16,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
 
 /**
  * @author congtaowang

libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java

@@ -5,7 +5,6 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
@@ -49,6 +48,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import mogo.telematics.pad.MessagePad;
+import mogo.yycp.api.proto.SocketDownData;
 
 /**
  * @author congtaowang