From 0eea8c223dde1f015d21a64ee99934c14f5e31d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 16 Sep 2021 16:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- core/mogo-core-data/gradle.properties | 4 ++-- .../{module => eagle/core}/data/enums/WarningDirectionEnum.kt | 2 +- .../{module => eagle/core}/data/model/V2XThreatIndInfo.kt | 2 +- core/mogo-core-function-api/gradle.properties | 4 ++-- core/mogo-core-function-call-api/gradle.properties | 4 ++-- core/mogo-core-function-call-impl/gradle.properties | 4 ++-- core/mogo-core-function-impl/gradle.properties | 4 ++-- .../main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt | 2 +- .../main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt | 2 +- .../main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt | 2 +- .../java/com/mogo/module/hmi/warning/MoGoWarningProvider.java | 2 +- .../java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt | 2 +- .../main/java/com/mogo/service/warning/IMoGoWaringProvider.kt | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename core/mogo-core-data/src/main/java/com/mogo/{module => eagle/core}/data/enums/WarningDirectionEnum.kt (95%) rename core/mogo-core-data/src/main/java/com/mogo/{module => eagle/core}/data/model/V2XThreatIndInfo.kt (96%) diff --git a/core/mogo-core-data/gradle.properties b/core/mogo-core-data/gradle.properties index 803c4a6016..baec8c5f74 100644 --- a/core/mogo-core-data/gradle.properties +++ b/core/mogo-core-data/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-data +GROUP=com.mogo.eagle.core +POM_ARTIFACT_ID=data VERSION_CODE=1 diff --git a/core/mogo-core-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt similarity index 95% rename from core/mogo-core-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt index 1d0cb75137..c1b1229f40 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/WarningDirectionEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.module.data.enums +package com.mogo.eagle.core.data.enums /** *@author xiaoyuzhou diff --git a/core/mogo-core-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt similarity index 96% rename from core/mogo-core-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt index a6c74539d9..21250eac29 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt @@ -1,4 +1,4 @@ -package com.mogo.module.data.model +package com.mogo.eagle.core.data.model /** *@author xiaoyuzhou diff --git a/core/mogo-core-function-api/gradle.properties b/core/mogo-core-function-api/gradle.properties index 803c4a6016..2f6fdd9216 100644 --- a/core/mogo-core-function-api/gradle.properties +++ b/core/mogo-core-function-api/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-data +GROUP=com.mogo.eagle.core +POM_ARTIFACT_ID=function-api VERSION_CODE=1 diff --git a/core/mogo-core-function-call-api/gradle.properties b/core/mogo-core-function-call-api/gradle.properties index 803c4a6016..585bc34412 100644 --- a/core/mogo-core-function-call-api/gradle.properties +++ b/core/mogo-core-function-call-api/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-data +GROUP=com.mogo.eagle.core +POM_ARTIFACT_ID=function-call-api VERSION_CODE=1 diff --git a/core/mogo-core-function-call-impl/gradle.properties b/core/mogo-core-function-call-impl/gradle.properties index 803c4a6016..dd78649fa7 100644 --- a/core/mogo-core-function-call-impl/gradle.properties +++ b/core/mogo-core-function-call-impl/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-data +GROUP=com.mogo.eagle.core +POM_ARTIFACT_ID=function-call-impl VERSION_CODE=1 diff --git a/core/mogo-core-function-impl/gradle.properties b/core/mogo-core-function-impl/gradle.properties index 803c4a6016..9683b16276 100644 --- a/core/mogo-core-function-impl/gradle.properties +++ b/core/mogo-core-function-impl/gradle.properties @@ -1,3 +1,3 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-data +GROUP=com.mogo.eagle.core +POM_ARTIFACT_ID=function-impl VERSION_CODE=1 diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt index 690c781056..7d5b28f0a7 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt @@ -1,7 +1,7 @@ package com.mogo.module.hmi.ui import com.mogo.commons.mvp.IView -import com.mogo.module.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.service.warning.WarningStatusListener diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index 14549d4156..c9d3db18e2 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -9,7 +9,7 @@ import android.view.animation.OvershootInterpolator import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.module.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.module.hmi.R import com.mogo.module.hmi.notification.WarningFloat import com.mogo.module.hmi.notification.anim.DefaultAnimator diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt index 6b1ab523ac..3cc33fa3be 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.widget.RelativeLayout -import com.mogo.module.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.module.hmi.R import com.mogo.utils.logger.Logger import kotlinx.android.synthetic.main.module_hmi_warning_v2x.view.* diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java index 7f2da840d2..67ad3132dc 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java @@ -8,7 +8,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.module.data.enums.WarningDirectionEnum; +import com.mogo.eagle.core.data.enums.WarningDirectionEnum; import com.mogo.module.hmi.WaringConst; import com.mogo.module.hmi.ui.MoGoWarningFragment; import com.mogo.service.MogoServicePaths; diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index 96fa9f6a4c..4aacd0ed4f 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -6,7 +6,7 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.module.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.module.obu.mogo.utils.TrafficDataConvertUtils import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.kt b/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.kt index 3b7abff765..8fe814a802 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.kt +++ b/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.kt @@ -1,6 +1,6 @@ package com.mogo.service.warning -import com.mogo.module.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.service.module.IMogoModuleProvider /**