From 014af4adb53c2329360e8d95b735cc9d6e607a96 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 24 Jun 2020 18:57:07 +0800 Subject: [PATCH] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E5=8E=BB=E6=8E=89obu?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BF=9D?= =?UTF-8?q?=E7=95=99=EF=BC=8C=E4=BB=A5=E5=BE=85=E5=90=8E=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/launcher/MogoApplication.java | 1 - gradle.properties | 56 +++++++++---------- modules/mogo-module-main/build.gradle | 2 - .../com/mogo/module/main/MainActivity.java | 7 ++- .../zhidao/mogo/module/obu/ObuConstant.java | 26 ++++++++- 5 files changed, 59 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index b9fe0ff59d..50110c4f4e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -67,7 +67,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); - MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_OBU,"moduleObu")); // 暂时去掉推送 // MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); diff --git a/gradle.properties b/gradle.properties index 31f3012cef..2cc9bfbac8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,36 +27,36 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.1.10 -MOGO_UTILS_VERSION=1.2.1.10 -MAP_AMAP_VERSION=1.2.1.10 -MAP_AUTONAVI_VERSION=1.2.1.10 -MOGO_MAP_VERSION=1.2.1.10 -MOGO_MAP_API_VERSION=1.2.1.10 -MOGO_SERVICE_VERSION=1.2.1.10 -MOGO_SERVICE_API_VERSION=1.2.1.10 -MOGO_CONNECTION_VERSION=1.2.1.10 -MOGO_MODULE_APPS_VERSION=1.2.1.10 -MOGO_MODULE_NAVI_VERSION=1.2.1.10 -MOGO_MODULE_SHARE_VERSION=1.2.1.10 -MOGO_MODULE_COMMON_VERSION=1.2.1.10 -MOGO_MODULE_MAIN_VERSION=1.2.1.10 -MOGO_MODULE_MAP_VERSION=1.2.1.10 -MOGO_MODULE_SERVICE_VERSION=1.2.1.10 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.10 -MOGO_MODULE_SEARCH_VERSION=1.2.1.10 -MOGO_MODULE_BACK_VERSION=1.2.1.10 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.10 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.10 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.10 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.10 -MOGO_MODULE_GUIDE_VERSION=1.2.1.10 -MOGO_MODULE_MEDIA_VERSION=1.2.1.10 +MOGO_COMMONS_VERSION=1.2.1.11 +MOGO_UTILS_VERSION=1.2.1.11 +MAP_AMAP_VERSION=1.2.1.11 +MAP_AUTONAVI_VERSION=1.2.1.11 +MOGO_MAP_VERSION=1.2.1.11 +MOGO_MAP_API_VERSION=1.2.1.11 +MOGO_SERVICE_VERSION=1.2.1.11 +MOGO_SERVICE_API_VERSION=1.2.1.11 +MOGO_CONNECTION_VERSION=1.2.1.11 +MOGO_MODULE_APPS_VERSION=1.2.1.11 +MOGO_MODULE_NAVI_VERSION=1.2.1.11 +MOGO_MODULE_SHARE_VERSION=1.2.1.11 +MOGO_MODULE_COMMON_VERSION=1.2.1.11 +MOGO_MODULE_MAIN_VERSION=1.2.1.11 +MOGO_MODULE_MAP_VERSION=1.2.1.11 +MOGO_MODULE_SERVICE_VERSION=1.2.1.11 +MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.11 +MOGO_MODULE_SEARCH_VERSION=1.2.1.11 +MOGO_MODULE_BACK_VERSION=1.2.1.11 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.11 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.11 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.11 +MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.11 +MOGO_MODULE_GUIDE_VERSION=1.2.1.11 +MOGO_MODULE_MEDIA_VERSION=1.2.1.11 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.10 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.10 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.11 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.11 -MOGO_MODULE_OBU_VERSION = 1.2.1.10 +MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT ## 工程外部模块 diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index 978075aabe..e06cc617ba 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -53,7 +53,6 @@ dependencies { api rootProject.ext.dependencies.mogoconnection api rootProject.ext.dependencies.moduleextensions api rootProject.ext.dependencies.mogomoduleback - api rootProject.ext.dependencies.moduleobu } else { api project(":foudations:mogo-utils") api project(":foudations:mogo-commons") @@ -66,7 +65,6 @@ dependencies { api project(':foudations:mogo-connection') api project(':modules:mogo-module-extensions') api project(':modules:mogo-module-back') - api project(':modules:mogo-module-obu') } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 1a9a312206..74302e8e52 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -28,6 +28,7 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.service.obu.IMogoObuManager; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.logger.Logger; import com.zhidao.autopilot.support.api.AutopilotServiceManage; @@ -124,7 +125,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoMapService.getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this ); } - mServiceApis.getObuManager().registerObuDataChangedListener(EventDispatchCenter.getInstance()); + +// IMogoObuManager obuManager = mServiceApis.getObuManager(); +// if(obuManager!=null) { +// obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance()); +// } EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java index bd9265768a..70c82e564f 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java @@ -5,5 +5,29 @@ package com.zhidao.mogo.module.obu; * * @author tongchenfei */ -class ObuConstant { +public class ObuConstant { + /** + * 前碰撞预警，暂时不知道是干啥的 + */ + public static final int TYPE_FRONT_COLLISION_WARNING = 101; + + /** + * 交叉路口碰撞预警 + */ + public static final int TYPE_CROSS_COLLISION_WARNING = 102; + + /** + * 紧急制动预警 + */ + public static final int TYPE_URGENCY_COLLISION_WARNING = 105; + + /** + * 绿波车速引导 + */ + public static final int TYPE_OPTIMAL_SPEED_ADVISORY = 109; + + /** + * 行人碰撞预警 + */ + public static final int TYPE_ROAD_USER_COLLISION_WARNING = 115; }