From 02150bf7d68a7192997372f50aa41a849335c5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Nov 2021 16:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=B8=A6=E6=9C=89=E6=8E=A7?= =?UTF-8?q?=E5=88=B6HMI=E8=A7=86=E5=9B=BE=E6=98=BE=E7=A4=BA=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E4=BB=A5=E5=8F=8A=E5=8D=95=E7=8B=AC=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9B=9E=E8=B0=83Maven=E7=89=88=E6=9C=AC=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dreleaseleakcanary=E7=89=88=E6=9C=AC=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- README.md | 53 +++++++++++---- app/build.gradle | 5 +- config.gradle | 4 +- gradle.properties | 162 +++++++++++++++++++++++----------------------- 4 files changed, 127 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 3c7bea39f4..384997b92b 100644 --- a/README.md +++ b/README.md @@ -7,30 +7,48 @@ repositories { maven { url 'https://nexus.zhidaoauto.com/repository/maven-public/' } } + +// SDK 共功能说明 +MOGO_CORE_SDK_VERSION = 0.0.6 + +// 负责模块之间调用，回调监听注册 +com.mogo.eagle.core.function:call:${MOGO_CORE_SDK_VERSION} +// 数据bean基础，用来统一模块间数据调用 +com.mogo.eagle.core:data:${MOGO_CORE_SDK_VERSION} +// 模块功能定义接口，回调监听接口定义 +com.mogo.eagle.core.function:api:${MOGO_CORE_SDK_VERSION} + + // app 壳项目依赖 参见项目 mogo-och 使用到的依赖 -implementation "com.mogo.commons:mogo-utils:2.0.61" -implementation "com.mogo.commons:mogo-commons:2.0.61" -implementation "com.mogo.module:module-common:2.0.61" -implementation "com.mogo.eagle.core:data:2.0.61" +implementation "com.mogo.commons:mogo-utils:2.0.63" +implementation "com.mogo.commons:mogo-commons:2.0.63" +implementation "com.mogo.module:module-common:2.0.63" + +implementation "com.mogo.eagle.core:data:0.0.6" +implementation "com.mogo.eagle.core.function:call:0.0.6" mogo-och-bus 使用到的依赖 implementation rootProject.ext.dependencies.mogooch -implementation "com.mogo.commons:mogo-utils:2.0.61" -implementation "com.mogo.commons:mogo-commons:2.0.61" -implementation "com.mogo.module:module-common:2.0.61" -implementation "com.mogo.eagle.core:data:2.0.61" +implementation "com.mogo.commons:mogo-utils:2.0.63" +implementation "com.mogo.commons:mogo-commons:2.0.63" +implementation "com.mogo.module:module-common:2.0.63" + +implementation "com.mogo.eagle.core:data:0.0.6" +implementation "com.mogo.eagle.core.function:call:0.0.6" mogo-och-taxi 使用到的依赖 implementation rootProject.ext.dependencies.mogooch -implementation "com.mogo.commons:mogo-utils:2.0.61" -implementation "com.mogo.commons:mogo-commons:2.0.61" -implementation "com.mogo.module:module-common:2.0.61" -implementation "com.mogo.eagle.core:data:2.0.61" +implementation "com.mogo.commons:mogo-utils:2.0.63" +implementation "com.mogo.commons:mogo-commons:2.0.63" +implementation "com.mogo.module:module-common:2.0.63" + +implementation "com.mogo.eagle.core:data:0.0.6" +implementation "com.mogo.eagle.core.function:call:0.0.6" ``` @@ -45,4 +63,15 @@ implementation "com.mogo.eagle.core.function:call:0.0.4" // 实现接口 IMoGoAutopilotStatusListener // 注册监听 CallerAutoPilotStatusListenerManager.addListener(TAG, new IMoGoAutopilotStatusListener(){}) +``` +### HMI 控制 +``` java +// 控制 脉速表 显示状态 +CallerHmiManager.setSpeedChartViewVisibility(View.VISIBLE) +// 控制 自动驾驶按钮 显示状态 +CallerHmiManager.setAutopilotStatusViewVisibility(View.VISIBLE) +// 控制 切换视角按钮 显示状态 +CallerHmiManager.setPerspectiveSwitchViewVisibility(View.VISIBLE) +// 控制 车辆检检测按钮 示状态 +CallerHmiManager.setAutopilotStatusViewVisibility(View.VISIBLE) ``` \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 573616ac16..98d8420f3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,6 +155,9 @@ dependencies { compileOnly rootProject.ext.dependencies.adasapi compileOnly rootProject.ext.dependencies.adasconfigapi + debugImplementation rootProject.ext.dependencies.debugleakcanary + releaseImplementation rootProject.ext.dependencies.releaseleakcanary + if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoaicloudservicesdk implementation rootProject.ext.dependencies.mogocommons @@ -189,7 +192,6 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_function_map implementation rootProject.ext.dependencies.mogo_core_function_v2x implementation rootProject.ext.dependencies.mogo_core_function_monitoring - implementation rootProject.ext.dependencies.releaseleakcanary } else { implementation project(':foudations:mogo-aicloud-services-sdk') implementation project(':foudations:mogo-commons') @@ -224,7 +226,6 @@ dependencies { implementation project(':core:function-impl:mogo-core-function-notice') implementation project(':core:function-impl:mogo-core-function-v2x') implementation project(':core:function-impl:mogo-core-function-monitoring') - implementation rootProject.ext.dependencies.debugleakcanary } apply from: "./functions/tts.gradle" diff --git a/config.gradle b/config.gradle index 9613f93462..f336eeade5 100644 --- a/config.gradle +++ b/config.gradle @@ -44,8 +44,8 @@ ext { gson : "com.google.code.gson:gson:2.8.4", // 内存泄漏检测 debugleakcanary : "com.squareup.leakcanary:leakcanary-android:2.7", - releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7", - testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7", + releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.3", + testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.3", //rxJava rxjava : "io.reactivex.rxjava2:rxjava:2.2.2", rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1", diff --git a/gradle.properties b/gradle.properties index 35e6524a8e..8a84553cf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.0.62.aar +android.jetifier.blacklist=module-service-2.0.63.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -88,103 +88,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_HMI_VERSION_VERSION=0.0.5 -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.5 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.5 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.5 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.5 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.5 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.5 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.5 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.5 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.5 -MOGO_CORE_DATA_VERSION=0.0.5 -MOGO_CORE_FUNCTION_API_VERSION=0.0.5 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.5 -MOGO_CORE_RES_VERSION=0.0.5 -MOGO_CORE_UTILS_VERSION=0.0.5 -MOGO_CORE_NETWORK_VERSION=0.0.5 +MOGO_CORE_FUNCTION_HMI_VERSION_VERSION=0.0.6 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.6 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.6 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.6 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.6 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.6 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.6 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.6 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.6 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.6 +MOGO_CORE_DATA_VERSION=0.0.6 +MOGO_CORE_FUNCTION_API_VERSION=0.0.6 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.6 +MOGO_CORE_RES_VERSION=0.0.6 +MOGO_CORE_UTILS_VERSION=0.0.6 +MOGO_CORE_NETWORK_VERSION=0.0.6 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.62 -MOGO_UTILS_VERSION=2.0.62 -MAP_AMAP_VERSION=2.0.62 -MAP_AUTONAVI_VERSION=2.0.62 -MOGO_MAP_VERSION=2.0.62 -MOGO_MAP_API_VERSION=2.0.62 -MOGO_SERVICE_VERSION=2.0.62 -MOGO_SERVICE_API_VERSION=2.0.62 -MOGO_CONNECTION_VERSION=2.0.62 -MOGO_MODULE_APPS_VERSION=2.0.62 -MOGO_MODULE_NAVI_VERSION=2.0.62 -MOGO_MODULE_SHARE_VERSION=2.0.62 -MOGO_MODULE_COMMON_VERSION=2.0.62 -MOGO_MODULE_MAIN_VERSION=2.0.62 -MOGO_MODULE_MAP_VERSION=2.0.62 -MOGO_MODULE_SERVICE_VERSION=2.0.62 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.62 -MOGO_MODULE_SEARCH_VERSION=2.0.62 -MOGO_MODULE_BACK_VERSION=2.0.62 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.62 -MOGO_MODULE_V2X_VERSION=2.0.62 +MOGO_COMMONS_VERSION=2.0.63 +MOGO_UTILS_VERSION=2.0.63 +MAP_AMAP_VERSION=2.0.63 +MAP_AUTONAVI_VERSION=2.0.63 +MOGO_MAP_VERSION=2.0.63 +MOGO_MAP_API_VERSION=2.0.63 +MOGO_SERVICE_VERSION=2.0.63 +MOGO_SERVICE_API_VERSION=2.0.63 +MOGO_CONNECTION_VERSION=2.0.63 +MOGO_MODULE_APPS_VERSION=2.0.63 +MOGO_MODULE_NAVI_VERSION=2.0.63 +MOGO_MODULE_SHARE_VERSION=2.0.63 +MOGO_MODULE_COMMON_VERSION=2.0.63 +MOGO_MODULE_MAIN_VERSION=2.0.63 +MOGO_MODULE_MAP_VERSION=2.0.63 +MOGO_MODULE_SERVICE_VERSION=2.0.63 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.63 +MOGO_MODULE_SEARCH_VERSION=2.0.63 +MOGO_MODULE_BACK_VERSION=2.0.63 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.63 +MOGO_MODULE_V2X_VERSION=2.0.63 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.62 +MOGO_MODULE_TANLU_VERSION=2.0.63 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.62 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.62 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.62 +MOGO_MODULE_PUSH_VERSION=2.0.63 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.63 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.63 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.62 -MOGO_TANLU_API_VERSION=2.0.62 +TANLULIB_VERSION=2.0.63 +MOGO_TANLU_API_VERSION=2.0.63 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.62 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.62 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.63 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.63 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.62 +MOGO_MODULE_WIDGETS_VERSION=2.0.63 # obu -MOGO_MODULE_OBU_VERSION=2.0.62 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.62 +MOGO_MODULE_OBU_VERSION=2.0.63 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.63 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.62 +MOGO_MODULE_MONITOR_VERSION=2.0.63 # bugly -CRASHREPORT_VERSION=2.0.62 -CRASHREPORT_BUGLY_VERSION=2.0.62 -CRASHREPORT_NOOP_VERSION=2.0.62 -CRASHREPORT_UPGRADE_VERSION=2.0.62 +CRASHREPORT_VERSION=2.0.63 +CRASHREPORT_BUGLY_VERSION=2.0.63 +CRASHREPORT_NOOP_VERSION=2.0.63 +CRASHREPORT_UPGRADE_VERSION=2.0.63 ## tts -TTS_BASE_VERSION=2.0.62 -TTS_DI_VERSION=2.0.62 -TTS_ZHI_VERSION=2.0.62 -TTS_PAD_VERSION=2.0.62 -TTS_NOOP_VERSION=2.0.62 +TTS_BASE_VERSION=2.0.63 +TTS_DI_VERSION=2.0.63 +TTS_ZHI_VERSION=2.0.63 +TTS_PAD_VERSION=2.0.63 +TTS_NOOP_VERSION=2.0.63 # 自研地图 -MAP_CUSTOM_VERSION=2.0.62 -MOGO_MODULE_ADAS_VERSION=2.0.62 +MAP_CUSTOM_VERSION=2.0.63 +MOGO_MODULE_ADAS_VERSION=2.0.63 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.62 -MOGO_BASE_SERVICES_APK_VERSION=2.0.62 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.62 -MOGO_MODULE_CHAT_VERSION=2.0.62 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.63 +MOGO_BASE_SERVICES_APK_VERSION=2.0.63 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.63 +MOGO_MODULE_CHAT_VERSION=2.0.63 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.0.62 +MOGO_MODULE_CARCHATTING_VERSION=2.0.63 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.62 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.63 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.62 -MOGO_SKIN_LIGHT_VERSION=2.0.62 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.62 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.62 -SKIN_SUPPORT_VERSION=2.0.62 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.62 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.62 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.62 -SKIN_SUPPORT_DESIGN_VERSION=2.0.62 +MOGO_SKIN_SUPPORT_VERSION=2.0.63 +MOGO_SKIN_LIGHT_VERSION=2.0.63 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.63 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.63 +SKIN_SUPPORT_VERSION=2.0.63 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.63 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.63 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.63 +SKIN_SUPPORT_DESIGN_VERSION=2.0.63 # OCH -MOGO_OCH_VERSION=2.0.62 -MOGO_OCH_BUS_VERSION=2.0.62 -MOGO_OCH_NOOP_VERSION=2.0.62 -MOGO_OCH_TAXI_VERSION=2.0.62 +MOGO_OCH_VERSION=2.0.63 +MOGO_OCH_BUS_VERSION=2.0.63 +MOGO_OCH_NOOP_VERSION=2.0.63 +MOGO_OCH_TAXI_VERSION=2.0.63 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.62 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.63 ################# 旧版本架构模块版本 #################