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

.idea/gradle.xml

@@ -35,7 +35,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator" />
             <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-debug" />
             <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-noop" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-main" />

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/build.gradle

@@ -270,7 +270,6 @@ dependencies {
         implementation project(':foudations:mogo-commons')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-search')
-        implementation project(':modules:mogo-module-guide')
         implementation project(':modules:mogo-module-authorize')
         implementation project(':modules:mogo-module-media')
         implementation project(':modules:mogo-module-service')

config.gradle

@@ -101,8 +101,8 @@ targetSdkVersion        : 22,
             moduleextensions         : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
             carcall                  : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
             carcallprovider          : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
-            guideshow                : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}",
-            guideshowprovider        : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}",
+//            guideshow                : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}",
+//            guideshowprovider        : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}",
             // 在线车辆
             moduleonlinecar          : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
             // V2X

modules/mogo-module-v2x/build.gradle

@@ -42,7 +42,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.tencent.liteavsdk:LiteAVSDK_Smart:7.2.8927'
+    implementation 'com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211'
     implementation 'ch.hsr:geohash:1.4.0'
     implementation rootProject.ext.dependencies.flexbox
     implementation rootProject.ext.dependencies.rxandroid

settings.gradle

@@ -22,7 +22,7 @@ include ':modules:mogo-module-share'
 include ':modules:mogo-module-service'
 include ':modules:mogo-module-back'
 include ':modules:mogo-module-authorize'
-include ':modules:mogo-module-guide'
+//include ':modules:mogo-module-guide'
 include ':libraries:map-amap'
 include ':libraries:mogo-map-api'
 include ':modules:mogo-module-apps'