下沉3D模型

Signed-off-by: 董宏宇 <martindhy@gmail.com>

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java

@@ -29,14 +29,13 @@ import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-public
-        /*
-         * @author congtaowang
-         * @since 2020/10/30
-         * <p>
-         * 描述
-         */
-class BaseDrawer {
+/*
+ * @author congtaowang
+ * @since 2020/10/30
+ * <p>
+ * 描述
+ */
+public class BaseDrawer {
 
     // 移除过期的 marker
     public static final int MSG_REMOVE_DIRTY_MARKERS = 9990;

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt

@@ -5,13 +5,12 @@ import android.content.Context
 import android.os.Handler
 import android.os.Message
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.marker.MogoMarkerOptions
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.constants.DataTypes
 import com.mogo.module.common.drawer.bean.TrafficData
-import com.mogo.module.common.enums.TrafficTypeEnum
+import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.utils.WorkThreadHandler
 import com.mogo.utils.logger.Logger
 import java.util.concurrent.ConcurrentHashMap

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java

@@ -1,6 +1,6 @@
 package com.mogo.module.common.drawer.bean;
 
-import com.mogo.module.common.enums.TrafficTypeEnum;
+import com.mogo.eagle.core.data.enums.TrafficTypeEnum;
 
 /**
  * @author xiaoyuzhou

modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/TrafficTypeEnum.kt

@@ -1,72 +0,0 @@
-package com.mogo.module.common.enums
-
-import com.mogo.module.common.R
-
-/**
- * @author        xiaoyuzhou
- * @date          2021/8/18 11:39 上午
- * 交通元素类型
- */
-enum class TrafficTypeEnum(
-    var type: Int,
-    var desc: String,
-    var traffic2DIconId: Int,
-    var traffic3DIconId: Int
-) {
-
-    TYPE_TRAFFIC_ID_WEI_ZHI(
-        0,
-        "未知数据",
-        R.raw.special_vehicle,
-        R.raw.special_vehicle
-    ),
-    TYPE_TRAFFIC_ID_PEOPLE(
-        1,
-        "人",
-        R.raw.people,
-        R.raw.people
-    ),
-    TYPE_TRAFFIC_ID_BICYCLE(
-        2,
-        "自行车",
-        R.raw.zixingche,
-        R.raw.zixingche
-    ),
-    TYPE_TRAFFIC_ID_TA_CHE(
-        3,
-        "他车",
-        R.raw.special_vehicle,
-        R.raw.special_vehicle
-    ),
-    TYPE_TRAFFIC_ID_MOTO(
-        4,
-        "摩托",
-        R.raw.motuoche,
-        R.raw.motuoche
-    ),
-    TYPE_TRAFFIC_ID_BUS(
-        6,
-        "大巴",
-        R.raw.daba,
-        R.raw.daba
-    ),
-    TYPE_TRAFFIC_ID_TRUCK(
-        8,
-        "卡车",
-        R.raw.daba,
-        R.raw.daba
-    ),
-    TYPE_TRAFFIC_ID_SPECIAL_VEHICLE(
-        11,
-        "特殊车辆",
-        R.raw.special_vehicle,
-        R.raw.special_vehicle
-    ),
-    TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
-        12,
-        "道路施工",
-        R.raw.v2x_shigong_warning,
-        R.raw.v2x_shigong_warning
-    )
-
-}

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java

@@ -28,6 +28,7 @@ import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.MoGoV2XServicePaths;
+import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
@@ -288,7 +289,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                         MogoMarkerOptions options = new MogoMarkerOptions().object(roadEventEntity)
                                 .latitude(roadEventEntity.getLocation().getLat()).longitude(roadEventEntity.getLocation().getLon());
                         options.anchor(0.5f, 0.5f);
-                        options.icon3DRes(com.mogo.module.common.R.raw.special_vehicle);
+                        options.icon3DRes(R.raw.special_vehicle);
                         options.anchorColor("#FFBF29FF");
                         m3DMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, options);
                         m3DMarker.setToTop();