diff --git a/config.gradle b/config.gradle index 3461eb83e6..f736edc7e7 100644 --- a/config.gradle +++ b/config.gradle @@ -176,7 +176,6 @@ ext { mogoaicloudtelematic : "com.mogo.cloud:telematic:${MOGO_TELEMATIC_VERSION}", //========================= 新架构的 Maven 版本管理 ========================= - mogo_core_function_autopilot : "com.mogo.eagle.core.function.impl:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT_VERSION}", mogo_core_function_devatools : "com.mogo.eagle.core.function.impl:devatools:${MOGO_CORE_FUNCTION_DEVATOOLS_VERSION}", mogo_core_function_hmi : "com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_FUNCTION_HMI_VERSION}", mogo_core_function_map : "com.mogo.eagle.core.function.impl:map:${MOGO_CORE_FUNCTION_MAP_VERSION}", diff --git a/core/function-impl/mogo-core-function-biz/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-biz/src/main/AndroidManifest.xml index a5918e68ab..e871869299 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-biz/src/main/AndroidManifest.xml @@ -1,4 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt index a68ed9049c..77537ab127 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/push/dispatch/network/IDispatchAdasApiService.kt @@ -25,7 +25,7 @@ interface IDispatchAdasApiService { */ @FormUrlEncoded @POST("/dataService/autoDriver/receiverDestSiteResult") - fun uploadDispatchResult(@FieldMap parameters: Map): Observable + fun uploadDispatchResult(@FieldMap parameters: MutableMap): Observable /** * 上报自动驾驶状态 服务于业务调度 @@ -35,5 +35,5 @@ interface IDispatchAdasApiService { */ @FormUrlEncoded @POST("/dataService/autoDriver/receiveAutopilotState") - fun uploadAutopilotState(@FieldMap parameters: Map): Observable + fun uploadAutopilotState(@FieldMap parameters: MutableMap): Observable } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-datacenter/src/main/AndroidManifest.xml index d53664eb7c..ee1c554d89 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-datacenter/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mogo.eagle.core.function.datacenter"> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 2bf35249bf..0da46f1f81 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -90,13 +90,11 @@ dependencies { api rootProject.ext.dependencies.mogo_core_network api rootProject.ext.dependencies.mogo_core_function_obu_mogo api rootProject.ext.dependencies.mogo_core_function_bindingcar - api rootProject.ext.dependencies.mogo_core_function_autopilot api rootProject.ext.dependencies.mogo_core_function_map api rootProject.ext.dependencies.mogo_core_function_v2x api rootProject.ext.dependencies.mogo_core_function_monitoring api rootProject.ext.dependencies.mogo_core_function_devatools api rootProject.ext.dependencies.mogo_core_function_call - api rootProject.ext.dependencies.mogo_core_function_msgbox implementation project(':libraries:map-usbcamera') } else { @@ -109,7 +107,6 @@ dependencies { api project(':core:mogo-core-data') api project(':core:mogo-core-utils') api project(':core:function-impl:mogo-core-function-obu-mogo') -// api project(':core:function-impl:mogo-core-function-autopilot') api project(':core:function-impl:mogo-core-function-map') api project(':core:function-impl:mogo-core-function-v2x') api project(':core:function-impl:mogo-core-function-monitoring') @@ -117,6 +114,7 @@ dependencies { api project(':core:function-impl:mogo-core-function-chat') api project(':core:function-impl:mogo-core-function-bindingcar') api project(':core:function-impl:mogo-core-function-datacenter') + api project(':core:function-impl:mogo-core-function-biz') api project(':core:mogo-core-function-call') api project(':libraries:mogo-adas') diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 3c816c7625..5d085a744a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -138,7 +138,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { private void upgradeProgressListener() { final NotificationCompat.Builder builder = new NotificationCompat.Builder(this); - builder.setSmallIcon(R.mipmap.icon1001); +// builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标,去除地图下载图标的依赖关系 builder.setContentTitle("下载"); builder.setContentText("正在下载"); final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml index c89dba60c2..035df811a8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml @@ -89,19 +89,4 @@ @dimen/dp_10 - - diff --git a/gradle.properties b/gradle.properties index 8ffa0876ab..2bf090e7cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -97,7 +97,6 @@ versionCode=2130000 versionName=2.13.0 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.10 MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.10 diff --git a/settings.gradle b/settings.gradle index 9f12bfa87b..c18eaa8714 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,8 +30,6 @@ include ':core:function-impl:mogo-core-function-map' include ':core:function-impl:mogo-core-function-v2x' // 自研OBU业务 include ':core:function-impl:mogo-core-function-obu-mogo' -// 自动驾驶相关能力,控制自动驾驶,获取自动驾驶识别信息,自车感知预警等 -//include ':core:function-impl:mogo-core-function-autopilot' // 行车超视距服务,路测摄像头、前车摄像头 include ':core:function-impl:mogo-core-function-monitoring' // 绑定车机