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

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