Merge branch 'feature/v1.0.3' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into feature/v1.0.3

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",
             // 内存泄漏检测

gradle.properties

@@ -70,5 +70,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
 

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

modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchServiceHolder.kt

@@ -9,6 +9,9 @@ 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.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
@@ -40,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
@@ -79,4 +86,10 @@ object SearchServiceHolder{
     return geoSearch!!
   }
 
+   fun setMarkerStatus(show: Boolean) {
+    statusManager.setSearchUIShow(
+        MogoModulePaths.PATH_FRAGMENT_SEARCH_CATEGORY, show
+    )
+  }
+
 }

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)
@@ -60,6 +61,7 @@ object NaviManager {
                 .stopNavi()
           } else if (key_type == 20009) {
             showHome()
+            SearchServiceHolder.setMarkerStatus(true)
             SearchServiceHolder.fragmentManager
                 .clearAll()
 

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()
   }