From 8c669c6c5be539d89d4765956dec5c5c6d2f6164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 30 Jun 2020 12:27:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91?= =?UTF-8?q?=E5=9C=B0=E3=80=91=E4=BF=AE=E6=94=B9=E4=BA=86=E8=A1=8C=E9=A9=B6?= =?UTF-8?q?=E7=9A=84=E6=9C=80=E4=BD=8E=E9=80=9F=E5=BA=A6=E4=B8=BA3?= =?UTF-8?q?=E7=B1=B3/=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a06d097f73..1d5e11a1d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.47 +MOGO_MODULE_V2X_VERSION=1.1.48 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 82e0970319bca5bb9e277647d6c66cc99cd10f22 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Jun 2020 15:11:11 +0800 Subject: [PATCH 2/3] bugfix --- .../mogo/module/common/map/MapCenterPointStrategy.java | 2 +- .../main/java/com/mogo/module/main/MainActivity.java | 10 ++++++---- .../com/mogo/module/navi/manager/AddressManager.kt | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java index 42426edf27..b2065a807c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java @@ -22,7 +22,7 @@ public class MapCenterPointStrategy { public static final MapCenterPoint DEFAULT = new MapCenterPoint( 0.677734D, 0.5733333D ); - static { + public static void init() { // 普通场景，使用高德内部值 { Map< Integer, MapCenterPoint > common = new HashMap<>(); 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 5553aeab37..245453af4a 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 @@ -135,16 +135,18 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); + + // 右移地图中心点 + mMogoMapUIController = mMogoMapService.getMapUIController(); + MapCenterPointStrategy.init(); + MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS ); + // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 addModule(); loadContainerModules(); MogoModulesManager.getInstance().loadModules(); mPresenter.delayOperations(); - // 右移地图中心点 - mMogoMapUIController = mMogoMapService.getMapUIController(); - MapCenterPointStrategy.setMapCenterPointByScene( mMogoMapUIController, Scene.AIMLESS ); - // 启动一些基本的服务：定位等 startBaseService(); diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt index 3713ed1c1d..18a7b0aaf0 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt @@ -44,7 +44,7 @@ object AddressManager { fun init(context: Context) { poiDao = AppDataBase.getDatabase(context).poiDao() - WorkThreadHandler.getInstance().post { + WorkThreadHandler.getInstance().postDelayed({ try { var zdCompany = SearchApisHolder.getPersonalInfoManager().company companyAddress = EntityConvertUtils.zd2Mogo(zdCompany, DataConstants.TYPE_COMPANY_ADDRESS) @@ -53,7 +53,7 @@ object AddressManager { } catch (e: Exception) { Logger.d(TAG, Log.getStackTraceString(e)) } - } + }, 1000) SearchApisHolder.getPersonalInfoManager().addListener(object : PersonalInfoManager.InfoListener { override fun onCompanyChanged(company: ZDPoi?) { From b6ad2d3add6616a9c83ddeed143fcd900e216b6e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Jun 2020 15:32:21 +0800 Subject: [PATCH 3/3] launch adas when acc on --- .../src/main/java/com/mogo/module/service/MogoServices.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 9d6c450152..82ee63cc63 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -703,6 +703,11 @@ public class MogoServices implements IMogoMapListener, CarIconDisplayStrategy.getInstance().changeCarIconStatus( isTrue ); notifySeekHelpingStatusChanged( isTrue ); break; + case ACC_STATUS: + if ( isTrue ) { + mADASController.showADAS(); + } + break; } }