From eb58e79e72081203011541c2ea6d3c09df079c5f Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Fri, 27 Mar 2020 14:11:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4adas=EF=BC=8Cmark?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/navi/constants/SearchServiceHolder.kt | 7 +++++++ .../main/java/com/mogo/module/navi/manager/NaviManager.kt | 1 + 2 files changed, 8 insertions(+) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt index d1a89d9c3f..89c2796b01 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt @@ -9,6 +9,7 @@ import com.mogo.map.marker.IMogoMarkerManager import com.mogo.map.navi.IMogoNavi import com.mogo.map.search.geo.IMogoGeoSearch import com.mogo.map.uicontroller.IMogoMapUIController +import com.mogo.module.common.MogoModulePaths import com.mogo.service.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics import com.mogo.service.fragmentmanager.FragmentDescriptor @@ -79,4 +80,10 @@ object SearchServiceHolder{ return geoSearch!! } + fun setMarkerStatus(show: Boolean) { + statusManager.setSearchUIShow( + MogoModulePaths.PATH_FRAGMENT_SEARCH_CATEGORY, show + ) + } + } \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt index 5955749a77..6a93c4796e 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt @@ -48,6 +48,7 @@ object NaviManager { } showHome() + SearchServiceHolder.setMarkerStatus(true) var newInstance = ChoosePathFragment.newInstance( MogoLatLng(lat, lon) From 541ef8005c24028d302c50b5b358e3b26cb02c9c Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 30 Mar 2020 10:25:25 +0800 Subject: [PATCH 2/4] update newfresh module version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 79610a7704..463b66ff67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,5 +66,5 @@ MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.0-SNAPSHOT # 新鲜事 -MOGO_MODULE_FRESH_NEWS_VERSION=1.0.2-SNAPSHOT +MOGO_MODULE_FRESH_NEWS_VERSION=1.0.3-SNAPSHOT From ef467f6267f71171be745f1535087ba80a429eba Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Mon, 30 Mar 2020 10:27:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=B8=8E=E5=AF=BC=E8=88=AA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-search/build.gradle | 2 ++ .../com/mogo/module/navi/constants/SearchServiceHolder.kt | 6 ++++++ .../main/java/com/mogo/module/navi/manager/NaviManager.kt | 1 + .../com/mogo/module/navi/ui/search/ChoosePathFragment.kt | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index af33a5d520..c4cd7396dc 100644 --- a/modules/mogo-module-search/build.gradle +++ b/modules/mogo-module-search/build.gradle @@ -54,6 +54,8 @@ dependencies { // api project(path: ':modules:mogo-module-common') // api project(path: ':foudations:mogo-utils') // api project(path: ':modules:mogo-module-map') + implementation rootProject.ext.dependencies.guideshowprovider + if (Boolean.valueOf(RELEASE)) { // implementation rootProject.ext.dependencies.mogomap diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt index 89c2796b01..75dc3bf40d 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt @@ -10,6 +10,8 @@ import com.mogo.map.navi.IMogoNavi import com.mogo.map.search.geo.IMogoGeoSearch import com.mogo.map.uicontroller.IMogoMapUIController import com.mogo.module.common.MogoModulePaths +import com.mogo.module.guideshow.provider.GuideShowProviderConstant +import com.mogo.module.guideshow.provider.IGuideShowProvider import com.mogo.service.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics import com.mogo.service.fragmentmanager.FragmentDescriptor @@ -41,6 +43,10 @@ object SearchServiceHolder{ val analyticsManager: IMogoAnalytics = ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_ANALYTICS ).navigation() as IMogoAnalytics + val guideShowProvider: IGuideShowProvider = ARouter.getInstance().build( + GuideShowProviderConstant.GUIDE_SHOW_PROVIDER + ).navigation() as IGuideShowProvider + var geoSearch: IMogoGeoSearch? = null fun init(context: Context) { this.context = context diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt index 6a93c4796e..d6fd55670e 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt @@ -61,6 +61,7 @@ object NaviManager { .stopNavi() } else if (key_type == 20009) { showHome() + SearchServiceHolder.setMarkerStatus(true) SearchServiceHolder.fragmentManager .clearAll() diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index 95f9f99352..1b1559d9ed 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -241,6 +241,10 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB .startNavi(!SettingManager.isMonitor()) SearchServiceHolder.getMapUIController() .recoverLockMode() + + if (SearchServiceHolder.guideShowProvider.isPlayingVideo()) { + SearchServiceHolder.guideShowProvider.closeGuideShowView() + } isStartedNavi = true SearchServiceHolder.fragmentManager.clearAll() } From f60beed25b7a3940fa273f8779a530620d394b8b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 30 Mar 2020 10:52:47 +0800 Subject: [PATCH 4/4] fixed amap version --- config.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.gradle b/config.gradle index e3d37b397e..4ce4435a1e 100644 --- a/config.gradle +++ b/config.gradle @@ -23,9 +23,9 @@ ext { androidxjunit : "androidx.test.ext:junit:1.1.0", androidxespressocore : "androidx.test.espresso:espresso-core:3.1.1", // 地图 - amapnavi3dmap : "com.amap.api:navi-3dmap:latest.integration", - amapsearch : "com.amap.api:search:latest.integration", - amaplocation : "com.amap.api:location:latest.integration", + amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0", + amapsearch : "com.amap.api:search:7.1.0", + amaplocation : "com.amap.api:location:4.9.0", // json 转换 gson : "com.google.code.gson:gson:2.8.4", // 内存泄漏检测