From c5c7bf2f7692fc523300e14537fb5db30de12e11 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 11:37:31 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=87=AA=E8=BD=A6=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_hmi.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 78a118fc28..3b910a2110 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -64,10 +64,9 @@ - + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file From e70aa14f48dfd9fc54539c06a41c966074a0a601 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:13:20 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BCUI=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/check_info_adapter.xml | 6 +++--- .../src/main/res/layout/check_info_title_item.xml | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml index 39c5a5a9fe..4d3f41e3df 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml @@ -8,7 +8,7 @@ @@ -27,9 +28,8 @@ android:id="@+id/info_result_tx" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_27" android:ellipsize="end" - android:gravity="left" + android:gravity="center" android:maxLines="2" android:text="检测中检测中检测中检测中老链路来了来了" android:textColor="#fff" diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index eb90a08022..fe59c709b5 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -10,7 +10,9 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:gravity="left" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="模块名称" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -24,7 +26,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="运行状态" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -38,7 +41,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_left_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="模块名称" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" @@ -52,7 +56,8 @@ android:layout_width="0px" android:layout_height="match_parent" android:background="@drawable/check_item_right_shape" - android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingTop="@dimen/dp_32" android:text="运行状态" android:textSize="@dimen/dp_38" app:layout_constraintHorizontal_chainStyle="spread" From 84e5a2cc6a2a20093f7f713e07b87dff5eb4672c Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:28:45 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=97=E8=A1=A8UI?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/check_list.xml | 3 +-- .../src/main/res/layout/check_titel.xml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml index f3ad400460..36967c39ca 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml @@ -5,9 +5,8 @@ android:layout_width="2360px" android:layout_height="@dimen/dp_525" android:layout_marginStart="@dimen/dp_100" - android:layout_marginTop="@dimen/dp_15" + android:layout_marginBottom="@dimen/dp_24" android:layout_marginEnd="@dimen/dp_100" - android:layout_marginBottom="@dimen/dp_35" android:background="@drawable/check_list_item_back"> From ae436dfd1b93e9b96914dac15199cb0bbf05a561 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 13:46:44 +0800 Subject: [PATCH 04/13] no message --- .../src/main/res/layout/check_info_adapter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml index 4d3f41e3df..ef25c53440 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:gravity="center" + android:gravity="left" android:maxLines="2" android:text="检测中检测中检测中检测中老链路来了来了" android:textColor="#fff" From 993504054308ad3504b28e06b32154cde00723f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 13:55:33 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../hmi/ui/setting/DebugSettingView.kt | 6 ++--- ...otStatusInfo.kt => AutoPilotStatusInfo.kt} | 2 +- .../IMoGoAutoPilotStatusListener.java | 6 ++--- .../CallerAutoPilotStatusListenerManager.kt | 26 +++++++++---------- .../mogo/module/adas/AdasEventManager.java | 4 +-- .../SnapshotLocationDataCenter.java | 4 +-- 6 files changed, 24 insertions(+), 24 deletions(-) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{AutopilotStatusInfo.kt => AutoPilotStatusInfo.kt} (97%) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index dcbd2d555a..218f2a1d49 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -7,7 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.autopilot.AdasOCHData -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.obu.ObuStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener @@ -108,8 +108,8 @@ class DebugSettingView @JvmOverloads constructor( } - override fun onAutoPilotStatusResponse(autopilotStatusInfo: AutopilotStatusInfo?) { - tvAutopilotInfo.text = GsonUtils.toJson(autopilotStatusInfo) + override fun onAutoPilotStatusResponse(autoPilotStatusInfo: AutoPilotStatusInfo?) { + tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo) } } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt similarity index 97% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt index dc0ae0ef25..b6f6d6d1db 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt @@ -6,7 +6,7 @@ package com.mogo.eagle.core.data.autopilot * 域控制器状态信息 * 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); */ -class AutopilotStatusInfo { +class AutoPilotStatusInfo { /** * 当前链接的IP地址, 默认地址 192.168.1.102 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java index 71ed53967e..0f9867840f 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.api.autopilot; import com.mogo.eagle.core.data.autopilot.AdasOCHData; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; +import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo; /** * @author xiaoyuzhou @@ -42,7 +42,7 @@ public interface IMoGoAutoPilotStatusListener { /** * 自动驾驶状态信息 * - * @param autopilotStatusInfo 状态信息 + * @param autoPilotStatusInfo 状态信息 */ - void onAutoPilotStatusResponse(AutopilotStatusInfo autopilotStatusInfo); + void onAutoPilotStatusResponse(AutoPilotStatusInfo autoPilotStatusInfo); } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index c9974830d0..543a7c8c02 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.call.autopilot import androidx.annotation.Nullable import com.mogo.eagle.core.data.autopilot.AdasOCHData -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener import com.mogo.eagle.core.function.call.base.CallerBase @@ -18,7 +18,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { private val TAG = "CallerAutopilotListenerManager" // 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态 - private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo() + private var mAutoPilotStatusInfo: AutoPilotStatusInfo = AutoPilotStatusInfo() // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 private val mAutoPilotStatusListeners: HashMap = HashMap() @@ -26,15 +26,15 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { /** * 查询AutoPilot状态 */ - fun getAutoPilotStatusInfo(): AutopilotStatusInfo { - return mAutopilotStatusInfo + fun getAutoPilotStatusInfo(): AutoPilotStatusInfo { + return mAutoPilotStatusInfo } /** * 查询AutoPilot状态 */ fun getAutoPilotStatusInfoJsonString(): String { - return GsonUtils.toJson(mAutopilotStatusInfo) + return GsonUtils.toJson(mAutoPilotStatusInfo) } /** @@ -47,7 +47,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Nullable listener: IMoGoAutoPilotStatusListener ) { mAutoPilotStatusListeners[tag] = listener - listener.onAutoPilotStatusResponse(mAutopilotStatusInfo) + listener.onAutoPilotStatusResponse(mAutoPilotStatusInfo) } /** @@ -75,23 +75,23 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { */ @Synchronized fun invokeAutoPilotStatusListener() { - LogUtils.dTag(TAG, "$mAutopilotStatusInfo") - invokeAutoPilotStatusListener(mAutopilotStatusInfo) + LogUtils.dTag(TAG, "$mAutoPilotStatusInfo") + invokeAutoPilotStatusListener(mAutoPilotStatusInfo) } /** * 自动驾驶状态信息回调 - * @param autopilotStatusInfo 自动驾驶状态信息 + * @param autoPilotStatusInfo 自动驾驶状态信息 */ @Synchronized - fun invokeAutoPilotStatusListener(autopilotStatusInfo: AutopilotStatusInfo) { - LogUtils.dTag(TAG, "$autopilotStatusInfo") - mAutopilotStatusInfo = autopilotStatusInfo + fun invokeAutoPilotStatusListener(autoPilotStatusInfo: AutoPilotStatusInfo) { + LogUtils.dTag(TAG, "$autoPilotStatusInfo") + mAutoPilotStatusInfo = autoPilotStatusInfo mAutoPilotStatusListeners.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutoPilotStatusResponse(mAutopilotStatusInfo) + listener.onAutoPilotStatusResponse(mAutoPilotStatusInfo) } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 47e8cad380..54cec4d0f4 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -1,7 +1,7 @@ package com.mogo.module.adas; import com.google.gson.Gson; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; +import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.module.adas.model.AdasServiceModel; import com.mogo.utils.logger.Logger; @@ -184,7 +184,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL AutopilotStatus.ValuesBean autopilotStatusValues = autopilotStatus.getValues(); if (autopilotStatusValues != null) { // 初始化自动驾驶状态信息 - AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); + AutoPilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); autopilotStatusInfo.setAutopilotStatus(autopilotStatusValues.getState()); autopilotStatusInfo.setAutoDriveStatus(autopilotStatusValues.getPilotmode()); autopilotStatusInfo.setErrorReason(autopilotStatusValues.getReason()); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java index 77fce93099..081c2f2a4e 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java @@ -2,7 +2,7 @@ package com.mogo.module.common.datacenter; import com.mogo.commons.FunctionBuildConfig; import com.mogo.commons.debug.DebugConfig; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; +import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.cloud.location.CloudLocationInfo; @@ -94,7 +94,7 @@ public class SnapshotLocationDataCenter { // 使用与渠道配置一样的gps提供者提供的数据 if (gpsProvider == FunctionBuildConfig.gpsProvider) { //测试面板状态同步 - AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); + AutoPilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); autopilotStatusInfo.setLocationLat(lat); autopilotStatusInfo.setLocationLon(lon); CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatusListener(); From fb2e96f9963c265c22a6ef2e64ffafeef5a5a955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 14:46:34 +0800 Subject: [PATCH 06/13] Rename .java to .kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../{MoGoAutoPilotProvider.java => MoGoAutoPilotProvider.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/{MoGoAutoPilotProvider.java => MoGoAutoPilotProvider.kt} (100%) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt similarity index 100% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.java rename to core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt From 78daacaae7dfbcb9ef8e44a36a1388dcc5353d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 14:46:34 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=BF=81=E7=A7=BBMogoServicePaths?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=88=B0com.mogo.eagle.core.data.constants?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- app/build.gradle | 2 + .../com/mogo/launcher/MogoApplication.java | 4 +- .../autopilot/MoGoAutoPilotProvider.kt | 62 ++- .../mogo-core-function-check/build.gradle | 1 + .../check/VehicleMonitoringManager.kt | 2 +- .../check/net/CheckApiServiceFactory.java | 2 +- .../V2XLimitingVelocityBroadcastReceiver.kt | 2 +- .../V2XTrafficLightBroadcastReceiver.kt | 2 +- .../receiver/V2XWarningBroadcastReceiver.kt | 2 +- .../function/hmi/ui/widget/SpeedPanelView.kt | 2 +- .../hmi/warning/MoGoWarningProvider.kt | 2 +- .../core/function/obu/mogo/MoGoObuProvider.kt | 2 +- .../obu/mogo/MogoPrivateObuManager.kt | 2 +- .../core/function/smp/SmallMapProvider.java | 2 +- .../core/function/smp/SmpServiceManager.java | 2 +- .../core/data/constants/MogoServicePaths.java | 7 + .../api/autopilot/IMoGoAutoPilotProvider.java | 5 + .../com/mogo/module/adas/AdasProvider.java | 2 +- modules/mogo-module-apps/build.gradle | 3 + .../mogo/module/apps/AppsListPresenter.java | 2 - modules/mogo-module-authorize/build.gradle | 17 +- .../authprovider/biz/MogoAuthorizeProvider.kt | 2 +- .../module/authorize/model/BaseRepository.kt | 5 +- .../module/authorize/util/AnalyticsUtil.kt | 4 +- .../mogo/module/authorize/voice/VoiceUtil.kt | 4 +- modules/mogo-module-back/build.gradle | 2 + .../back/BackToLauncherModuleProvider.java | 3 +- .../com/mogo/module/back/MogoLauncher.java | 2 +- .../entrance/EntrancePresenter.java | 3 +- .../MogoEntranceButtonControllerImpl.java | 2 +- .../extensions/utils/TopViewManager.java | 2 +- .../panel/presenter/SimpleSpeedPresenter.kt | 3 - .../com/mogo/module/main/MogoCardManager.java | 2 +- .../module/main/cards/MogoModulesManager.java | 2 +- .../registercenter/MogoRegisterCenter.java | 2 +- .../main/utils/DisplayEffectsManager.java | 2 +- .../main/windowview/MogoWindowManager.java | 2 +- .../mogo/module/map/MapFrameController.java | 3 +- modules/mogo-module-obu/build.gradle | 19 +- .../com/zhidao/mogo/module/obu/MockUtil.kt | 4 +- .../obu/crashwarn/CrashWarningProvider.kt | 3 +- modules/mogo-module-push/build.gradle | 2 + .../mogo/module/push/utils/AnalyticsUtils.kt | 2 +- .../com/mogo/module/push/view/GlobalTools.kt | 4 +- .../navi/manager/MogoAddressManager.java | 2 +- .../navi/manager/MogoSearchManager.java | 2 +- .../navi/manager/MogoSettingManager.java | 2 +- .../navi/ui/search/BaseSearchFragment.java | 16 +- .../navi/ui/search/SearchPresenter.java | 2 +- .../actionmanager/MogoActionManager.java | 3 +- .../service/datamanager/MogoDataManager.java | 2 +- .../service/marker/MogoMarkerServiceImpl.java | 3 +- .../service/network/ZhidaoRefreshModel.java | 3 +- .../panel/OnlineCarListPanelProvider.java | 2 +- .../module/service/receiver/MogoReceiver.java | 4 - .../MogoRefreshStrategyController.java | 3 +- .../service/ttsConfig/TtsConfigModleData.java | 4 - .../service/unwake/GlobalUnwakeManager.java | 2 +- .../module/share/GaoDeAimlessProvider.java | 2 +- .../com/mogo/module/share/ShareControl.java | 5 +- .../module/share/StrategyShareProvider.kt | 2 +- .../module/share/TanluServiceManager.java | 2 - .../module/share/TrafficUploadProvider.kt | 2 +- .../share/dialog/GridFixableShareDialog.kt | 3 +- .../share/dialog/LaucherShareDialog.java | 2 +- .../share/manager/ServiceApisManager.kt | 2 +- .../mogo/module/share/net/TanluModelData.java | 29 +- .../module/share/net/TrafficModelData.java | 6 +- .../mogo/module/v2x/V2XServiceManager.java | 2 +- .../v2x/adapter/V2XShareEventAdapter.java | 2 +- .../v2x/fragment/V2XSurroundingFragment.java | 2 +- .../v2x/network/V2XApiServiceFactory.java | 2 +- .../presenter/SurroundingEventPresenter.java | 5 +- .../roadcondition/service/MainService.kt | 2 +- .../com/mogo/service/MogoServicePaths.java | 398 ------------------ .../mogo/service/impl/MogoServiceApis.java | 2 +- .../service/impl/adas/MogoADASController.java | 2 +- .../service/impl/analytics/MogoAnalytics.java | 2 +- .../location/MogoLocationInfoService.java | 2 +- .../cloud/passport/MogoPassportManager.java | 2 +- .../impl/cloud/socket/MogoSocketManager.java | 2 +- .../cloud/socket/MogoWebSocketManager.java | 2 +- .../fragmentmanager/MogoFragmentManager.java | 2 +- .../impl/imageloader/MogoImageLoader.java | 2 +- .../imageloader/glide/GlideImageLoader.java | 16 - .../impl/intent/MogoIntentManager.java | 2 +- .../mogo/service/impl/map/MogoMapService.java | 2 +- .../impl/network/MogoNetWorkService.java | 2 +- .../impl/statusmanager/MogoMsgCenter.java | 2 +- .../impl/statusmanager/MogoStatusManager.java | 4 +- .../com/mogo/service/impl/v2x/V2XManager.java | 2 +- 91 files changed, 152 insertions(+), 620 deletions(-) delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java diff --git a/app/build.gradle b/app/build.gradle index 9141d86d71..d4d171277d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -198,6 +198,8 @@ dependencies { implementation project(':test:crashreport-upgrade') implementation project(':test:crashreport-bugly') + implementation project(':core:mogo-core-data') + implementation project(':core:function-impl:mogo-core-function-obu-mogo') implementation project(':core:function-impl:mogo-core-function-smp') implementation project(':core:function-impl:mogo-core-function-hmi') diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 410dd3c6fe..45204470dc 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -18,6 +18,7 @@ import com.mogo.commons.FunctionBuildConfig; import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.map.location.MogoLocation; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.carchatting.card.CallChatConstant; @@ -32,7 +33,6 @@ import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.utils.ObuConfig; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; import com.mogo.test.crashreport.ITestCrashReportProvider; import com.mogo.test.crashreport.upgrade.UpgradeReportProvider; import com.mogo.utils.ProcessUtils; @@ -44,8 +44,6 @@ import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.mogo.module.left.panel.LeftPanelConst; -import leakcanary.LeakCanary; - /** * @author congtaowang * @since 2019-12-18 diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt index 23e8734979..ce6b3cba2a 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt @@ -1,55 +1,51 @@ -package com.mogo.eagle.core.function.autopilot; +package com.mogo.eagle.core.function.autopilot -import android.content.Context; - -import com.mogo.eagle.core.data.autopilot.AdasControlCommandParameter; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotProvider; -import com.mogo.eagle.core.utilcode.util.GsonUtils; -import com.mogo.eagle.core.utilcode.util.LogUtils; -import com.zhidao.support.adas.high.AdasManager; +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.eagle.core.data.autopilot.AdasControlCommandParameter +import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotProvider +import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.LogUtils +import com.zhidao.support.adas.high.AdasManager /** * @author xiaoyuzhou * @date 2021/9/22 8:43 下午 */ -public class MoGoAutoPilotProvider implements IMoGoAutoPilotProvider { - - private static final String TAG = "MogoAutoPilotProvider"; - - @Override - public void init(Context context) { - - } - - @Override - public void startAutoPilot(RemoteControlAutoPilotParameters result) { - if (AdasManager.getInstance().isSocketConnect()) { - AdasControlCommandParameter parameter = new AdasControlCommandParameter(TAG, result); - AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter)); +@Route(path = MogoServicePaths.PATH_AUTO_PILOT) +class MoGoAutoPilotProvider : IMoGoAutoPilotProvider { + override fun init(context: Context) {} + override fun connectAutoPilot() {} + override fun startAutoPilot(result: RemoteControlAutoPilotParameters) { + if (AdasManager.getInstance().isSocketConnect) { + val parameter = AdasControlCommandParameter(TAG, result) + AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter)) } else { - LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶"); + LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶") } } - @Override - public void cancelAutoPilot() { - if (AdasManager.getInstance().isSocketConnect()) { - AdasManager.getInstance().controlAutopilotCarHead(); + override fun cancelAutoPilot() { + if (AdasManager.getInstance().isSocketConnect) { + AdasManager.getInstance().controlAutopilotCarHead() } else { - LogUtils.eTag(TAG, "车机与工控机链接失败，无法断开自动驾驶"); + LogUtils.eTag(TAG, "车机与工控机链接失败，无法断开自动驾驶") } } - @Override - public int getAutopilotStatus() { + override fun getAutopilotStatus(): Int { // int status = IMoGoAutoPilotStatusListener.STATUS_AUTOPILOT_DISABLE; // try { // status = adasProvider.autopilotStateCall().getState(); // } catch (Exception e) { // e.printStackTrace(); // } - return 0; + return 0 } -} + companion object { + private const val TAG = "MogoAutoPilotProvider" + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle index c5b04d441b..631b47c01f 100644 --- a/core/function-impl/mogo-core-function-check/build.gradle +++ b/core/function-impl/mogo-core-function-check/build.gradle @@ -64,6 +64,7 @@ dependencies { implementation project(':modules:mogo-module-service') implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') } diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt index f577d6623d..31d323f2a6 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt @@ -14,7 +14,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.LogUtils import com.mogo.module.common.MogoApisHandler import com.mogo.module.service.receiver.MogoReceiver -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor import com.mogo.utils.ActivityLifecycleManager diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java index b7b459cf93..c40a406d99 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java @@ -2,8 +2,8 @@ package com.mogo.eagle.core.function.check.net; import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.module.common.constants.HostConst; -import com.mogo.service.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt index 1826591f05..4d50f4d116 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt @@ -6,7 +6,7 @@ import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt index 2728e61306..c0b4e2806e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt @@ -6,7 +6,7 @@ import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt index ff3c1d1038..67995752df 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt @@ -7,7 +7,7 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.common.enums.EventTypeEnum import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index 27cea7edc7..997ef7d606 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -16,7 +16,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt index 7ddbd06b90..fa956e26d2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.data.enums.WarningDirectionEnum -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.logger.Logger /** diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt index fc1159114e..af11270099 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt @@ -5,7 +5,7 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.storage.SharedPrefsMgr /** diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index c2857f5cae..6fd8465c73 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -12,7 +12,7 @@ import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.map.IMogoMapService import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.support.obu.MogoObuManager diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java index 92e582064d..44190b7482 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.module.common.MogoApisHandler; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoAdasRouteCallBack; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java index ee0cad4d93..bd36e3dec1 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java @@ -4,7 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoRegisterCenter; /** diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 0caacad330..7566e44b60 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -397,4 +397,11 @@ public class MogoServicePaths { @Keep @Deprecated public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api"; + + /** + * AutoPilot 模块 + */ + @Keep + @Deprecated + public static final String PATH_AUTO_PILOT = "/auto_pilot/api"; } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java index 6c19059386..9bb7675f73 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java @@ -10,6 +10,11 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; */ public interface IMoGoAutoPilotProvider extends IMoGoFunctionServerProvider { + /** + * 连接自动驾驶域控制器 + */ + void connectAutoPilot(); + /** * 开启自动驾驶 * diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index ff71c69a5e..1bd858cfab 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -5,7 +5,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.utils.logger.Logger; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.support.adas.high.AdasManager; diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index 6db77f72c9..09d0589305 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -61,6 +61,9 @@ dependencies { api project(":foudations:mogo-commons") api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + + implementation project(':core:mogo-core-data') + } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java index 09b8d91a2d..3e943c40d4 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java @@ -6,11 +6,9 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.Presenter; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; -import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-authorize/build.gradle b/modules/mogo-module-authorize/build.gradle index 8f19f33858..be562c66c7 100644 --- a/modules/mogo-module-authorize/build.gradle +++ b/modules/mogo-module-authorize/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'com.alibaba.arouter' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'com.alibaba.arouter' +} android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -20,7 +22,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME",project.getName() ) + arg("AROUTER_MODULE_NAME", project.getName()) } } @@ -49,6 +51,7 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter + kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { @@ -61,6 +64,8 @@ dependencies { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(":modules:mogo-module-common") + + implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt index 475ec62561..4f81c494df 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt @@ -15,7 +15,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant.Companion import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.util.SharedPreferenceUtil.hasGuide -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.auth.IMogoAuthManager import com.mogo.service.module.IMogoModuleLifecycle import com.mogo.utils.logger.Logger diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/BaseRepository.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/BaseRepository.kt index 6b99ab09f0..8e216d70df 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/BaseRepository.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/BaseRepository.kt @@ -1,11 +1,10 @@ package com.mogo.module.authorize.model import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.module.authorize.constant.HttpConstant import com.mogo.module.authorize.net.AuthorizeApi import com.mogo.module.common.constants.HostConst import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths open class BaseRepository { @@ -15,7 +14,7 @@ open class BaseRepository { fun getNetWorkApi(): AuthorizeApi { var serviceApi: IMogoServiceApis? = null - val mogoService = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation() + val mogoService = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation() if (mogoService is IMogoServiceApis) { serviceApi = mogoService } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/AnalyticsUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/AnalyticsUtil.kt index bb08c3350f..00a7d0194b 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/AnalyticsUtil.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/AnalyticsUtil.kt @@ -2,7 +2,7 @@ package com.mogo.module.authorize.util import com.alibaba.android.arouter.launcher.ARouter import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics object AnalyticsUtil { @@ -14,7 +14,7 @@ object AnalyticsUtil { fun track(eventType: String, data: MutableMap? = hashMapOf()) { if (trackRouter == null) { - val arouter = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation() + val arouter = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation() if (arouter is IMogoServiceApis) { trackRouter = arouter.analyticsApi } diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt index 6d0d0e8b45..cd8fb4af32 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt @@ -5,7 +5,7 @@ import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.intent.IMogoIntentManager import com.mogo.utils.logger.Logger @@ -17,7 +17,7 @@ object VoiceUtil { init { Logger.i(TAG, "init") val register = - ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation() + ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation() if (register is IMogoServiceApis) { intentRegister = register.intentManagerApi } diff --git a/modules/mogo-module-back/build.gradle b/modules/mogo-module-back/build.gradle index 8245cd3d4c..b1872c2b30 100644 --- a/modules/mogo-module-back/build.gradle +++ b/modules/mogo-module-back/build.gradle @@ -56,6 +56,8 @@ dependencies { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + + implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java index eaf4212428..2f0bf3dc5a 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java @@ -9,9 +9,8 @@ import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.debug.DebugConfig; -import com.mogo.module.common.MogoModulePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.module.common.utils.CarSeries; -import com.mogo.service.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java index 669a63f78a..150ca7eb96 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java @@ -3,7 +3,7 @@ package com.mogo.module.back; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.launcher.IMogoLauncher; /** diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 8700b1a027..7062c39cb6 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -10,7 +10,6 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.Presenter; -import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; import com.mogo.module.extensions.R; @@ -24,7 +23,7 @@ import com.mogo.module.extensions.weather.Phenomena; import com.mogo.module.extensions.weather.WeatherCallback; import com.mogo.module.extensions.weather.WeatherInfo; import com.mogo.module.extensions.weather.WeatherModel; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java index 6a664575a4..6b347df729 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java @@ -6,7 +6,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.module.extensions.utils.EntranceViewHolder; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.entrance.ButtonIndex; import com.mogo.service.entrance.IMogoEntranceButtonController; import com.mogo.service.windowview.IMogoEntranceViewListener; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java index 0663d8c14b..a843b53126 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java @@ -7,7 +7,7 @@ import android.view.ViewGroup.LayoutParams; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.module.extensions.R; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoTopViewStatusListener; diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt index 73f7e05863..7b582e44b0 100644 --- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt +++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt @@ -1,12 +1,9 @@ package com.zhidao.mogo.module.left.panel.presenter import android.os.Handler -import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.mvp.Presenter import com.mogo.map.IDestroyable import com.mogo.module.common.MogoApisHandler -import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths import com.mogo.utils.logger.Logger import com.zhidao.mogo.module.left.panel.LeftPanelConst.MODULE_NAME import com.zhidao.mogo.module.left.panel.fragment.SimpleSpeedFragment diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java index 59f7d5a63c..73f8cf5a29 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java @@ -3,7 +3,7 @@ package com.mogo.module.main; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.cardmanager.IMogoCardChangedListener; import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 3fc58dc051..464c277a39 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -11,7 +11,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.MainActivity; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java index a44091a55d..871dbc4767 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java @@ -9,7 +9,7 @@ import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoRegisterCenter; diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsManager.java index 2221ab5e3f..fd8305c22b 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsManager.java @@ -3,7 +3,7 @@ package com.mogo.module.main.utils; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.v2x.DisplayEffectsInterface; /** diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/windowview/MogoWindowManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/windowview/MogoWindowManager.java index cc87d1dbc5..4914249565 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/windowview/MogoWindowManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/windowview/MogoWindowManager.java @@ -5,7 +5,7 @@ import android.view.View; import android.widget.FrameLayout; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.windowview.IMogoWindowManager; /** diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java index 76970d36aa..c48ddf8126 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java @@ -3,8 +3,7 @@ package com.mogo.module.map; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.google.gson.internal.$Gson$Preconditions; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.map.IMogoMapFrameController; public diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle index 85ac0cdd0d..4fae4a7628 100644 --- a/modules/mogo-module-obu/build.gradle +++ b/modules/mogo-module-obu/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'com.alibaba.arouter' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'com.alibaba.arouter' +} android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -16,9 +18,9 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName()] + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) } } } @@ -46,6 +48,7 @@ dependencies { implementation rootProject.ext.dependencies.modulecommon } else { implementation project(':modules:mogo-module-common') + implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt index ff4743d73e..037be18fdd 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt @@ -9,7 +9,7 @@ import android.view.View import android.widget.Button import com.alibaba.android.arouter.launcher.ARouter import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.logger.Logger import com.zhidao.mogo.module.obu.obu.BaseObu import com.zhidao.mogo.module.obu.obu.IObuCallback @@ -44,7 +44,7 @@ class MockUtil:Handler.Callback { override fun handleMessage(msg: Message): Boolean { if (msg.what == 1001) { Logger.d(TAG,"准备添加调试view") - val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis + val api = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis api.windowManagerApi.addView(view, 800, 300, false) } return false diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt index 3338f6bddf..f66d01306d 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt @@ -3,10 +3,9 @@ package com.zhidao.mogo.module.obu.crashwarn import android.content.Context import android.content.Intent import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.obu.IMogoCrashWarnProvider import com.mogo.utils.logger.Logger -import com.zhidao.manager.constent.Common import com.zhidao.manager.power.ZDPowerManager import com.zhidao.manager.ts.TsSensorChannel import com.zhidao.manager.ts.TsThreshold diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle index 8b0a3e713c..b98b69977a 100644 --- a/modules/mogo-module-push/build.gradle +++ b/modules/mogo-module-push/build.gradle @@ -68,6 +68,8 @@ dependencies { implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') implementation project(':services:mogo-service-api') + + implementation project(':core:mogo-core-data') } } diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt index 817acd92a6..f5ba9821cf 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt @@ -5,7 +5,7 @@ package com.mogo.module.push.utils import android.util.ArrayMap import com.alibaba.android.arouter.launcher.ARouter import com.mogo.module.push.repository.PushRepository -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics object AnalyticsUtils { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt index c553825f6a..469916e914 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt @@ -4,7 +4,7 @@ import android.content.Context import android.view.View import com.alibaba.android.arouter.launcher.ARouter import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths /** * @author congtaowang @@ -16,7 +16,7 @@ private var apis: IMogoServiceApis? = null fun getApis(context: Context): IMogoServiceApis { if (apis == null) { - apis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis; + apis = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis; } return apis!! } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java index 5d675eede8..262bd86646 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java @@ -4,7 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoAddressManager; import com.mogo.service.module.IMogoSearchManager; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java index 5ac391975f..a91e7e6e72 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java @@ -5,7 +5,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.module.navi.constants.SearchApisHolder; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoSearchManager; /** diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSettingManager.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSettingManager.java index 89e2199d60..68e84c5b1f 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSettingManager.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSettingManager.java @@ -3,7 +3,7 @@ package com.mogo.module.navi.manager; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoSettingManager; /** diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java index 59be513933..8efc5280f6 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java @@ -7,25 +7,11 @@ import android.widget.EditText; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.map.search.inputtips.MogoTip; -import com.mogo.module.common.MogoModulePaths; + import com.mogo.module.navi.R; -import com.mogo.module.navi.bean.EntityConvertUtils; import com.mogo.module.navi.bean.SearchPoi; -import com.mogo.module.navi.ui.adapter.HistoryPoiAdapter; -import com.mogo.module.navi.ui.adapter.SearchPoiAdapter; import com.mogo.module.navi.ui.base.BaseFragment; import com.mogo.module.navi.ui.base.UiController; -import com.mogo.module.navi.ui.setting.NaviSettingFragment; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.fragmentmanager.FragmentDescriptor; -import com.mogo.service.fragmentmanager.IMogoFragmentManager; -import java.util.ArrayList; -import java.util.List; /** * 搜索页面 diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java index 95e4444621..5f70527e4a 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java @@ -21,7 +21,7 @@ import com.mogo.module.navi.bean.SearchPoi; import com.mogo.module.navi.constants.DataConstants; import com.mogo.module.navi.constants.SearchApisHolder; import com.mogo.module.navi.database.AppDataBase; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.map.IMogoMapService; import java.util.List; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java index 58d1a9110a..c26719d8c4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java @@ -3,8 +3,7 @@ package com.mogo.module.service.actionmanager; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.MogoOverlayManager; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.service.module.MogoAction; import com.mogo.service.module.IMogoActionListener; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/datamanager/MogoDataManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/datamanager/MogoDataManager.java index 8b3f7dd5c9..fe68d3980e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/datamanager/MogoDataManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/datamanager/MogoDataManager.java @@ -3,7 +3,7 @@ package com.mogo.module.service.datamanager; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.datamanager.IMogoDataChangedListener; import com.mogo.service.datamanager.IMogoDataManager; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java index 47044f9b9f..7044e4fc02 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java @@ -9,8 +9,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.module.common.drawer.MarkerDrawer; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.module.service.ServiceConst; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoMarkerService; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java index 595ff09af9..2cdd6091fa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java @@ -3,9 +3,8 @@ package com.mogo.module.service.network; import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.module.common.constants.HostConst; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java index 36402ac240..b2e118bd19 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java @@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java index 3d9f578eed..fe48fe43d9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java @@ -5,12 +5,8 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.commons.voice.VoiceIntentTrack; import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentManager; -import com.mogo.utils.logger.Logger; /** * @author congtaowang diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java index 505564565c..6dec87a023 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java @@ -4,8 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.module.service.MogoServices; -import com.mogo.module.service.location.MogoRTKLocation; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.strategy.IMogoRefreshStrategyController; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java index 963fd69866..ab5b54aaa0 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java @@ -3,16 +3,12 @@ package com.mogo.module.service.ttsConfig; import android.text.TextUtils; import android.util.Log; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; -import com.mogo.module.service.network.RefreshModel; import com.mogo.module.service.network.bean.TtsConfigEntity; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.network.RequestOptions; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 36f6a706b2..1f48431a4f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.module.common.MogoApisHandler; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java index ab2f7defd5..ce91b27108 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java @@ -14,7 +14,7 @@ import com.mogo.module.common.entity.RoadTrafficSegment; import com.mogo.module.common.entity.RoadTrafficStatus; import com.mogo.module.common.entity.UploadTrafficEntity; import com.mogo.module.share.net.TrafficModelData; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.utils.network.utils.GsonUtil; import java.util.ArrayList; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 664dfde8ad..8323d3a999 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -11,27 +11,24 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.map.location.MogoLocation; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; import com.mogo.module.common.constants.HostConst; -import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.dialog.BaseFloatDialog; import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.share.bean.FixableButton; import com.mogo.module.share.bean.ShareButtonConfigResponse; import com.mogo.module.share.bean.ShareConfigRequest; import com.mogo.module.share.bean.StepAfterAuth; -import com.mogo.module.share.constant.HttpConstant; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.dialog.GridFixableShareDialog; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.module.share.manager.UploadHelper; import com.mogo.module.share.net.ShareDevaApiService; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.TanluUploadParams; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index 9f2f99b2cb..101f1c675f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -12,7 +12,7 @@ import com.mogo.module.share.constant.S_TAG import com.mogo.module.share.strategyreceiver.AccidentStrategyReceiver import com.mogo.module.share.strategyreceiver.BlockStrategy import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.logger.Logger import com.mogo.utils.network.utils.GsonUtil import org.json.JSONObject diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java index de27299bef..34d7687c22 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java @@ -2,14 +2,12 @@ package com.mogo.module.share; import android.content.Context; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.module.common.MogoApisHandler; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TrafficUploadProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TrafficUploadProvider.kt index 35e0a91cb2..9eb353f33c 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TrafficUploadProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TrafficUploadProvider.kt @@ -6,7 +6,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.template.IProvider import com.mogo.module.share.manager.TrafficUploadManager.Companion.trafficUpload -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.share.IMogoTrafficUploadProvider @Route( path = MogoServicePaths.PATH_TRAFFIC_UPLOAD ) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 6c47af485f..08ff54d145 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -3,7 +3,6 @@ package com.mogo.module.share.dialog import android.content.Context import android.widget.FrameLayout import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.commons.debug.DebugConfig import com.mogo.module.common.dialog.BaseFloatDialog import com.mogo.module.common.utils.CarSeries import com.mogo.module.share.R @@ -14,7 +13,7 @@ import com.mogo.module.share.manager.SeekHelpManager import com.mogo.module.share.manager.SeekHelpManager.seekHelp import com.mogo.module.share.manager.UploadHelper import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics import com.mogo.service.share.IMogoTanluProvider import com.mogo.service.share.TanluUploadParams diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 1437b26665..2441da0796 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -15,7 +15,7 @@ import com.mogo.module.share.manager.ISeekHelpListener; import com.mogo.module.share.manager.SeekHelpManager; import com.mogo.module.share.manager.UploadHelper; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.share.IMogoTanluProvider; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt index 74c0ab300d..77465cde3d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/ServiceApisManager.kt @@ -3,7 +3,7 @@ package com.mogo.module.share.manager import android.content.Context import com.alibaba.android.arouter.launcher.ARouter import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths /** * 全局管理IMogoServiceApis diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java index 1be66eefec..b5b1b2573d 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java @@ -3,48 +3,21 @@ package com.mogo.module.share.net; import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; -import com.google.gson.Gson; import com.mogo.cloud.network.BaseData; import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback; import com.mogo.cloud.tanlu.api.MogoRoadSearchManager; import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.network.ParamsProvider; -import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.map.location.MogoLocation; -import com.mogo.map.search.geo.MogoPoiItem; -import com.mogo.map.search.poisearch.IMogoPoiSearch; -import com.mogo.map.search.poisearch.MogoPoiResult; -import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.module.common.constants.HostConst; import com.mogo.module.share.TanluServiceManager; -import com.mogo.module.share.bean.BaseDataCompat; -import com.mogo.module.share.bean.Location; -import com.mogo.module.share.bean.RoadInfoRequest; -import com.mogo.module.share.bean.RoadInfos; import com.mogo.module.share.bean.VoiceCmdData; import com.mogo.module.share.callback.RoadInfoCallback; import com.mogo.module.share.constant.HttpConstant; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.map.IMogoMapService; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.logger.Logger; -import com.mogo.utils.network.RequestOptions; -import com.mogo.utils.network.utils.GsonUtil; import java.util.ArrayList; -import java.util.Map; - -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.ObservableOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; - -import static com.mogo.module.share.constant.ShareConstants.TANLU_ROAD_CONGESTION_COMPAT; -import static com.mogo.module.share.constant.ShareConstants.TANLU_ROAD_CURRENT; -import static com.mogo.module.share.constant.ShareConstants.TYPE_NAME_BLOCK; /** diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java index 34bebdfed4..fca9278fc9 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java @@ -2,16 +2,12 @@ package com.mogo.module.share.net; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.module.common.constants.HostConst; -import com.mogo.module.common.entity.RoadTrafficStatus; import com.mogo.module.common.entity.UploadTrafficEntity; -import com.mogo.module.share.constant.HttpConstant; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 2c16ce0ab9..5f86fe8869 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -18,7 +18,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XStatusManager; import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager; import com.mogo.module.v2x.network.V2XRefreshModel; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cloud.socket.IMogoSocketManager; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 89e8fa951f..fbf5e8fd2c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -20,7 +20,7 @@ import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.module.v2x.listener.AdapterCallback; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.utils.DateTimeUtils; import java.util.ArrayList; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 96a6c99fd2..8154da3675 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -47,7 +47,7 @@ import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.module.common.view.NetworkLoadingView; import com.mogo.module.v2x.view.SurroundingMarginDecoration; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiServiceFactory.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiServiceFactory.java index 9d33972c9f..b7e3bcde6f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiServiceFactory.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiServiceFactory.java @@ -4,7 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.common.constants.HostConst; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java index e26c31e6f1..f07f3b5b4e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java @@ -1,7 +1,6 @@ package com.mogo.module.v2x.presenter; import android.content.Context; -import android.util.Log; import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; @@ -11,16 +10,14 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.mvp.Presenter; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.map.location.MogoLocation; -import com.mogo.module.common.constants.HostConst; import com.mogo.module.v2x.entity.panel.Center; import com.mogo.module.v2x.entity.panel.SurroundingRequest; import com.mogo.module.v2x.entity.panel.SurroundingResponse; import com.mogo.module.v2x.network.V2XApiServiceFactory; import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; diff --git a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 3c339eba5f..29b6cb025a 100644 --- a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -15,7 +15,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis -import com.mogo.service.MogoServicePaths +import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.utils.logger.Logger import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.cosupload.manager.CosUploadManagerImpl diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java deleted file mode 100644 index 67ab95c352..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ /dev/null @@ -1,398 +0,0 @@ -package com.mogo.service; - -import androidx.annotation.Keep; - -/** - * @author congtaowang - * @since 2019-12-23 - *

