From c4a8be64c3326f79fcd01b2055c67a82c559ab17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 23 Sep 2021 16:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=B2=893D=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../obu/mogo/utils/TrafficDataConvertUtils.kt | 2 +- .../eagle/core/data}/enums/TrafficTypeEnum.kt | 5 +++-- .../mogo-core-res}/src/main/res/raw/daba.nt3d | Bin .../mogo-core-res}/src/main/res/raw/kache.nt3d | Bin .../src/main/res/raw/motuoche.nt3d | Bin .../mogo-core-res}/src/main/res/raw/people.nt3d | Bin .../src/main/res/raw/shexiangtou.nt3d | Bin .../src/main/res/raw/special_vehicle.nt3d | Bin .../src/main/res/raw/stopline.nt3d | Bin .../src/main/res/raw/tachexiaoche.nt3d | Bin .../src/main/res/raw/v2x_daolujiebing.nt3d | Bin .../src/main/res/raw/v2x_daolujishui.nt3d | Bin .../src/main/res/raw/v2x_daolushigong.nt3d | Bin .../src/main/res/raw/v2x_guzhangqiuzhu.nt3d | Bin .../src/main/res/raw/v2x_jiaotongjiancha.nt3d | Bin .../src/main/res/raw/v2x_nongwu.nt3d | Bin .../src/main/res/raw/v2x_shigong_warning.nt3d | Bin .../src/main/res/raw/v2x_shigu.nt3d | Bin .../src/main/res/raw/v2x_shishilukuang.nt3d | Bin .../src/main/res/raw/v2x_yongdu.nt3d | Bin .../mogo-core-res}/src/main/res/raw/ziche.nt3d | Bin .../src/main/res/raw/zixingche.nt3d | Bin .../mogo/module/common/drawer/BaseDrawer.java | 15 +++++++-------- .../module/common/drawer/TrafficMarkerDrawer.kt | 3 +-- .../module/common/drawer/bean/TrafficData.java | 2 +- .../v2x/manager/impl/MoGoV2XMarkerManager.java | 3 ++- 26 files changed, 15 insertions(+), 15 deletions(-) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => core/mogo-core-data/src/main/java/com/mogo/eagle/core/data}/enums/TrafficTypeEnum.kt (94%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/daba.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/kache.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/motuoche.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/people.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/shexiangtou.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/special_vehicle.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/stopline.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/tachexiaoche.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_daolujiebing.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_daolujishui.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_daolushigong.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_guzhangqiuzhu.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_jiaotongjiancha.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_nongwu.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_shigong_warning.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_shigu.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_shishilukuang.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/v2x_yongdu.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/ziche.nt3d (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/raw/zixingche.nt3d (100%) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt index 73a552b774..5196ec261f 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.obu.mogo.utils import com.mogo.eagle.core.utilcode.util.LogUtils 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.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxPtcThreatIndInfo import com.zhidao.support.obu.model.CvxRtiThreatIndInfo diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt similarity index 94% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/TrafficTypeEnum.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index 2a26036ee6..11fc57bd25 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -1,6 +1,7 @@ -package com.mogo.module.common.enums +package com.mogo.eagle.core.data.enums + +import com.mogo.mogo.module.data.R -import com.mogo.module.common.R /** * @author xiaoyuzhou diff --git a/modules/mogo-module-common/src/main/res/raw/daba.nt3d b/core/mogo-core-res/src/main/res/raw/daba.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/daba.nt3d rename to core/mogo-core-res/src/main/res/raw/daba.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/kache.nt3d b/core/mogo-core-res/src/main/res/raw/kache.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/kache.nt3d rename to core/mogo-core-res/src/main/res/raw/kache.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/motuoche.nt3d b/core/mogo-core-res/src/main/res/raw/motuoche.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/motuoche.nt3d rename to core/mogo-core-res/src/main/res/raw/motuoche.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/people.nt3d b/core/mogo-core-res/src/main/res/raw/people.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/people.nt3d rename to core/mogo-core-res/src/main/res/raw/people.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/shexiangtou.nt3d b/core/mogo-core-res/src/main/res/raw/shexiangtou.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/shexiangtou.nt3d rename to core/mogo-core-res/src/main/res/raw/shexiangtou.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/special_vehicle.nt3d b/core/mogo-core-res/src/main/res/raw/special_vehicle.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/special_vehicle.nt3d rename to core/mogo-core-res/src/main/res/raw/special_vehicle.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/stopline.nt3d b/core/mogo-core-res/src/main/res/raw/stopline.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/stopline.nt3d rename to core/mogo-core-res/src/main/res/raw/stopline.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/tachexiaoche.nt3d b/core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/tachexiaoche.nt3d rename to core/mogo-core-res/src/main/res/raw/tachexiaoche.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_nongwu.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shigong_warning.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_shigong_warning.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_shigong_warning.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_shigong_warning.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shigu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_shigu.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/v2x_yongdu.nt3d rename to core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/ziche.nt3d b/core/mogo-core-res/src/main/res/raw/ziche.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/ziche.nt3d rename to core/mogo-core-res/src/main/res/raw/ziche.nt3d diff --git a/modules/mogo-module-common/src/main/res/raw/zixingche.nt3d b/core/mogo-core-res/src/main/res/raw/zixingche.nt3d similarity index 100% rename from modules/mogo-module-common/src/main/res/raw/zixingche.nt3d rename to core/mogo-core-res/src/main/res/raw/zixingche.nt3d diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 99e20b07aa..cd5756d753 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/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 - *

- * 描述 - */ -class BaseDrawer { +/* + * @author congtaowang + * @since 2020/10/30 + *

+ * 描述 + */ +public class BaseDrawer { // 移除过期的 marker public static final int MSG_REMOVE_DIRTY_MARKERS = 9990; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt index 4314acb5a9..8eb297e13f 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt +++ b/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 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java index a7707482d3..d2cea9954b 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/TrafficData.java +++ b/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 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index 356e7dac1d..619735fd63 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/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();