- * 对外服务模块路径 - *

- *

- * 使用方式： - *

- * Arouter.getInstance().path("").navigate() - */ -@Keep -public class MogoServicePaths { - - /** - * 地图服务接口ARouter实例化路径 - */ - @Keep - @Deprecated - public static final String PATH_SERVICES_MAP = "/mapservices/api"; - - /** - * 图片接口ARouter实例化路径 - */ - @Keep - @Deprecated - public static final String PATH_UTILS_IMAGE_LOADER = "/imageloader/api"; - - /** - * 埋点接口ARouter实例化路径 - */ - @Keep - @Deprecated - public static final String PATH_UTILS_ANALYTICS = "/utils/analytics"; - - - /** - * 网络服务接口路径 - */ - @Keep - @Deprecated - public static final String PATH_SERVICES_NETWORK = "/networkservices/api"; - - /** - * netty 长链 - */ - @Keep - @Deprecated - public static final String PATH_SOCKET_MANAGER = "/socket/manager"; - - /** - * WebSocket 长链 - */ - @Keep - @Deprecated - public static final String PATH_WEB_SOCKET_MANAGER = "/websocket/manager"; - - /** - * 状态管理接口 - */ - @Keep - @Deprecated - public static final String PATH_STATUS_MANAGER = "/statusmanager/api"; - - /** - * 消息中心 - */ - @Keep - @Deprecated - public static final String PATH_MSG_CENTER = "/msgcenter/api"; - - /** - * 消息中心 - */ - @Keep - @Deprecated - public static final String PATH_WINDOW_MANAGER = "/windowmanger/api"; - - /** - * 卡片控制 - */ - @Keep - @Deprecated - public static final String PATH_CARD_MANAGER = "/cardmanager/api"; - - /** - * 管理 fragment - */ - @Keep - @Deprecated - public static final String PATH_FRAGMENT_MANAGER = "/fragmentmanager/api"; - - /** - * 免唤醒语音控制 - * - * @deprecated use {@link #PATH_INTENT_MANAGER} instead. - */ - @Keep - @Deprecated - public static final String PATH_VOICE_MANAGER = "/voicemanager/api"; - - /** - * 意图控制接口 - */ - @Keep - @Deprecated - public static final String PATH_INTENT_MANAGER = "/intentmanager/api"; - - /** - * 基础功能监听回调注册 - */ - @Keep - @Deprecated - public static final String PATH_REGISTER_CENTER = "/registercenter/api"; - - /** - * 基础家和公司管理 - */ - @Keep - @Deprecated - public static final String PATH_ADDRESS_MANAGER = "/addressmanager/api"; - - /** - * 导航搜索模块管理 - */ - @Keep - @Deprecated - public static final String PATH_SEARCH_MANAGER = "/searchmanager/api"; - - /** - * 基础设置参数管理 - */ - @Keep - @Deprecated - public static final String PATH_SETTING_MANAGER = "/settingmanager/api"; - - - /** - * 搜索module管理中心 - */ - @Keep - @Deprecated - public static final String PATH_SERACH_CENTER = "/searchcenter/api"; - - /** - * 大而全数据管理中心 - */ - @Keep - @Deprecated - public static final String PATH_DATA_MANAGER = "/datamanager/api"; - - /** - * adas 控制 - */ - @Keep - @Deprecated - public static final String PATH_ADAS_CONTROLLER = "/adascontroller/api"; - - /** - * 接口集合 - */ - @Keep - @Deprecated - public static final String PATH_SERVICE_APIS = "/mogoservice/apis"; - - /** - * 动作指令 - */ - @Keep - @Deprecated - public static final String PATH_ACTION_APIS = "/mogoaction/api"; - - /** - * 刷新策略控制 - */ - @Keep - @Deprecated - public static final String PATH_REFRESH_STRATEGY_API = "/refreshstrategy/api"; - - /** - * 刷新策略控制 - */ - @Keep - @Deprecated - public static final String PATH_LAUNCHER_API = "/launcher/api"; - - /** - * 入口按钮 - */ - @Keep - @Deprecated - public static final String PATH_ENTRANCE_BUTTON_API = "/entrancebutton/api"; - - /** - * 顶部1/2屏管理 - */ - @Keep - @Deprecated - public static final String PATH_EXTENSIONS_TOP_VIEW_MANAGER = "/topview/api"; - - /** - * 浓雾等极端事件特殊效果 - */ - @Keep - @Deprecated - public static final String PATH_MAIN_DISPLAY_EFFECTS_MANAGER = "/displayeffects/api"; - - /** - * 其他模块调用公共的marker打点 - */ - @Keep - @Deprecated - public static final String PATH_MARKER_SERVICE = "/mogomarker/api"; - - /** - * 其他模块调用分享框 - */ - @Keep - @Deprecated - public static final String PATH_SHARE = "/extensions/share"; - - /** - * obu相关接口 - */ - @Keep - @Deprecated - public static final String PATH_OBU = "/obu/api"; - - /** - * 事件面板 - */ - @Keep - @Deprecated - public static final String PATH_EVENT_PANEL = "/event/panel"; - - /** - * 左侧面板 - */ - @Keep - @Deprecated - public static final String PATH_LEFT_PANEL = "/left/panel"; - - /** - * 比亚迪模块 - */ - @Keep - @Deprecated - public static final String PATH_SPLASH = "/splash/api"; - - /** - * 位置上报 - */ - @Keep - @Deprecated - public static final String PATH_LOCATION_INFO = "/locationinfo/api"; - - /** - * passport - */ - @Keep - @Deprecated - public static final String PATH_PASSPORT = "/passport/api"; - - /** - * 授权服务 - */ - @Keep - @Deprecated - public static final String PATH_AGREEMENT = "/agreement/showFragment"; - - /** - * 日志上传 - */ - @Keep - @Deprecated - public static final String PATH_MOGO_MONITOR = "/monitor/api"; - - /** - * 探路api - */ - @Keep - @Deprecated - public static final String PATH_TANLU_API = "/tanlulib/api"; - - /** - * 策略上报 - */ - @Keep - @Deprecated - public static final String PATH_STRATEGY_SHARE = "/share/strategy"; - - /** - * 分享模块中，交通状况服务上报 - */ - @Keep - @Deprecated - public static final String PATH_TRAFFIC_UPLOAD = "/share/traffic"; - - /** - * 高德地图巡航上报 - */ - @Keep - @Deprecated - public static final String PATH_GAODE_AIMLESS_SHARE = "/share/gaodeAimless"; - - /** - * 探路ui - */ - @Keep - @Deprecated - public static final String PATH_TANLU_UI_API = "/tanlu/ui"; - - /** - * 碰撞报警模块 已碰撞 - */ - @Keep - @Deprecated - public static final String PATH_CRASH_WARNING = "/crash/warning"; - - /** - * 悬浮小控件 - */ - @Keep - @Deprecated - public static final String PATH_WIDGETS = "/widgets/provider"; - - /** - * 在线好友面板 - */ - @Keep - @Deprecated - public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel"; - - /** - * 全局免唤醒 - */ - @Keep - @Deprecated - public static final String PATH_GLOBAL_UNWAKE = "/global/unwake"; - - /** - * 返回悬浮按钮 - */ - @Keep - @Deprecated - public static final String PATH_BACK = "/back2launcher/ui"; - - /** - * 自研地图和高德地图切换 - */ - @Keep - @Deprecated - public static final String PATH_MAP_FRAME_CONTROLLER = "/mapframe/controller"; - - /** - * 小地图控件 - */ - @Keep - @Deprecated - public static final String PATH_SMALL_MAP = "/small_map/api"; - - /** - * ADAS 模块 - */ - @Keep - @Deprecated - public static final String PATH_ADAS = "/adas/api"; - - /** - * 车辆检测 模块 - */ - public static final String PATH_CHECK = "/check/api"; - - /** - * 前方碰撞预警 未碰撞 - */ - @Keep - @Deprecated - public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning"; - - /** - * warning 模块 - */ - @Keep - @Deprecated - public static final String PATH_V2X_WARNING = "/warning/api"; - - /** - * obu-mogo 模块 - */ - @Keep - @Deprecated - public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api"; -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index 47461b4243..9f9533bb56 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -7,7 +7,7 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.auth.IMogoAuthManager; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 9ec3a49000..b905bcbd49 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -19,7 +19,7 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasProvider; import com.mogo.module.adas.IAdasDataListener; import com.mogo.module.adas.IAdasStatusListener; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.adas.IMogoAdasCarDataCallback; import com.mogo.service.adas.IMogoAdasDataCallback; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/analytics/MogoAnalytics.java b/services/mogo-service/src/main/java/com/mogo/service/impl/analytics/MogoAnalytics.java index 8aa87b2cd2..faf8dcb35e 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/analytics/MogoAnalytics.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/analytics/MogoAnalytics.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.analytics; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.impl.analytics.impl.MogoAnalyticsImpl; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java index 62a8804e86..3c3470143f 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java @@ -4,7 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.map.location.MogoLocation; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.utils.logger.Logger; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java index a41144f2b4..a82fbf1a67 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.cloud.passport; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.cloud.passport.IMogoPassportManager; import com.mogo.service.cloud.passport.IMogoTicketCallback; import com.mogo.utils.logger.Logger; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java index 08681a0174..af59235297 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java @@ -4,7 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.cloud.socket.entity.MsgBody; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoMsgAckListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java index e2e8e181bf..820c3d2519 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoWebSocketManager.java @@ -9,7 +9,7 @@ import com.mogo.utils.logger.Logger; import java.lang.reflect.Method; -import static com.mogo.service.MogoServicePaths.PATH_WEB_SOCKET_MANAGER; +import static com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_WEB_SOCKET_MANAGER; @Route(path = PATH_WEB_SOCKET_MANAGER) public class MogoWebSocketManager implements IMogoWebSocketManager { diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java index 79f8abe749..087d75ab24 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java @@ -5,7 +5,7 @@ import android.content.Context; import androidx.appcompat.app.AppCompatActivity; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.fragmentmanager.FragmentDescriptor; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/MogoImageLoader.java b/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/MogoImageLoader.java index 8d2b505648..b5f635985e 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/MogoImageLoader.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/MogoImageLoader.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.imageloader; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/glide/GlideImageLoader.java b/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/glide/GlideImageLoader.java index 5456125337..9f0b84b503 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/glide/GlideImageLoader.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/imageloader/glide/GlideImageLoader.java @@ -7,21 +7,9 @@ import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.alibaba.android.arouter.facade.annotation.Route; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.Transformation; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.load.engine.Resource; -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter; -import com.bumptech.glide.load.resource.bitmap.BitmapResource; -import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.target.ImageViewTarget; import com.bumptech.glide.request.target.SimpleTarget; -import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.service.MogoServicePaths; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; @@ -30,10 +18,6 @@ import com.mogo.service.impl.imageloader.glide.transform.GlideCircleBitmapTransf import com.mogo.service.impl.imageloader.glide.transform.GlideRoundBitmapTransform; import com.mogo.service.impl.imageloader.glide.utils.DiskLruCacheManager; import com.mogo.utils.glide.GlideApp; -import com.mogo.utils.logger.Logger; - -import java.io.File; -import java.sql.ClientInfoStatus; /** * @author congtaowang diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/MogoIntentManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/MogoIntentManager.java index 82ea7af719..4893f9db93 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/MogoIntentManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/MogoIntentManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java index b3aeb3065a..72fde0dede 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java @@ -34,7 +34,7 @@ import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.map.IMogoMapService; /** diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java index eda4617702..029fdb0189 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.network; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.network.RetrofitFactory; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoMsgCenter.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoMsgCenter.java index 00ae826b99..b452794396 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoMsgCenter.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoMsgCenter.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.statusmanager; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoMsgCenterListener; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index bfccf24afb..cb6b212d10 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -2,10 +2,9 @@ package com.mogo.service.impl.statusmanager; import android.content.Context; -import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.IMogoStickyStatusChangedListener; @@ -13,7 +12,6 @@ import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java index fd8c0e2352..4858bbd9cb 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/v2x/V2XManager.java @@ -4,7 +4,7 @@ import android.content.Context; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.service.MogoServicePaths; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.v2x.IV2XWarningListener; import com.mogo.service.v2x.IV2XProvider; import com.mogo.service.v2x.IV2XWindowManagerListener; From 0234323835f80ceb9861384767ec8c227f5b9357 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 14:54:08 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[add]=20=E8=89=B2=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/check_dialog_back.xml | 2 +- .../res/drawable/check_item_left_shape.xml | 2 +- .../res/drawable/check_item_right_shape.xml | 2 +- .../drawable/check_item_top_bottom_shape.xml | 18 ++++++++++++++++++ .../main/res/layout/check_info_title_item.xml | 4 ++-- 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml index b6a2eaefba..a13abbb080 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml index 6f9ebf6133..a92f70693f 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml @@ -7,7 +7,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml index 0fb8e28c84..8d68831820 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml @@ -6,7 +6,7 @@ diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml new file mode 100644 index 0000000000..f1548c7a8e --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index fe59c709b5..f4ed1df13a 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -25,7 +25,7 @@ android:id="@+id/title_two" android:layout_width="0px" android:layout_height="match_parent" - android:background="@drawable/check_item_left_shape" + android:background="@drawable/check_item_top_bottom_shape" android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="运行状态" @@ -40,7 +40,7 @@ android:id="@+id/title_thr" android:layout_width="0px" android:layout_height="match_parent" - android:background="@drawable/check_item_left_shape" + android:background="@drawable/check_item_top_bottom_shape" android:paddingLeft="@dimen/dp_40" android:paddingTop="@dimen/dp_32" android:text="模块名称" From ef0c6da1d8ec1d3c756a0c2f222fca76a6e18899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 15:01:01 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=A7=84=E8=8C=83=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../mogo/och/bus/presenter/OchBusPresenter.java | 12 ++++++------ .../java/com/mogo/och/taxi/MogoOCHTaxiModel.java | 12 ++++++------ .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 4 ++-- .../main/java/com/mogo/och/BaseOchFragment.java | 8 ++++---- .../function/autopilot/MoGoAutoPilotProvider.kt | 12 ++++++++---- .../function/hmi/ui/setting/DebugSettingView.kt | 4 ++-- .../hmi/ui/widget/AutoPilotStatusView.kt | 16 +++++++--------- ...er.java => AutoPilotControlCmdParameter.java} | 6 +++--- ...ters.java => AutoPilotControlParameters.java} | 2 +- ...dasOCHData.java => AutoPilotStationInfo.java} | 4 ++-- .../api/autopilot/IMoGoAutoPilotProvider.java | 4 ++-- .../autopilot/IMoGoAutoPilotStatusListener.java | 4 ++-- .../CallerAutoPilotStatusListenerManager.kt | 10 +++++----- .../autopilot/AutoPilotRemoteController.java | 10 +++++----- .../dispatch/DispatchAutoPilotManager.java | 16 ++++++++-------- .../module/service/intent/MockIntentHandler.java | 8 ++++---- .../mogo/service/adas/IMogoADASController.java | 4 ++-- .../mogo/service/adas/IMogoAdasOCHCallback.java | 4 ++-- .../service/impl/adas/MogoADASController.java | 16 ++++++++-------- 19 files changed, 79 insertions(+), 77 deletions(-) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{AdasControlCommandParameter.java => AutoPilotControlCmdParameter.java} (63%) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{RemoteControlAutoPilotParameters.java => AutoPilotControlParameters.java} (96%) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/{AdasOCHData.java => AutoPilotStationInfo.java} (75%) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java index 1f343a7c16..893d4e46eb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java @@ -30,8 +30,8 @@ import com.mogo.och.bus.bean.UpdateSiteStatusRequest; import com.mogo.och.bus.fragment.OchBusFragment; import com.mogo.och.bus.net.IOchBusApiService; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; -import com.mogo.eagle.core.data.autopilot.AdasOCHData; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; @@ -307,10 +307,10 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog currentStation.setIsCurrentSite( STATION_STATUS_LEAVING ); nextStation.setIsCurrentSite( STATION_STATUS_ARRIVING ); - RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters(); + AutoPilotControlParameters currentAutopilot = new AutoPilotControlParameters(); currentAutopilot.isSpeakVoice = !isRestart; - currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); - currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); + currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); + currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); currentAutopilot.vehicleType = VEHICLE_TYPE; Logger.d( TAG, "开启自动驾驶====" + currentAutopilot ); MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( currentAutopilot ); @@ -354,7 +354,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } @Override - public void onArriveAt( AdasOCHData data ) { + public void onArriveAt( AutoPilotStationInfo data ) { if ( currentStationIndex >= stationList.size() - 1 ) { Logger.e( TAG, "到站异常，取消后续操作" ); return; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 1ea5b41f81..7dec1a8d80 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -15,8 +15,8 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; import com.mogo.och.taxi.ui.OCHTaxiUiController; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; -import com.mogo.eagle.core.data.autopilot.AdasOCHData; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.intent.IMogoIntentListener; @@ -714,7 +714,7 @@ class MogoOCHTaxiModel { */ private class OCHArriveNotifyCallback implements IMogoAdasOCHCallback { @Override - public void onArriveAt( AdasOCHData data ) { + public void onArriveAt( AutoPilotStationInfo data ) { if ( data == null ) { return; } @@ -853,10 +853,10 @@ class MogoOCHTaxiModel { return; } - RemoteControlAutoPilotParameters parameters = new RemoteControlAutoPilotParameters(); + AutoPilotControlParameters parameters = new AutoPilotControlParameters(); parameters.vehicleType = mCurrentOCHOrder.orderType; - parameters.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon ); - parameters.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon ); + parameters.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon ); + parameters.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon ); MogoApisHandler.getInstance() .getApis() .getAdasControllerApi() diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index fd4530d610..5c505e764e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -26,7 +26,7 @@ import com.mogo.och.taxi.R; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; import com.mogo.service.adas.IMogoAdasRouteCallBack; -import com.mogo.eagle.core.data.autopilot.AdasOCHData; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; @@ -524,7 +524,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } @Override - public void onArriveAt(AdasOCHData data) { + public void onArriveAt(AutoPilotStationInfo data) { Logger.d( TAG, "行程结束"); MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot(); } diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java index 887ffdbf1e..e5d83b8f00 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java @@ -17,7 +17,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.utils.logger.Logger; /** @@ -135,12 +135,12 @@ public abstract class BaseOchFragment> e findViewById(R.id.btnAutopilotControl).setOnClickListener(view -> { // Logger.d("lianglihui","模拟 站点下发工控"); - RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters(); + AutoPilotControlParameters currentAutopilot = new AutoPilotControlParameters(); currentAutopilot.isSpeakVoice = true; // 万集东门站 - currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409); + currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409); // 市政府前街18号 - currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.1939540844,116.720067); + currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.1939540844,116.720067); // 订单运营类型 （9出租车，10小巴） currentAutopilot.vehicleType = 10; Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot); diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt index ce6b3cba2a..9512c9746d 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt @@ -2,8 +2,8 @@ package com.mogo.eagle.core.function.autopilot import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.eagle.core.data.autopilot.AdasControlCommandParameter -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters +import com.mogo.eagle.core.data.autopilot.AutoPilotControlCmdParameter +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotProvider import com.mogo.eagle.core.utilcode.util.GsonUtils @@ -18,9 +18,13 @@ import com.zhidao.support.adas.high.AdasManager class MoGoAutoPilotProvider : IMoGoAutoPilotProvider { override fun init(context: Context) {} override fun connectAutoPilot() {} - override fun startAutoPilot(result: RemoteControlAutoPilotParameters) { + override fun startAutoPilot(result: AutoPilotControlParameters) { if (AdasManager.getInstance().isSocketConnect) { - val parameter = AdasControlCommandParameter(TAG, result) + val parameter = + AutoPilotControlCmdParameter( + TAG, + result + ) AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter)) } else { LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 218f2a1d49..0440c6ba07 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.app.AppConfigInfo -import com.mogo.eagle.core.data.autopilot.AdasOCHData +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.obu.ObuStatusInfo @@ -100,7 +100,7 @@ class DebugSettingView @JvmOverloads constructor( /** * 自动驾驶相关回调 */ - override fun onAutoPilotArriveAtStation(data: AdasOCHData?) { + override fun onAutoPilotArriveAtStation(data: AutoPilotStationInfo?) { } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index b4e2be73a1..4853d3a8df 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -5,17 +5,14 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.autopilot.AdasOCHData -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.LogUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.module.common.MogoApisHandler import com.mogo.service.adas.IMogoAdasOCHCallback -import com.mogo.utils.logger.Logger import kotlinx.android.synthetic.main.view_autopilot_status.view.* -import java.util.* /** * @author xiaoyuzhou @@ -70,10 +67,11 @@ class AutoPilotStatusView @JvmOverloads constructor( // startAutoPilot(); } private fun startAutoPilot() { - val currentAutopilot = RemoteControlAutoPilotParameters() + val currentAutopilot = + AutoPilotControlParameters() currentAutopilot.isSpeakVoice = false - currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409); - currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687); + currentAutopilot.startLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409); + currentAutopilot.endLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199730,116.735687); currentAutopilot.vehicleType = 10 MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot) } @@ -105,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor( } } - override fun onArriveAt(data: AdasOCHData?) { + override fun onArriveAt(data: AutoPilotStationInfo?) { } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasControlCommandParameter.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java similarity index 63% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasControlCommandParameter.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java index 66bcbd48fd..b4aa311b19 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasControlCommandParameter.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java @@ -5,14 +5,14 @@ public * @author congtaowang * @since 2020/10/22 * - * 描述 + * 域控制器 控制指令发送 */ -class AdasControlCommandParameter { +class AutoPilotControlCmdParameter { public String action; public Object result; - public AdasControlCommandParameter( String action, Object result ) { + public AutoPilotControlCmdParameter(String action, Object result ) { this.action = action; this.result = result; } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/RemoteControlAutoPilotParameters.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java similarity index 96% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/RemoteControlAutoPilotParameters.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java index 42dbb6571f..a1dcbe815e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/RemoteControlAutoPilotParameters.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java @@ -8,7 +8,7 @@ import java.util.List; *

* 启动自动驾驶参数 */ -public class RemoteControlAutoPilotParameters { +public class AutoPilotControlParameters { public AutoPilotLonLat startLatLon; public List wayLatLons; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasOCHData.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java similarity index 75% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasOCHData.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java index 248be4cbf7..375f0ba3f9 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasOCHData.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java @@ -7,13 +7,13 @@ public * * 自动驾驶网约车回调数据 */ -class AdasOCHData { +class AutoPilotStationInfo { public int type; public double lon; public double lat; - public AdasOCHData( int type, double lon, double lat ) { + public AutoPilotStationInfo(int type, double lon, double lat ) { this.type = type; this.lon = lon; this.lat = lat; diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java index 9bb7675f73..1a9add5ba3 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.api.autopilot; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; /** @@ -20,7 +20,7 @@ public interface IMoGoAutoPilotProvider extends IMoGoFunctionServerProvider { * * @param result */ - void startAutoPilot(RemoteControlAutoPilotParameters result); + void startAutoPilot(AutoPilotControlParameters result); /** * 结束自动驾驶 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java index 0f9867840f..06aa35de13 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.api.autopilot; -import com.mogo.eagle.core.data.autopilot.AdasOCHData; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo; /** @@ -29,7 +29,7 @@ public interface IMoGoAutoPilotStatusListener { * * @param data 所到车站的简单信息 */ - void onAutoPilotArriveAtStation(AdasOCHData data); + void onAutoPilotArriveAtStation(AutoPilotStationInfo data); /** * 自动驾驶状态发生改变 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 543a7c8c02..88161e8e00 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.call.autopilot import androidx.annotation.Nullable -import com.mogo.eagle.core.data.autopilot.AdasOCHData +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener @@ -97,15 +97,15 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { /** * 自动驾驶网约车回调数据 回调 - * @param adasOCHData 自动驾驶网约车回调数据 + * @param autoPilotStationInfo 自动驾驶网约车回调数据 */ - fun invokeArriveAtStationListener(adasOCHData: AdasOCHData) { - LogUtils.dTag(TAG, "$adasOCHData") + fun invokeArriveAtStationListener(autoPilotStationInfo: AutoPilotStationInfo) { + LogUtils.dTag(TAG, "$autoPilotStationInfo") mAutoPilotStatusListeners.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutoPilotArriveAtStation(adasOCHData) + listener.onAutoPilotArriveAtStation(autoPilotStationInfo) } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java index b47d2c7884..1ad2fd1597 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java @@ -2,7 +2,7 @@ package com.mogo.module.service.autopilot; import com.mogo.commons.AbsMogoApplication; import com.mogo.module.common.MogoApisHandler; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.mogo.utils.logger.Logger; @@ -23,14 +23,14 @@ class AutoPilotRemoteController { private IMogoSocketManager mMogoSocketManager; - private IMogoOnMessageListener< RemoteControlAutoPilotParameters > mParametersListener = new IMogoOnMessageListener< RemoteControlAutoPilotParameters >() { + private IMogoOnMessageListener mParametersListener = new IMogoOnMessageListener() { @Override - public Class< RemoteControlAutoPilotParameters > target() { - return RemoteControlAutoPilotParameters.class; + public Class target() { + return AutoPilotControlParameters.class; } @Override - public void onMsgReceived( RemoteControlAutoPilotParameters obj ) { + public void onMsgReceived( AutoPilotControlParameters obj ) { if ( obj == null ) { Logger.e( TAG, "远端控制参数为null", new NullPointerException() ); return; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java index f161bfe54a..084de993db 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java @@ -10,8 +10,8 @@ import android.os.Handler; import android.os.Message; import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.eagle.core.data.autopilot.AdasOCHData; -import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters; +import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo; +import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener; import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager; @@ -137,17 +137,17 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener wayLatLon = new ArrayList<>(); + List wayLatLon = new ArrayList<>(); if (receiverBean!=null && receiverBean.getStopsList()!= null){ for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) { - wayLatLon.add(new RemoteControlAutoPilotParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); + wayLatLon.add(new AutoPilotControlParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon)); } } currentAutopilot.wayLatLons = wayLatLon; - currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); - currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); + currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon()); + currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon()); currentAutopilot.vehicleType = 10; Logger.d(TAG, "开启自动驾驶====" + currentAutopilot); mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot); @@ -191,7 +191,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener Date: Wed, 13 Oct 2021 16:14:42 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.1-vr-1.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3c055bd598..1b4a749def 100644 --- a/gradle.properties +++ b/gradle.properties @@ -166,7 +166,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46 # 定位服务 MOGO_LOCATION_VERSION=1.1.46 # 自研地图 -MAP_SDK_VERSION=1.0.1-vr-1.1.2 +MAP_SDK_VERSION=1.0.1-vr-1.1.3 #################架构升级新的版本号 MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 From 5368aec141da805103774c7ab39c55f3c3920d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 13 Oct 2021 11:13:36 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86=E4=BB=A5?= =?UTF-8?q?=E5=8F=8ASN=EF=BC=8CToken=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 5 ++++- .../main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt | 4 +++- foudations/mogo-commons/src/main/AndroidManifest.xml | 5 ++++- .../src/main/java/com/mogo/commons/network/Utils.java | 3 ++- foudations/mogo-utils/src/main/AndroidManifest.xml | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 0440c6ba07..ea791a701e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.map.MogoMap @@ -67,7 +68,9 @@ class DebugSettingView @JvmOverloads constructor( appConfigInfo.appVersionCode = AppUtils.getAppVersionCode() appConfigInfo.appVersionName = AppUtils.getAppVersionName() appConfigInfo.appPackageName = AppUtils.getAppPackageName() - appConfigInfo.devicesSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + appConfigInfo.uniqueDeviceId = DeviceUtils.getUniqueDeviceId() + appConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + appConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion // 将数据绘制 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index ea5d82f0f2..1a70a97423 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt @@ -12,7 +12,9 @@ class AppConfigInfo { var appVersionCode = 0 var appVersionName: String? = null var appPackageName: String? = null - var devicesSN: String? = null + var uniqueDeviceId: String? = null + var mogoToken: String? = null + var mogoSN: String? = null /*依赖的SDK版本信息*/ var mapVersion: String? = null diff --git a/foudations/mogo-commons/src/main/AndroidManifest.xml b/foudations/mogo-commons/src/main/AndroidManifest.xml index ddb5e04218..b4d9c66476 100644 --- a/foudations/mogo-commons/src/main/AndroidManifest.xml +++ b/foudations/mogo-commons/src/main/AndroidManifest.xml @@ -1,2 +1,5 @@ + package="com.mogo.commons" > + + + diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java index 42fc7b5c52..436f3c192d 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java @@ -11,6 +11,7 @@ import android.telephony.gsm.GsmCellLocation; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.utilcode.util.DeviceUtils; import com.mogo.utils.DeviceIdUtils; import java.lang.reflect.InvocationTargetException; @@ -66,7 +67,7 @@ public class Utils { public static String getDevicesId() { if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { - return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()); + return DeviceUtils.getUniqueDeviceId(); } return getSystemProperties( GSM_SERIAL ); } diff --git a/foudations/mogo-utils/src/main/AndroidManifest.xml b/foudations/mogo-utils/src/main/AndroidManifest.xml index 900eeecdf7..9febd3d8f7 100644 --- a/foudations/mogo-utils/src/main/AndroidManifest.xml +++ b/foudations/mogo-utils/src/main/AndroidManifest.xml @@ -2,4 +2,5 @@ package="com.mogo.utils" > + From a32c4eaa2e0bd9f2b462f302f40a722ebc1850b0 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 13 Oct 2021 16:45:50 +0800 Subject: [PATCH 12/13] =?UTF-8?q?[add]=20=E6=A3=80=E6=B5=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=88=97=E8=A1=A8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/check_item_right_shape.xml | 18 ------------------ ...shape.xml => check_top_item_left_shape.xml} | 6 +++--- .../drawable/check_top_item_no_line_shape.xml | 13 +++++++++++++ .../main/res/drawable/check_top_item_shape.xml | 11 +++++++++++ .../main/res/layout/check_info_title_item.xml | 9 +++++---- 5 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml rename core/function-impl/mogo-core-function-check/src/main/res/drawable/{check_item_top_bottom_shape.xml => check_top_item_left_shape.xml} (80%) create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml create mode 100644 core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml deleted file mode 100644 index 8d68831820..0000000000 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml similarity index 80% rename from core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml rename to core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml index f1548c7a8e..3ec31635a6 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_top_bottom_shape.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml @@ -6,10 +6,10 @@ + android:top="0px" + android:bottom="0px"> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml new file mode 100644 index 0000000000..3607a98983 --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml new file mode 100644 index 0000000000..ec7b08a577 --- /dev/null +++ b/core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml index f4ed1df13a..8afee5f391 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml @@ -3,13 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/check_width" android:layout_height="@dimen/dp_127" + android:background="@drawable/check_top_item_shape" android:orientation="horizontal"> Date: Wed, 13 Oct 2021 17:40:07 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsn=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/misc.xml | 3 +- .../hmi/ui/setting/DebugSettingView.kt | 5 +- .../function/smp/SmallMapDirectionView.java | 23 ++++---- .../eagle/core/utilcode/util/DeviceUtils.java | 17 +++--- .../java/com/mogo/commons/network/Utils.java | 58 ++++++++----------- .../java/com/mogo/utils/DeviceIdUtils.java | 30 ++++------ .../mogo/map/impl/custom/AMapViewWrapper.java | 38 ++++++------ .../extensions/entrance/EntranceFragment.java | 13 ----- .../res/layout/module_ext_layout_entrance.xml | 21 ------- 9 files changed, 80 insertions(+), 128 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index e73cf5868e..1b3cdd5e62 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -20,7 +20,8 @@ - + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index ea791a701e..e2303c182e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -5,6 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.cloud.passport.MoGoAiCloudClient +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo @@ -17,10 +18,10 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.AppUtils -import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.map.MogoMap +import com.mogo.utils.DeviceIdUtils import com.mogo.utils.network.utils.GsonUtil import com.mogo.utils.storage.SharedPrefsMgr import kotlinx.android.synthetic.main.view_debug_setting.view.* @@ -68,7 +69,7 @@ class DebugSettingView @JvmOverloads constructor( appConfigInfo.appVersionCode = AppUtils.getAppVersionCode() appConfigInfo.appVersionName = AppUtils.getAppVersionName() appConfigInfo.appPackageName = AppUtils.getAppPackageName() - appConfigInfo.uniqueDeviceId = DeviceUtils.getUniqueDeviceId() + appConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()) appConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn appConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 0148140f80..23abc75d82 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -98,18 +98,17 @@ public class SmallMapDirectionView SmpServiceManager.getMogoRegisterCenter() .registerCarLocationChangedListener(MODULE_NAME, this); - setOnClickListener(view -> { - if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) { - MogoApisHandler.getInstance().getApis() - .getMapServiceApi() - .getMapUIController() - .changeMapMode( - MogoApisHandler.getInstance() - .getApis() - .getAdasControllerApi() - .getCurrentSkinMode() - ); - } + setOnLongClickListener(view -> { + MogoApisHandler.getInstance().getApis() + .getMapServiceApi() + .getMapUIController() + .changeMapMode( + MogoApisHandler.getInstance() + .getApis() + .getAdasControllerApi() + .getCurrentSkinMode() + ); + return false; }); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index aa03c0c3de..6b158612c0 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -1,5 +1,10 @@ package com.mogo.eagle.core.utilcode.util; +import static android.Manifest.permission.ACCESS_WIFI_STATE; +import static android.Manifest.permission.CHANGE_WIFI_STATE; +import static android.Manifest.permission.INTERNET; +import static android.content.Context.WIFI_SERVICE; + import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; @@ -23,11 +28,6 @@ import java.net.SocketException; import java.util.Enumeration; import java.util.UUID; -import static android.Manifest.permission.ACCESS_WIFI_STATE; -import static android.Manifest.permission.CHANGE_WIFI_STATE; -import static android.Manifest.permission.INTERNET; -import static android.content.Context.WIFI_SERVICE; - /** * 

  *     author: Blankj
@@ -403,7 +403,7 @@ public final class DeviceUtils {
     }
 
 
-    private static final    String KEY_UDID = "KEY_UDID";
+    private static final String KEY_UDID = "KEY_UDID";
     private volatile static String udid;
 
     /**
@@ -479,8 +479,9 @@ public final class DeviceUtils {
             if (!TextUtils.isEmpty(androidId)) {
                 return saveUdid(prefix + 2, androidId);
             }
-
-        } catch (Exception ignore) {/**/}
+        } catch (Exception ignore) {
+            ignore.printStackTrace();
+        }
         return saveUdid(prefix + 9, "");
     }
 
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index 436f3c192d..6b2ce7484b 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -8,10 +8,8 @@ import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
 
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 import com.mogo.utils.DeviceIdUtils;
 
 import java.lang.reflect.InvocationTargetException;
@@ -23,36 +21,36 @@ import java.lang.reflect.Method;
 
 public class Utils {
 
-    public static String getCellId( Context context ) {
-        TelephonyManager tm = ( TelephonyManager ) context.getSystemService( Context.TELEPHONY_SERVICE );
-        if ( tm == null ) {
+    public static String getCellId(Context context) {
+        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        if (tm == null) {
             return "";
         }
 
         PackageManager pm = context.getPackageManager();
-        boolean accessCoarseLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
-                pm.checkPermission( Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName() ) );
-        boolean accessFineLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
-                pm.checkPermission( Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName() ) );
-        if ( !accessCoarseLocationPermission || !accessFineLocationPermission )
+        boolean accessCoarseLocationPermission = (PackageManager.PERMISSION_GRANTED ==
+                pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName()));
+        boolean accessFineLocationPermission = (PackageManager.PERMISSION_GRANTED ==
+                pm.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName()));
+        if (!accessCoarseLocationPermission || !accessFineLocationPermission)
             return "noPermission";
 
         CellLocation location = null;
         try {
             location = tm.getCellLocation();
-        } catch ( Exception e ) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        if ( location != null ) {
+        if (location != null) {
             // Gsm网络 , 联通移动的网络属于这一套
-            if ( location instanceof GsmCellLocation ) {
-                GsmCellLocation gsmLoc = ( GsmCellLocation ) location;
+            if (location instanceof GsmCellLocation) {
+                GsmCellLocation gsmLoc = (GsmCellLocation) location;
                 int cellid = gsmLoc.getCid();
-                return String.valueOf( cellid );
+                return String.valueOf(cellid);
                 // Cdma网络 , 电信网络属于这一种
-            } else if ( location instanceof CdmaCellLocation ) {
-                CdmaCellLocation cdmaLoc = ( CdmaCellLocation ) location;
-                return String.valueOf( cdmaLoc.getBaseStationId() );
+            } else if (location instanceof CdmaCellLocation) {
+                CdmaCellLocation cdmaLoc = (CdmaCellLocation) location;
+                return String.valueOf(cdmaLoc.getBaseStationId());
             }
         }
         return "";
@@ -66,31 +64,25 @@ public class Utils {
     public static final String PROPERTIES = "android.os.SystemProperties";
 
     public static String getDevicesId() {
-        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
-            return DeviceUtils.getUniqueDeviceId();
+        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
+            return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
         }
-        return getSystemProperties( GSM_SERIAL );
+        return getSystemProperties(GSM_SERIAL);
     }
 
     public static String getFotaVersion() {
-        return getSystemProperties( FOTA_VERSION );
+        return getSystemProperties(FOTA_VERSION);
     }
 
-    public static String getSystemProperties( String name ) {
+    public static String getSystemProperties(String name) {
         String value = "";
 
         try {
-            Class< ? > c = Class.forName( PROPERTIES );
-            Method get = c.getMethod( GET, String.class );
-            value = ( String ) get.invoke( c, name );
-        } catch ( ClassNotFoundException var3 ) {
+            Class c = Class.forName(PROPERTIES);
+            Method get = c.getMethod(GET, String.class);
+            value = (String) get.invoke(c, name);
+        } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException var3) {
             var3.printStackTrace();
-        } catch ( NoSuchMethodException var4 ) {
-            var4.printStackTrace();
-        } catch ( InvocationTargetException var5 ) {
-            var5.printStackTrace();
-        } catch ( IllegalAccessException var6 ) {
-            var6.printStackTrace();
         }
         return value;
     }
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
index 3e561c9530..efc85b2653 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
@@ -36,33 +36,25 @@ public final class DeviceIdUtils {
 
         if ( TextUtils.isEmpty( deviceId )) {
             deviceId = getDeviceIdInternal(appContext);
-            if (!TextUtils.isEmpty(deviceId)) {
-               saveDeviceId(appContext,deviceId);
-            } else {
-                if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
-                    if ( ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE ) == PackageManager.PERMISSION_GRANTED ) {
-                        deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
+            if (TextUtils.isEmpty(deviceId)) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+                        deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
                     }
-                }else{
-                    deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
-                }
-                if (!TextUtils.isEmpty(deviceId)) {
-                    saveDeviceId(appContext,deviceId);
                 } else {
+                    deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
+                }
+                if (TextUtils.isEmpty(deviceId)) {
                     deviceId = getDeviceSerial();
-                    if (!TextUtils.isEmpty(deviceId) && !deviceId.equalsIgnoreCase("unknown")) {
-                        saveDeviceId(appContext,deviceId);
-                    } else {
+                    if (TextUtils.isEmpty(deviceId) || deviceId.equalsIgnoreCase("unknown")) {
                         deviceId = getAndroidId(appContext);
-                        if (!TextUtils.isEmpty(deviceId)) {
-                            saveDeviceId(appContext,deviceId);
-                        } else {
-                            deviceId = String.valueOf( System.currentTimeMillis());
-                            saveDeviceId(appContext,deviceId);
+                        if (TextUtils.isEmpty(deviceId)) {
+                            deviceId = String.valueOf(System.currentTimeMillis());
                         }
                     }
                 }
             }
+            saveDeviceId(appContext,deviceId);
         }
 
         return deviceId;
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 1949915969..8525b36650 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -23,9 +23,9 @@ import android.widget.TextView;
 import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoMapView;
-import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.custom.location.GpsTester;
 import com.mogo.map.impl.custom.navi.NaviClient;
 import com.mogo.map.impl.custom.utils.MogoMapUtils;
@@ -351,28 +351,28 @@ public class AMapViewWrapper implements IMogoMapView,
         Logger.d(TAG, "设置的样式 = %s", ui);
         if (checkAMapView()) {
             switch (ui) {
-                //                case CarUp_2D:
-                //                case CarUp_3D:
-                //                case NorthUP_2D:
-                //                    setUIMode(ui);
-                //                    break;
+                case CarUp_2D:
+                case CarUp_3D:
+                case NorthUP_2D:
+                    setUIMode(ui);
+                    break;
                 case Type_VR:
                     mMapView.getMapAutoViewHelper().setScaleVRMode(true);
                     mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
                     return;
-                //                case Type_Light:
-                //                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
-                //                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
-                //                    mIsLightStyle = true;
-                //                    break;
-                //                case Type_Night:
-                //                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
-                //                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
-                //                    mIsLightStyle = false;
-                //                    break;
-                //                case Type_AUTO_LIGHT_Night:
-                //                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
-                //                    break;
+                case Type_Light:
+                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
+                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
+                    mIsLightStyle = true;
+                    break;
+                case Type_Night:
+                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
+                    mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
+                    mIsLightStyle = false;
+                    break;
+                case Type_AUTO_LIGHT_Night:
+                    mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
+                    break;
             }
 
         }
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 825cd22442..c4bf28bcfc 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -126,7 +126,6 @@ public class EntranceFragment extends MvpFragment
 
-    
-
-        
-
-    
-