Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

2020-12-22 11:22:00 +08:00
parent ea3518b676 f3e872d692
commit a2b88b87cf
523 changed files with 10461 additions and 853 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
    <JetCodeStyleSettings>
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
        </value>
      </option>
    </JetCodeStyleSettings>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -84,7 +84,6 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.alibaba.arouter'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'android-aspectjx'

 android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -150,7 +151,7 @@ android {
            // 分享时是否隐藏 adas
            buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
            // 是否需要实时上报坐标
-            buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
+            buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false'
        }
        // f系列-分体机-高德
        f8Amap {
@@ -445,6 +446,10 @@ repositories {
    }
 }

+aspectjx {
+    include  "com.mogo.chat"
+}
+
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])

--- a/config.gradle
+++ b/config.gradle
@@ -53,6 +53,7 @@ ext {
            glideanno                  : 'com.github.bumptech.glide:annotations:4.8.0',
            glidecompiler              : 'com.github.bumptech.glide:compiler:4.8.0',
            supportannos               : "com.android.support:support-annotations:28.0.0",
+            okhttpinterceptor          :"com.squareup.okhttp3:logging-interceptor:3.12.0",
            // fresco
            fresco                     : 'com.facebook.fresco:fresco:1.1.0',
            // 公司服务 - 语音
@@ -175,6 +176,7 @@ ext {
            mogobaseservicesdk         : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}",
            mogobaseserviceapk         : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}",
            mogobasewebsocketsdk       : "com.mogo.base:websocket-sdk:${MOGO_BASE_WEBSOCKET_SDK_VERSION}",
+            mogowebsocket           : "com.mogo.module.carchatting:module-carchatt-socket:${WEBSOCKET_VERSION}",
            // loglib
            mogologlib                 : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
            // monitor
--- a/foudations/mogo-base-websocket-sdk/build.gradle
+++ b/foudations/mogo-base-websocket-sdk/build.gradle
@@ -29,8 +29,7 @@ android {
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
    implementation rootProject.ext.dependencies.arouter
-
-    implementation "com.mogo.module.carchatting:module-carchatt-socket:1.1.2"
+    implementation rootProject.ext.dependencies.mogowebsocket

    if (Boolean.valueOf(RELEASE)) {
        implementation rootProject.ext.dependencies.mogoutils
--- a/gradle.properties
+++ b/gradle.properties
@@ -138,9 +138,11 @@ HTTPDNS_NOOP_VERSION = 2.0.12

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.14
+CARCHATTING_VERSION=2.2.31
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.8
+# websocket
+WEBSOCKET_VERSION=1.1.2
 # loglib
 LOGLIB_VERSION = 1.0.4

--- a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java
+++ b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.java
@@ -0,0 +1,18 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.enums.RouteType;
+import com.alibaba.android.arouter.facade.model.RouteMeta;
+import com.alibaba.android.arouter.facade.template.IRouteGroup;
+import com.zhidao.mogo.tanlu.api.MogoTanluApiProvider;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Group$$tanlulib implements IRouteGroup {
+  @Override
+  public void loadInto(Map<String, RouteMeta> atlas) {
+    atlas.put("/tanlulib/api", RouteMeta.build(RouteType.PROVIDER, MogoTanluApiProvider.class, "/tanlulib/api", "tanlulib", null, -1, -2147483648));
+  }
+}
--- a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java
+++ b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.java
@@ -0,0 +1,18 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.enums.RouteType;
+import com.alibaba.android.arouter.facade.model.RouteMeta;
+import com.alibaba.android.arouter.facade.template.IProviderGroup;
+import com.zhidao.mogo.tanlu.api.MogoTanluApiProvider;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Providers$$mogotanluapi implements IProviderGroup {
+  @Override
+  public void loadInto(Map<String, RouteMeta> providers) {
+    providers.put("com.mogo.service.tanlu.IMogoTanluProvider", RouteMeta.build(RouteType.PROVIDER, MogoTanluApiProvider.class, "/tanlulib/api", "tanlulib", null, -1, -2147483648));
+  }
+}
--- a/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java
+++ b/libraries/mogo-tanlu-api/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.java
@@ -0,0 +1,17 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.template.IRouteGroup;
+import com.alibaba.android.arouter.facade.template.IRouteRoot;
+import java.lang.Class;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Root$$mogotanluapi implements IRouteRoot {
+  @Override
+  public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
+    routes.put("tanlulib", ARouter$$Group$$tanlulib.class);
+  }
+}
--- a/libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java
+++ b/libraries/mogo-tanlu-api/build/generated/source/buildConfig/debug/com/zhidao/mogo/tanlu/api/BuildConfig.java
@@ -0,0 +1,18 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.zhidao.mogo.tanlu.api;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.tanlu.api";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
+  public static final String APPLICATION_ID = "com.zhidao.mogo.tanlu.api";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0.0-SNAPSHOT";
+}
--- a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zhidao.mogo.tanlu.api"
+    android:versionCode="1"
+    android:versionName="1.0.0-SNAPSHOT" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="22" />
+    /
+
+</manifest>
--- a/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
+++ b/libraries/mogo-tanlu-api/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]
--- a/libraries/mogo-tanlu-api/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ b/libraries/mogo-tanlu-api/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
@@ -0,0 +1 @@
+{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
--- a/libraries/mogo-tanlu-api/build/intermediates/compile_library_classes/debug/classes.jar
+++ b/libraries/mogo-tanlu-api/build/intermediates/compile_library_classes/debug/classes.jar
--- a/libraries/mogo-tanlu-api/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
+++ b/libraries/mogo-tanlu-api/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\debug\jniLibs"/></dataSet></merger>
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\debug\shaders"/></dataSet></merger>
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\assets"/><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\debug\assets"/></dataSet></merger>
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -0,0 +1 @@
+#Tue Dec 15 19:29:29 CST 2020
--- a/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/incremental/packageDebugResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\res"/><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\build\generated\res\rs\debug"/><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\res"/><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\build\generated\res\rs\debug"/><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\libraries\mogo-tanlu-api\src\debug\res"/></dataSet><mergedItems/></merger>
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlulib.class
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogotanluapi.class
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogotanluapi.class
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/BuildConfig.class
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.class
--- a/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class
+++ b/libraries/mogo-tanlu-api/build/intermediates/javac/debug/classes/com/zhidao/mogo/tanlu/api/TanluApiConst.class
--- a/libraries/mogo-tanlu-api/build/intermediates/library_java_res/debug/res.jar
+++ b/libraries/mogo-tanlu-api/build/intermediates/library_java_res/debug/res.jar
--- a/libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml
+++ b/libraries/mogo-tanlu-api/build/intermediates/library_manifest/debug/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zhidao.mogo.tanlu.api"
+    android:versionCode="1"
+    android:versionName="1.0.0-SNAPSHOT" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="22" />
+    /
+
+</manifest>
--- a/libraries/mogo-tanlu-api/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
+++ b/libraries/mogo-tanlu-api/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
@@ -0,0 +1,2 @@
+R_DEF: Internal format may change without notice
+local
--- a/libraries/mogo-tanlu-api/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/libraries/mogo-tanlu-api/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,14 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="com.zhidao.mogo.tanlu.api"
+4    android:versionCode="1"
+5    android:versionName="1.0.0-SNAPSHOT" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="19"
+8-->F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+9        android:targetSdkVersion="22" />
+9-->F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+10    /
+11
+12</manifest>
--- a/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json
+++ b/libraries/mogo-tanlu-api/build/intermediates/merged_manifests/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]
--- a/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/libraries/mogo-tanlu-api/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
--- a/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar
+++ b/libraries/mogo-tanlu-api/build/intermediates/runtime_library_classes/debug/classes.jar
--- a/libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt
+++ b/libraries/mogo-tanlu-api/build/intermediates/symbols/debug/R.txt
--- a/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/libraries/mogo-tanlu-api/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,37 @@
+-- Merging decision tree log ---
+manifest
+ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+	package
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:2:5-40
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+	android:versionName
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+	android:versionCode
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:1-5:12
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+	xmlns:android
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml:1:11-69
+uses-sdk
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		ADDED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
+		INJECTED from F:\Station\Launcher\libraries\mogo-tanlu-api\src\main\AndroidManifest.xml
--- a/libraries/tanlulib/build.gradle
+++ b/libraries/tanlulib/build.gradle
@@ -2,10 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'android-aspectjx'
 apply plugin: 'com.alibaba.arouter'

-
 android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
    // buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -50,7 +48,7 @@ dependencies {
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.aiassist
    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    implementation rootProject.ext.dependencies.okhttpinterceptor
    implementation 'com.zhidaoauto.controller:api:1.0.8'
    implementation 'com.zhidao.cosupload:cosuploadsdk:1.1.6', {
        exclude group: 'com.zhidao.utils', module: 'utils'
@@ -65,7 +63,6 @@ dependencies {
    implementation rootProject.ext.dependencies.gson
    implementation rootProject.ext.dependencies.rxjava
    implementation rootProject.ext.dependencies.rxandroid
-    implementation rootProject.ext.dependencies.aspectj
    implementation rootProject.ext.dependencies.analytics

    implementation rootProject.ext.dependencies.arouter
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/DAUAspectj.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/DAUAspectj.kt
@@ -1,29 +0,0 @@
-package com.zhidao.roadcondition.aspect
-
-import android.util.Log
-import com.zhidao.roadcondition.util.CarNet_Alive
-import com.zhidao.roadcondition.util.trackNormalEvent
-import org.aspectj.lang.annotation.*
-
-@Aspect
-class DAUAspectj {
-
-    companion object {
-        const val TAG = "DAUAspectj"
-    }
-
-    @Pointcut("execution(* com.zhidao.roadcondition.splash_module.SplashActivity.initView())")
-    fun callDAU() {
-    }
-
-    @Pointcut("execution(* com.zhidao.roadcondition.service.RoadInfoService.launchMainActivity(..))")
-    fun callDAUOther(){
-
-    }
-
-    @Before("callDAU() || callDAUOther()")
-    fun trackDAU() {
-        Log.i(TAG, "trackDAU")
-        trackNormalEvent(CarNet_Alive, null)
-    }
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/DebugLog.java
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/DebugLog.java
@@ -1,14 +0,0 @@
-package com.zhidao.roadcondition.aspect;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({TYPE, METHOD, CONSTRUCTOR})
-@Retention(RUNTIME)
-public @interface DebugLog {
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/LogAspectj.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/aspect/LogAspectj.kt
@@ -1,112 +0,0 @@
-package com.zhidao.roadcondition.aspect
-
-import android.os.Looper
-import android.os.Trace
-import android.util.Log
-import com.zhidao.roadcondition.BuildConfig
-import org.aspectj.lang.ProceedingJoinPoint
-import org.aspectj.lang.annotation.Around
-import org.aspectj.lang.annotation.Aspect
-import org.aspectj.lang.annotation.Pointcut
-import org.aspectj.lang.reflect.CodeSignature
-import org.aspectj.lang.reflect.MethodSignature
-import java.util.concurrent.TimeUnit
-
-@Aspect
-class LogAspectj {
-
-    companion object {
-        @Volatile
-        private var enable: Boolean = BuildConfig.DEBUG
-    }
-
-    @Pointcut("within(@com.zhidao.roadcondition.aspect.DebugLog *)")
-    fun withinAnnotatedClass() {}
-
-    @Pointcut("execution(!synthetic * *(..))&& withinAnnotatedClass()")
-    fun methodInsideAnnotatedType() {}
-
-    @Pointcut("execution(!synthetic *.new(..))&& withinAnnotatedClass()")
-    fun constructorInsideAnnotatedType() {}
-
-    @Pointcut("execution(@com.zhidao.roadcondition.aspect.DebugLog * *(..))|| methodInsideAnnotatedType()")
-    fun method() {}
-
-    @Pointcut("execution(@com.zhidao.roadcondition.aspect.DebugLog *.new(..))|| constructorInsideAnnotatedType()")
-    fun constructor() {}
-
-    @Around("method() || constructor()")
-    fun logExecute(joinPoint: ProceedingJoinPoint) {
-
-        enterMethod(joinPoint)
-
-        var startNanos = System.nanoTime()
-        var result = joinPoint.proceed()
-        var stopNanos = System.nanoTime()
-        var lengthMill = TimeUnit.NANOSECONDS.toMillis(stopNanos - startNanos)
-
-        exitMethod(joinPoint, result, lengthMill)
-    }
-
-    private fun enterMethod(joinPoint: ProceedingJoinPoint) {
-        if (!enable) return
-
-        val signature = joinPoint.signature as CodeSignature
-        val cls = signature.declaringType
-        val methodName = signature.name
-        val parameterNames = signature.parameterNames
-        val parameterValues = joinPoint.args
-
-        var builder = StringBuilder("\u21E2 ")
-        builder.append(methodName).append('(')
-        parameterValues.forEachIndexed { index, _ ->
-            if (index > 0) {
-                builder.append(",")
-            }
-            builder.append(parameterNames[index]).append('=')
-            builder.append(parameterValues[index])
-        }
-        builder.append(')')
-
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            builder.append("[Thread:\"").append(Thread.currentThread().name).append("\"]")
-        }
-        Log.i(asTag(cls), builder.toString())
-
-        val section = builder.toString().substring(2)
-        Trace.beginSection(section)
-    }
-
-    private fun exitMethod(joinPoint: ProceedingJoinPoint, result: Any?, lengthMill: Long) {
-        if (!enable) return
-
-        Trace.endSection()
-
-        val signature = joinPoint.signature
-        val cls = signature.declaringType
-        val methodName = signature.name
-        var hasReturnType = signature is MethodSignature
-                && signature.returnType != Void.TYPE
-
-        var builder = StringBuilder("\u21E0 ")
-            .append(methodName)
-            .append("[")
-            .append(lengthMill)
-            .append("ms]")
-
-        if (hasReturnType) {
-            builder.append(" = ")
-            builder.append(result.let {
-                result.toString()
-            })
-        }
-        Log.i(asTag(cls), builder.toString())
-    }
-
-    private fun asTag(cls: Class<*>): String {
-//        if (cls.isAnonymousClass) {
-//            return asTag(cls.enclosingClass)
-//        }
-        return cls.simpleName
-    }
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt
@@ -1,7 +1,6 @@
 package com.zhidao.roadcondition.constant

 import com.mogo.commons.debug.DebugConfig
-import com.zhidao.roadcondition.BuildConfig

 class HttpConstants {

--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
@@ -11,7 +11,7 @@ class StrategyServiceModel : BaseRepository() {

    suspend fun getCityStrategy(): BaseResponse<Results> {
        return apiCall {
-            var map = hashMapOf<String, String>()
+            val map = hashMapOf<String, String>()
            map["sn"] = Utils.getSn()
            val locInfo = LocationUtil.getInstance().getLocationInfo()
            map["data"] = Gson().toJson(
@@ -25,43 +25,10 @@ class StrategyServiceModel : BaseRepository() {
        }
    }

-//    suspend fun getAuthorization(): BaseResponse<Any> {
-//        return apiCall {
-//            HttpClient.getInstance().getHttpApi().getAuthorization(getSn())
-//        }
-//    }
-//
-//        suspend fun getAllConfig(): BaseResponse<CommonConfig> {
-//            return apiCall {
-//                var map = hashMapOf<String, String>()
-//                map["sn"] = getSn()
-//                HttpClient.getInstance().getHttpApi()
-//                    .getAllCommonConfig(map)
-//            }
-//        }
-//
-//    suspend fun getSplashConfig(): BaseR
-//    esponse<SplashConfig> {
-//        return apiCall {
-//            var splashConfigRequest =
-//                SplashConfigRequest("1", "1")
-//            var splashBodyStr = Gson().toJson(splashConfigRequest)
-//
-//            HttpClient.getInstance().getHttpApi()
-//                .getSplashConfig(
-//                    mapOf(
-//                        "sn" to getSn(),
-//                        "data" to splashBodyStr
-//                    )
-//                )
-//
-//        }
-//    }
-
    suspend fun uploadInformation(informationBody: InformationBody): BaseResponse<UploadResult> {
        return apiCall {
-            var informationBodyStr = Gson().toJson(informationBody)
-            Log.d("MainServiceController", "uploadInformation  informationBody = " + informationBodyStr)
+            val informationBodyStr = Gson().toJson(informationBody)
+            Log.d("MainServiceController", "uploadInformation  informationBody = $informationBodyStr")
            HttpClient.getInstance().getHttpApi()
                .uploadInformation(mapOf("sn" to Utils.getSn(), "data" to informationBodyStr))
        }
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CommonInterceptor.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/CommonInterceptor.kt
@@ -1,17 +0,0 @@
-package com.zhidao.roadcondition.net
-
-import android.util.Log
-import okhttp3.Interceptor
-import okhttp3.Response
-
-
-class CommonInterceptor : Interceptor {
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val oldRequest = chain.request()
-        val newRequest = oldRequest.newBuilder()
-        Log.d("CommonInterceptor","addHeader")
-        newRequest.header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
-        return chain.proceed(newRequest.build())
-    }
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
@@ -19,12 +19,10 @@ class HttpClient private constructor(baseUrl: String) {
        const val DEFAULT_WRITE_TIMEOUT = 30L
        const val DEFAULT_READ_TIMEOUT = 30L

-        const val COMMON_PARAM_SN = "sn"
-
        private var baseUrlClientMap = HashMap<String, HttpClient>()

        fun getInstance(): HttpClient {
-            var baseUrl = HttpConstants.getBaseUrl()
+            val baseUrl = HttpConstants.getBaseUrl()
            var httpClient = baseUrlClientMap[baseUrl]
            if (httpClient == null) {
                synchronized(HttpClient::class.java) {
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/PostCommonBody.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/PostCommonBody.kt
@@ -1,43 +0,0 @@
-package com.zhidao.roadcondition.net
-
-import androidx.annotation.NonNull
-import okhttp3.MediaType
-import okhttp3.RequestBody
-import okhttp3.internal.Util
-import okio.BufferedSink
-
-class PostCommonBody : RequestBody {
-
-    companion object {
-        val CONTENT_TYPE = MediaType.parse("application/x-www-form-urlencoded; charset=UTF-8")
-        val charset = Util.UTF_8
-
-        fun create(@NonNull content: String): RequestBody {
-            return PostCommonBody(content)
-        }
-    }
-
-    private var content: String
-
-    constructor(@NonNull content: String) {
-        this.content = content
-    }
-
-    fun getContent(): String {
-        return content
-    }
-
-    override fun contentType(): MediaType? {
-        return CONTENT_TYPE
-    }
-
-    override fun writeTo(sink: BufferedSink) {
-        if (content.isEmpty()) {
-            throw NullPointerException("content == null")
-        }
-        val bytes = content.toByteArray(charset)
-        Util.checkOffsetAndCount(bytes.size.toLong(), 0, bytes.size.toLong())
-        sink.write(bytes, 0, bytes.size)
-    }
-
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt
@@ -1,28 +0,0 @@
-package com.zhidao.roadcondition.net
-
-import com.zhidao.roadcondition.constant.HttpConstants
-import com.zhidao.roadcondition.exception.ApiException
-import com.zhidao.roadcondition.model.BaseResponse
-import io.reactivex.functions.Function
-
-class ResponseFunction<T> : Function<BaseResponse<T>, T> {
-
-    private var baseUrl: String = ""
-
-    constructor() {
-        this.baseUrl = HttpConstants.getBaseUrl()
-    }
-
-    constructor(baseUrl: String) {
-        this.baseUrl = baseUrl
-    }
-
-    override fun apply(t: BaseResponse<T>): T {
-        if (!t.isSuccess(baseUrl)) {
-            throw ApiException(t.code, t.msg)
-        }
-        return t.result
-    }
-
-
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/receiver/ShareRoadReceiver.kt
@@ -11,7 +11,7 @@ class ShareRoadReceiver : BroadcastReceiver() {
    override fun onReceive(context: Context, intent: Intent) {
        Log.d("MainService", "ShareRoadReceiver ------> intent.action = " + intent.action)
        if (intent.action == "com.zhidao.share.roadcondition.action") {
-            var type = intent.getStringExtra("type")
+            val type = intent.getStringExtra("type")
            Log.e("MainService", "ShareRoadReceiver  type ----> $type ----> 此方法已经废弃了，无法调起服务")
 //            MainService.launchService(context, type)
        }
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -28,15 +28,15 @@ import kotlin.math.abs
 * @since  2019-10-30
 */
 object CarCorderController : TakePhotoCallback, TakeVideoCallback {
+    const val TAG: String = "CarCorderController"
    private lateinit var zdCarCoderController: ZdCarCoderController
-    val TAG: String = this.javaClass.simpleName
-    var outputVideoPath: String = ""
-    var mType: String = "" //1 上报拥堵, 2 封路和查车
-    var mainInfoId: Long = 0
-    var mFromType: String = ""
+    private var outputVideoPath: String = ""
+    private var mType: String = "" //1 上报拥堵, 2 封路和查车
+    private var mainInfoId: Long = 0
+    private var mFromType: String = ""
    private var mLongitude: Double = 0.0
    private var mLatitude: Double = 0.0
-    var mSpeed: Float = 0f
+    private var mSpeed: Float = 0f

    private var getVideoFailed: (() -> Unit)? = null
    private var interceptors: ArrayList<TakePhotoInterceptor> = ArrayList(1)
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt
@@ -1,6 +1,5 @@
 package com.zhidao.roadcondition.service

-import android.util.Log
 import com.zhidao.cosupload.callback.CosStatusCallback
 import com.zhidao.cosupload.callback.CosStatusCallbackManager

@@ -11,9 +10,7 @@ import com.zhidao.cosupload.callback.CosStatusCallbackManager
 */
 object CosCallbackMapController : CosStatusCallback {

-    val TAG = "CosCallbackMapController"
-
-    val map: MutableMap<String, CosStatusCallback> = mutableMapOf()
+    private val map: MutableMap<String, CosStatusCallback> = mutableMapOf()

    var uploadFailed: (() -> Unit)? = null

@@ -58,9 +55,7 @@ object CosCallbackMapController : CosStatusCallback {
    }

    override fun uploadCosFailed(cosPath: String?, eventId: String?, localPath: String?) {
-        map[localPath]?.let {
-            it.uploadCosFailed(cosPath, eventId, localPath)
-        }
+        map[localPath]?.uploadCosFailed(cosPath, eventId, localPath)
    }

    override fun uploadCosCompleted(
@@ -69,15 +64,11 @@ object CosCallbackMapController : CosStatusCallback {
        downloadUrl: String?,
        localPath: String?
    ) {
-        map[localPath]?.let {
-            it.uploadCosCompleted(cosPath, eventId, downloadUrl, localPath)
-        }
+        map[localPath]?.uploadCosCompleted(cosPath, eventId, downloadUrl, localPath)
    }

    override fun onProgress(localPath: String?, progress: Float) {
-        map[localPath]?.let {
-            it.onProgress(localPath, progress)
-        }
+        map[localPath]?.onProgress(localPath, progress)
    }

    fun release() {
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -4,11 +4,9 @@ import android.content.Intent
 import android.util.Log
 import com.google.gson.Gson
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.utils.TipToast
 import com.zhidao.cosupload.DbPriorityConfig
 import com.zhidao.cosupload.callback.CosStatusCallback
 import com.zhidao.cosupload.manager.CosUploadManagerImpl
-import com.zhidao.roadcondition.constant.*
 import com.zhidao.roadcondition.event.GetImageSuccessEvent
 import com.zhidao.roadcondition.event.LatLngStickyEventBus
 import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG
@@ -25,11 +23,15 @@ import com.zhidao.roadcondition.util.trackNormalEvent
 * @since  2019-10-30
 */
 class CosStatusController : CosStatusCallback {
-    val TAG: String = this.javaClass.simpleName
+
+    companion object{
+        const val TAG: String = "CosStatusController"
+    }
+
    //存储单次请求的视频和缩略图url
-    var videoAndThumbMap: MutableMap<String, String> = mutableMapOf()
+    private var videoAndThumbMap: MutableMap<String, String> = mutableMapOf()
    //图片上传的eventId
-    lateinit var mPicEventId: String
+    private lateinit var mPicEventId: String
    private var isRetry = false //是否重试上传过图片

    private var mainServiceHttpModel = MainServiceController()
@@ -41,7 +43,7 @@ class CosStatusController : CosStatusCallback {
    private var mFromType: String = ""
    private var mLongitude: Double = 0.0
    private var mLatitude: Double = 0.0
-    var mSpeed: Float = 0f
+    private var mSpeed: Float = 0f

    //上传文件
    fun uploadFile(picPath: MutableList<String?>?, entity: TakeEntity, type: String, mainInfoId: Long,
@@ -123,7 +125,7 @@ class CosStatusController : CosStatusCallback {
                videoAndThumbMap["thumb"] = downloadUrl!!
                Log.i(TAG, "videoAndThumbMap add thumb")
            }
-            Log.d(TAG, "videoAndThumbMap ${videoAndThumbMap}")
+            Log.d(TAG, "videoAndThumbMap $videoAndThumbMap")
            if (videoAndThumbMap.size == 2) {
                trackUploadCos(4)
                Log.d(TAG, "videoAndThumbMap.size == 2 ")
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CustomStatusHandler.kt
@@ -10,8 +10,8 @@ import java.util.*
 */
 object CustomStatusHandler {

-    val takePhotoStatusQueue: Queue<Boolean> = ArrayDeque(5)
-    val takeVideoStatusQueue: Queue<TakeEntity> = ArrayDeque(5)
+    private val takePhotoStatusQueue: Queue<Boolean> = ArrayDeque(5)
+    private val takeVideoStatusQueue: Queue<TakeEntity> = ArrayDeque(5)

    fun offerPhotoStatus(status: Boolean) {
        takePhotoStatusQueue.offer(status)
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/DelayService.kt
@@ -6,9 +6,6 @@ import android.content.Intent
 import android.os.IBinder
 import android.util.Log
 import com.zhidao.roadcondition.util.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import java.io.File
 import java.lang.Exception

--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt
@@ -13,7 +13,7 @@ import com.zhidao.roadcondition.util.*
 */
 object InformationUploadController {

-    val TAG : String =  this.javaClass.simpleName
+    private val TAG : String =  this.javaClass.simpleName

    private var mainServiceHttpModel = MainServiceController()

@@ -110,9 +110,7 @@ object InformationUploadController {

    fun release(id: Long) {
        val target = informationCache.remove(id)
-        target?.let {
-            it.release()
-        }
+        target?.release()
    }

    private fun recordUploadTime() {
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -33,7 +33,6 @@ import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrateg
 import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyType
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.util.concurrent.TimeUnit
@@ -61,22 +60,21 @@ class MainService : Service() {

    //是否已经获取过策略
    var isGetStrategies: Boolean = false
-    val TAG: String = this.javaClass.simpleName
+    private val TAG: String = this.javaClass.simpleName

    //1是一次性，2是周期性
-    var picType: Int = 0
-    var videoType: Int = 0
-    var shareType: String = "type"
-    var fromType: String = ""
-    var isCustom: Boolean = false
-    var speed: Float = 0f
+    private var picType: Int = 0
+    private var videoType: Int = 0
+    private var shareType: String = "type"
+    private var fromType: String = ""
+    private var isCustom: Boolean = false
+    private var speed: Float = 0f

-    var params: UploadParams? = null
-    var mainInfoId: Long = 0
+    private var params: UploadParams? = null
+    private var mainInfoId: Long = 0
    private var mLongitude: Double = 0.0
    private var mLatitude: Double = 0.0
-    lateinit var serviceApis: IMogoServiceApis
-
+    private lateinit var serviceApis: IMogoServiceApis

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        //清理多媒体资源和sp策略数据
@@ -86,10 +84,8 @@ class MainService : Service() {
        //参数说明：appKey: app唯一标识（比如：包名）
        CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
                .init(BuildConfig.APPLICATION_ID, 0)
-        //初始化语音
-        VoiceController.initVoice()
        serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis
-        speed = serviceApis.getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation().getSpeed()
+        speed = serviceApis.mapServiceApi.getSingletonLocationClient(this).lastKnowLocation.speed
        Log.d(TAG, "onStartCommand speed = $speed")
        if (intent != null) {
            params = intent.getParcelableExtra("params")
@@ -115,7 +111,7 @@ class MainService : Service() {
    }

    //定时任务回调广播
-    var mAlarmBroadCast: BroadcastReceiver = object : BroadcastReceiver() {
+    private var mAlarmBroadCast: BroadcastReceiver = object : BroadcastReceiver() {
        override fun onReceive(p0: Context?, p1: Intent) {
            Log.d(TAG, "receive alarm!!!!!!!!!!AlarmType===${p1.getIntExtra("AlarmType", 1)}")
            if (p1.action == alarmBroadAction) {
@@ -178,14 +174,14 @@ class MainService : Service() {
 //        mainServiceHttpModel.getSplashConfig()
    }

-    var id: Long = System.currentTimeMillis()
+    private var id: Long = System.currentTimeMillis()

    /**
     * 获取图片成功
     */
    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 98)
    fun getImageEvent(getImageSuccessEvent: GetImageSuccessEvent) {
-        var info = LocationUtil.getInstance().getLocationInfo()
+        val info = LocationUtil.getInstance().getLocationInfo()
        Log.d("MainService", "getImageEvent long = ${info.longitude} ----> lat= ${info.latitude}")
        Log.d(
                "MainService",
@@ -209,7 +205,7 @@ class MainService : Service() {
     * 初始化定位监听
     */
    private fun initLocationListener() {
-        var isOpen = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().applicationContext).getBoolean("KEY_SERVER_REPORTSTRATEGY_SWITCH", false)
+        val isOpen = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().applicationContext).getBoolean("KEY_SERVER_REPORTSTRATEGY_SWITCH", false)
        Logger.d("EntrancePresenter", " initLocationListener ---- isOpen = $isOpen")
        //开始开始监听速度,只要超过一次5公里每小时则即开始获取策略进行本地上报   只有release才加此判断，qa环境方便测试
        LocationUtil.getInstance().setonSpeedlistenner(object : LocationUtil.SpeedListener {
@@ -277,9 +273,9 @@ class MainService : Service() {
        //目前不支持连拍，只能定时2秒拍一张 第一期每次只拍一张
        Observable.intervalRange(0, 1, 0, 2_000, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(Consumer {
+                .subscribe {
                    CarCorderController.takePhoto(1, 1, false, isCustom, TANLU_ROAD_CURRENT, mainInfoId, fromType, mLongitude, mLatitude, speed)
-                })
+                }
 //        }

        postPhotoAlarmTask(isInterval)
@@ -310,7 +306,7 @@ class MainService : Service() {
            intent.action = alarmBroadAction
            intent.putExtra("number", getLong(PIC_NUMBER, PIC_NUMBER_DEFAULT))
            intent.putExtra("AlarmType", AlarmTypePic)
-            var pendingIntent = PendingIntent.getBroadcast(this, AlarmTypePic, intent, 0)
+            val pendingIntent = PendingIntent.getBroadcast(this, AlarmTypePic, intent, 0)
            Log.d(
                    "MainService",
                    "postPhotoAlarmTask time =" + getStrategyInterval(
@@ -342,7 +338,7 @@ class MainService : Service() {
                    "duration", (VIDEO_DURATION_DEFAULT / 1000).toInt()
            )
            videoIntent.putExtra("AlarmType", AlarmTypeVideo)
-            var videoPendingIntent =
+            val videoPendingIntent =
                    PendingIntent.getBroadcast(this, AlarmTypeVideo, videoIntent, 0)
            Log.d(
                    "MainService",
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
@@ -18,20 +18,20 @@ import kotlinx.coroutines.runBlocking
 class MainServiceController {

    companion object {
-        var TAG = this::class.java.name
+        const val TAG = "MainServiceController"
    }

    //逆地理编码是否重试
-    private var geoRetryed = false
+    private var geoRetry = false
    private var mFromType: String = ""
    private var mPoiType: String = ""

-    private val strategyeModel by lazy { StrategyServiceModel() }
+    private val strategyModel by lazy { StrategyServiceModel() }

    fun initStrategies(initFinish: (() -> Unit)? = null) {
        request<BaseResponse<Results>> {
            loader {
-                strategyeModel.getCityStrategy()
+                strategyModel.getCityStrategy()
            }
            onSuccess {
                it.result.let { strategy ->
@@ -184,7 +184,7 @@ class MainServiceController {
            }, {
                //转换失败的情况下再重试一次
                Log.d(TAG, "geoLocation -------true-->")
-                geoRetryed = if (!geoRetryed) {
+                geoRetry = if (!geoRetry) {
                    geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId,speed, longitude,latitude)
                    true
                } else {
@@ -207,7 +207,7 @@ class MainServiceController {
        trackUploadServer(3)
        request<BaseResponse<UploadResult>> {
            loader {
-                strategyeModel.uploadInformation(informationBody)
+                strategyModel.uploadInformation(informationBody)
            }
            onSuccess {
                Log.i(TAG, "upload success id = " + it.result.id)
@@ -230,7 +230,7 @@ class MainServiceController {

    private fun sendUgcStatusReceiver(id: Long, type: String?, fromType: String?) {
        Log.d(TAG, "sendUgcStatusReceiver id = $id ---type = $type --fromType = $fromType ")
-        var intent = Intent()
+        val intent = Intent()
        intent.action = "com.v2x.ugc.upload.status"
        intent.putExtra("id", id)
        intent.putExtra("type", type)
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/UploadParams.kt
@@ -2,7 +2,6 @@ package com.zhidao.roadcondition.service

 import android.os.Parcel
 import android.os.Parcelable
-import com.mogo.map.MogoLatLng

 class UploadParams(val eventType: String, val fromType: String, val duration: Int, val parentId: Long, val lat: Double, val lon: Double) : Parcelable {
    constructor(parcel: Parcel) : this(
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt
@@ -1,63 +0,0 @@
-package com.zhidao.roadcondition.service
-
-import com.mogo.commons.AbsMogoApplication
-import com.zhidao.auto.platform.voice.VoiceClient
-import java.lang.Exception
-
-/**
- * @description 声音控制类
- *
- * @author lixiaopeng
- * @since  2019-11-01
- */
-object VoiceController {
-    private lateinit var voiceClient: VoiceClient
-
-    fun initVoice() {
-        voiceClient = VoiceClient(AbsMogoApplication.getApp().applicationContext)
-    }
-
-    /**
-     * 设置语音命令回调接口
-     * @param callBack
-     */
-    fun setCallBack(callBack: VoiceClient.VoiceCmdCallBack) {
-        voiceClient.setCallBack(callBack)
-    }
-
-    /**
-     * @param speakText 语音播报内容
-     */
-    fun speakVoice(speakText: String) {
-        voiceClient.speakDefault(speakText)
-    }
-
-    /**
-     * 注册免唤醒命令
-     * @param customType 命令
-     * @param customWakeupCmd 命令对应的唤醒词集合
-     */
-    fun registerCustomWakeupCmd(customType: String, customWakeupCmd: Array<String>) {
-        voiceClient.registerCustomWakeupCmd(customType, customWakeupCmd)
-    }
-
-    /**
-     * 取消免唤醒命令
-     * @param customType 命令
-     */
-    fun unRegisterCustomWakeupCmd(customType: String) {
-        try {
-            voiceClient.unRegisterCustomWakeupCmd(customType)
-        } catch (e:Exception){
-
-        }
-    }
-
-    /**
-     * 释放资源(界面销毁的时候调用)
-     */
-    fun release() {
-        voiceClient.release()
-    }
-
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import com.elegant.analytics.Analytics
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.network.Utils
-import com.zhidao.roadcondition.aspect.DebugLog
 import java.util.HashMap

 const val CarNet_Alive:String = "CarNet_Alive"//探路日活DAU埋点
@@ -38,7 +37,6 @@ const val CarNet_Geo:String = "CarNet_Geo_Location" //上传服务端, type=1开

 const val CarNet_live_broadcast = "CarNet_live_broadcast" // 地图页面点击直播（在线可直播车机）
 //自定义埋点
-@DebugLog
 fun trackNormalEvent(event: String, _data: MutableMap<String, Any>?, context: Context = AbsMogoApplication.getApp().applicationContext) {
    var data = _data
    if (data == null) {
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/DeviceUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/DeviceUtil.kt
@@ -3,35 +3,14 @@
 package com.zhidao.roadcondition.util

 import android.content.Context
-import java.lang.reflect.InvocationTargetException
-
-private const val SN_INFO: String = "gsm.serial"
-
-fun getSn(): String {
-    var serial = ""
-    try {
-        var cls = Class.forName("android.os.SystemProperties")
-        var method = cls.getMethod("get", String::class.java)
-        serial = method.invoke(cls, SN_INFO) as String
-    } catch (var4: ClassNotFoundException) {
-        var4.printStackTrace()
-    } catch (var5: NoSuchMethodException) {
-        var5.printStackTrace()
-    } catch (var6: InvocationTargetException) {
-        var6.printStackTrace()
-    } catch (var7: IllegalAccessException) {
-        var7.printStackTrace()
-    }
-    return serial
-}

 fun getSystemVersion(context: Context): String {
    try {
-        var cls = context.classLoader
-        var systemProperties = cls.loadClass("android.os.SystemProperties")
-        var paramTypes = String::class.java
+        val cls = context.classLoader
+        val systemProperties = cls.loadClass("android.os.SystemProperties")
+        val paramTypes = String::class.java
        val get = systemProperties.getMethod("get", paramTypes)
-        val version = get.invoke(systemProperties, *arrayOf<Any>("ro.fota.version")) as String
+        val version = get.invoke(systemProperties, "ro.fota.version") as String
            return if (!version.trim().isNullOrEmpty()) version.trim() else ""
    } catch (e: Exception) {
        e.printStackTrace()
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt
@@ -3,7 +3,6 @@ package com.zhidao.roadcondition.util
 import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
 import android.os.Environment
-import android.util.Log
 import okhttp3.MediaType
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -14,21 +13,21 @@ import java.util.*

 //创建文件上传请求体
 fun fileToMultiPart(fileUrl: String): MultipartBody.Part? {
-    var file = File(fileUrl)
+    val file = File(fileUrl)
    if (file.exists()) {
-        var requestBody = RequestBody.create(MediaType.parse("image/jpg"), file)
+        val requestBody = RequestBody.create(MediaType.parse("image/jpg"), file)
        return MultipartBody.Part.createFormData("file", file.name, requestBody)
    }
    return null
 }

 fun deletePicFile(filePath: String?): Boolean {
-    var file = File(filePath)
+    val file = File(filePath)
    if (file.exists()) {
        //如果图片地址包含此路径则是C上面的拍照，需要再删除后摄图片
        if (filePath!!.contains("usbotg-1-1.1")) {
            //将地址替换成后摄图片地址
-            var backFile =
+            val backFile =
                File(filePath.replace("frontPic", "backPic").replace("PhotoFront", "PhotoBack"))
            if (backFile.exists()) {
                return backFile.delete()
@@ -64,7 +63,7 @@ fun deleteAllFile(file: File?) { //判断文件不为null或文件目录存在
 //根据本地视频文件生成缩略图文件
 fun getVideoThumbnail(filePath: String, picPath: String): Boolean {
    var b: Bitmap? = null
-    var retriever = MediaMetadataRetriever()
+    val retriever = MediaMetadataRetriever()
    try {
        retriever.setDataSource(filePath)
        b = retriever.getFrameAtTime(0)
@@ -92,7 +91,7 @@ fun bitmapToFile(bitmap: Bitmap?, filePath: String): Boolean {
            file.delete()
        file.createNewFile()
        val fos = FileOutputStream(file)
-        var ins = ByteArrayInputStream(baos.toByteArray())
+        val ins = ByteArrayInputStream(baos.toByteArray())
        var x = 0
        val b = ByteArray(1024 * 100)
        while ({ x = ins.read(b);x }() != -1) {
@@ -130,50 +129,4 @@ fun getCompressVideoPath(): String {
    }

    return destPath.absolutePath
-}
-
-
-/**
- * 保存图片到本地
- */
-fun saveImageToSdcard(bmp: Bitmap): Boolean {
-    val currentFile: File
-    var fos: FileOutputStream? = null
-
-    val picFile = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)
-    picFile.mkdirs()
-
-    val builder = StringBuilder()
-    builder.append("splash_bg")
-    val filePrefix = builder.toString()
-    val fileOut = ".jpg"
-    currentFile = File(picFile, filePrefix + fileOut)
-
-    try {
-        fos = FileOutputStream(currentFile)
-        bmp.compress(Bitmap.CompressFormat.JPEG, 100, fos)
-        fos.flush()
-    } catch (e: FileNotFoundException) {
-        e.printStackTrace()
-        return false
-    } catch (e: IOException) {
-        e.printStackTrace()
-        return false
-    } finally {
-        try {
-            fos?.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-            return false
-        }
-    }
-    return true
-}
-
-
-/**
- * 获取本地保存的图片地址
- */
-fun getImagePath(): String {
-    return "/mnt/sdcard/Pictures/splash_bg.jpg"
-}
+}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
@@ -11,7 +11,7 @@ import com.mogo.map.search.geo.query.MogoRegeocodeQuery
 import com.mogo.module.common.MogoApisHandler
 import com.zhidao.roadcondition.model.LocationInfo

-private fun MogoRegeocodeAddress.toLocInfo(
+private fun toLocInfo(
        address: MogoRegeocodeAddress,
        latlngPoint: MogoLatLng
 ): LocationInfo {
@@ -29,7 +29,7 @@ private fun MogoRegeocodeAddress.toLocInfo(
    )
 }

-private fun MogoLocation.toLocInfo(location: MogoLocation): LocationInfo {
+private fun toLocInfo(location: MogoLocation): LocationInfo {
    return LocationInfo(
            location.province,
            location.cityName,
@@ -104,7 +104,7 @@ class LocationUtil private constructor() {
            locationInfo!!
        } else {
            val location = MogoApisHandler.getInstance().apis.mapServiceApi.getSingletonLocationClient(mContext).lastKnowLocation
-            location.toLocInfo(location)
+            toLocInfo(location)
        }
    }

@@ -114,8 +114,8 @@ class LocationUtil private constructor() {
        locGeoCode: (((locInfo: LocationInfo) -> Unit)),
        onError: ((msg: String) -> Unit)
    ) {
-        var geocoderSearch = MogoApisHandler.getInstance().apis.mapServiceApi.getGeoSearch(AbsMogoApplication.getApp().applicationContext)
-        var regeocodeQuery = MogoRegeocodeQuery()
+        val geocoderSearch = MogoApisHandler.getInstance().apis.mapServiceApi.getGeoSearch(AbsMogoApplication.getApp().applicationContext)
+        val regeocodeQuery = MogoRegeocodeQuery()
        regeocodeQuery.latlngType = ""
        regeocodeQuery.point = latlngPoint
        regeocodeQuery.radius = 200
@@ -126,13 +126,13 @@ class LocationUtil private constructor() {
            override fun onRegeocodeSearched(regeocodeResult: MogoRegeocodeResult?) {
                super.onRegeocodeSearched(regeocodeResult)
                if( regeocodeResult == null ){
-                    trackUploadGeo(3);
+                    trackUploadGeo(3)
                    onError.invoke("geoCode")
                } else {
-                    trackUploadGeo(2);
-                    var regeocodeAddress = regeocodeResult?.regeocodeAddress
+                    trackUploadGeo(2)
+                    val regeocodeAddress = regeocodeResult.regeocodeAddress
                    regeocodeAddress?.let {
-                        var locInfo = regeocodeAddress.toLocInfo(regeocodeAddress, latlngPoint)
+                        val locInfo = toLocInfo(regeocodeAddress, latlngPoint)
                        locGeoCode.invoke(locInfo)
                    }
                }
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/PdUtil.kt
@@ -5,7 +5,6 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.network.Utils
-import com.zhidao.roadcondition.constant.TANLU_ROAD_CURRENT
 import com.zhidao.roadcondition.model.InformationBody
 import com.zhidao.roadcondition.model.LocationInfo
 import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG
@@ -13,16 +12,6 @@ import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO
 import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyType
 import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyValidity

-var array: Array<LocationInfo> = arrayOf(
-    LocationInfo(116.40320588562773, 39.96661385462713, "测试数据1", 123123213),
-    LocationInfo(116.41309250805662, 39.970285228355976, "测试数据2", 123123213),
-    LocationInfo(116.40749205563353, 39.97317943101997, "测试数据3", 12321321321),
-    LocationInfo(116.39925230953978, 39.97314654304226, "测试数据4", 123123123),
-    LocationInfo(116.439366, 39.868472, "测试数据5", 123123123),
-    LocationInfo(116.288164, 39.910547, "测试数据6", 123123123),
-    LocationInfo(116.330132, 39.989311, "测试数据7", 123123123)
-)
-
 fun getInformationBody(
    types: Int,
    urls: Map<String, String>,
@@ -37,21 +26,21 @@ fun getInformationBody(
    speed: Float,
    fromType: String
 ): InformationBody {
-    var jsonArray = JsonArray()
-    var type: Int
+    val jsonArray = JsonArray()
+    val type: Int
    type = if (types == INFO_TYPE_VIDEO) {
-        var videoObject = JsonObject()
+        val videoObject = JsonObject()
        videoObject.addProperty("thumbnail", urls["thumb"])
        videoObject.addProperty("url", urls["video"])
        jsonArray.add(videoObject)
        INFO_TYPE_VIDEO
    } else {
-        var urlObject = JsonObject()
+        val urlObject = JsonObject()
        urlObject.addProperty("url", urls["pic"])
        jsonArray.add(urlObject)
        INFO_TYPE_IMG
    }
-    var infoType = if (isCustom) 1 else 0
+    val infoType = if (isCustom) 1 else 0
    Log.d("MainServiceController", "isCustom = $isCustom ---- infoType = $infoType")
    return InformationBody(
        jsonArray.toString(),
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SharedPreferenceUtil.kt
@@ -1,123 +1,17 @@
 package com.zhidao.roadcondition.util

 import android.content.Context
-import android.util.Log
 import androidx.core.content.edit
 import com.mogo.commons.AbsMogoApplication
-import com.zhidao.roadcondition.aspect.DebugLog

 const val FILE_NAME = "settings_data"
-const val FILE_NAME_NAVI = "settings_navi_data"
-const val FILE_NAME_ACTIVE = "settings_active_data"

-const val NAVI_INFO = "NAVI_INFO"   //沿途导航数据存储
-const val NAVI_INFO_STATUS = "NAVI_INFO_STATUS"    //沿途导航路线是否存在
-
-const val PARAM_AUTHORIZATION = "PARAM_AUTHORIZATION"
-const val PARAM_PROMOTION_CONTENT = "PARAM_PROMOTION_CONTENT"
-const val PARAM_ACTIVE_WEB_URL = "PARAM_ACTIVE_WEB_URL"
-const val PARAM_ACTIVE_IMG_URL = "PARAM_ACTIVE_IMG_URL"
-const val PARAM_ACTIVE_STATUS = "PARAM_ACTIVE_STATUS"
-
-
-const val LAST_ENTER_TIME = "LAST_ENTER_TIME"
 const val PIC_NUMBER = "PIC_NUMBER"    //图片拍摄张数
 const val VIDEO_DURATION_DEFAULT = 10_000L   //视频拍摄时长
 const val PIC_NUMBER_DEFAULT = 1L   //图片拍摄张数

-const val TIME_QUANTUM = "time_quantum"  //时间段
-const val COUNT_DOWN_TIME = "count_down"  //倒计时
-const val VOICE_TEXT = "voice_text" //语音播报内容
-const val IS_SAVE_SPLASH = "is_save_splash" //是否保存了
-
-//播放开始时间
-const val PLAYER_START_TIME = "first_time"
-
-
-fun clearActiveInfo(context: Context = AbsMogoApplication.getApp().applicationContext) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_ACTIVE, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        clear()
-        val clearActiveInfo = commit()
-        Log.d(FILE_NAME_NAVI, "clearActiveInfo = $clearActiveInfo")
-    }
-}
-
-fun setActiveWebUrl(content: String, context: Context = AbsMogoApplication.getApp().applicationContext) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_ACTIVE, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        putString(PARAM_ACTIVE_WEB_URL, content)
-            .commit()
-    }
-}
-
-fun setActiveStatus(status: Int, context: Context = AbsMogoApplication.getApp().applicationContext) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_ACTIVE, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        putInt(PARAM_ACTIVE_STATUS, status)
-            .commit()
-    }
-}
-
-fun getActiveStatus(context: Context): Int {
-    return context.getSharedPreferences(FILE_NAME_ACTIVE, Context.MODE_PRIVATE)
-        .getInt(PARAM_ACTIVE_STATUS, 0)
-}
-
-fun setPromotionContent(content: String, context: Context = AbsMogoApplication.getApp().applicationContext) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        putString(PARAM_PROMOTION_CONTENT, content)
-            .commit()
-    }
-}
-
-fun isAuthorization(context: Context): Boolean {
-    return context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
-        .getBoolean(PARAM_AUTHORIZATION, false)
-}
-
-@DebugLog
-fun setAuthorization(context: Context, authorization: Boolean) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        putBoolean(PARAM_AUTHORIZATION, authorization)
-            .commit()
-    }
-}
-
-
-@DebugLog
-fun setNaviInfo(context: Context, naviInfo: String) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_NAVI, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        val naviInfoSave = putString(NAVI_INFO, naviInfo)
-            .commit()
-        Log.d(FILE_NAME_NAVI, "naviInfoSave = $naviInfoSave")
-    }
-}
-
-@DebugLog
-fun setNaviInfoStatus(context: Context, naviInfoStatus: Boolean) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_NAVI, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        val naviInfoSaveStatus = putBoolean(NAVI_INFO_STATUS, naviInfoStatus)
-            .commit()
-        Log.d(FILE_NAME_NAVI, "naviInfoSaveStatus = $naviInfoSaveStatus")
-    }
-}
-
-fun clearAllNaviInfo(context: Context) {
-    var sharedPreferences = context.getSharedPreferences(FILE_NAME_NAVI, Context.MODE_PRIVATE)
-    sharedPreferences.edit {
-        clear()
-        val naviInfoAllClear = commit()
-        Log.d(FILE_NAME_NAVI, "naviInfoAllClear = $naviInfoAllClear")
-    }
-}
-
 fun putLong(key: String, value: Long) {
-    var sharedPreferences =
+    val sharedPreferences =
        AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
    sharedPreferences.edit {
        putLong(key, value).apply()
@@ -129,42 +23,27 @@ fun getLong(key: String, defaultValue: Long): Long {
        .getLong(key, defaultValue)
 }

-
 fun putInt(key: String, value: Int) {
-    var sharedPreferences =
+    val sharedPreferences =
        AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
    sharedPreferences.edit {
        putInt(key, value).apply()
    }
 }

-
 fun getInt(key: String, defaultValue: Int): Int {
    return AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
        .getInt(key, defaultValue)
 }

 fun putCommonString(key: String, value: String) {
-    var sharedPreferences =
+    val sharedPreferences =
        AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
    sharedPreferences.edit {
        putString(key, value).apply()
    }
 }

-//fun getCommonString(key: String?, defaultValue: String?): String {
-//    return AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
-//        .getString(key, defaultValue)
-//}
-//
-//fun putCommonBoolean(key: String, value: Boolean) {
-//    var sharedPreferences =
-//        AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
-//    sharedPreferences.edit {
-//        putBoolean(key, value).apply()
-//    }
-//}
-
 fun getCommonBoolean(key: String, defaultValue: Boolean): Boolean {
    return AbsMogoApplication.getApp().applicationContext.getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
        .getBoolean(key, defaultValue)
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StrategyPreferenceUtil.kt
@@ -35,7 +35,7 @@ class StrategyPreferenceUtil {
    companion object {
        //保存策略类型，在AccOff的时候清除数据，更新时需要在没有情报上传时操作
        fun setStrategyType(context: Context, strategyType: Int, type: String) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_TYPE_COPY, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putInt(STRATEGY_TYPE + type, strategyType).commit()
@@ -51,7 +51,7 @@ class StrategyPreferenceUtil {
        }

        fun clearStrategyType(context: Context) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_TYPE_COPY, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                clear()
@@ -66,7 +66,7 @@ class StrategyPreferenceUtil {
            infoType: String,
            frequency: Int
        ) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_FILE_NAME, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putInt(
@@ -98,7 +98,7 @@ class StrategyPreferenceUtil {
            infoType: String,
            interval: Long
        ) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_FILE_NAME, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putLong(
@@ -130,7 +130,7 @@ class StrategyPreferenceUtil {
            infoType: String,
            validity: Int
        ) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_FILE_NAME, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putInt(
@@ -154,7 +154,7 @@ class StrategyPreferenceUtil {
            infoType: String,
            maxSpeed: Int
        ) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_FILE_NAME, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putInt(
@@ -178,7 +178,7 @@ class StrategyPreferenceUtil {
            infoType: String,
            minSpeed: Int
        ) {
-            var sharedPreferences =
+            val sharedPreferences =
                context.getSharedPreferences(STRATEGY_FILE_NAME, Context.MODE_PRIVATE)
            sharedPreferences.edit {
                putInt(
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StringUitl.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/StringUitl.kt
@@ -1,17 +0,0 @@
-package com.zhidao.roadcondition.util
-
-import android.text.format.DateFormat
-
-const val format = "yy/MM/dd kk:mm:ss"
-
-fun formatDate(time: Long): String {
-    return DateFormat.format(format, time).toString()
-}
-
-fun convertVar(param: Any?): Any? {
-    return if (param is String) {
-        "\"$param\""
-    } else {
-        param
-    }
-}
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SystemUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/SystemUtil.kt
@@ -1,12 +0,0 @@
-package com.zhidao.roadcondition.util
-
-import android.content.Context
-import android.content.Intent
-
-fun isReiceverRegist(context: Context, intentAction: String): Boolean {
-    val intent = Intent()
-    intent.action = intentAction
-    val pm = context.packageManager
-    val resolveInfos = pm.queryBroadcastReceivers(intent, 0)
-    return resolveInfos != null && resolveInfos.isNotEmpty()
-}
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
@@ -28,9 +28,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
    private MogoImageView mIvReportHead;
    private ImageView pushVideoClose;

-    // 弹窗状态监听
-//    private CameraLiveWindowStatusListener mWindowStatusListener;
-
    // 直播30秒自动关闭
    private static Handler handlerV2XEvent = new Handler();
    private static Runnable runnableV2XEvent;
@@ -84,9 +81,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
            }

            countDownV2XEvent(entity);
-//            if (mWindowStatusListener != null) {
-//                mWindowStatusListener.onViewShow();
-//            }
        }
    }

@@ -97,16 +91,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo

    @Override
    public void close() {
-        // 修改地图比例
-//        V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(MODULE_NAME, true, false);
-        // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随
-//        MarkerUtils.resetMapZoom(16);
-
-        // 如果窗体处于展示的时候
-//        if (mWindowStatusListener != null) {
-//            mWindowStatusListener.onViewClose();
-//        }
-
        // 停止倒计时
        if (handlerV2XEvent != null && runnableV2XEvent != null) {
            handlerV2XEvent.removeCallbacks(runnableV2XEvent);
@@ -119,12 +103,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
                .removeView(this);
    }

-
-//    @Override
-//    public void setWindowStatusListener(CameraLiveWindowStatusListener listener) {
-//        this.mWindowStatusListener = listener;
-//    }
-
    /**
     * 窗体倒计时 TODO
     */
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -25,10 +25,10 @@ import com.mogo.utils.logger.Logger;


 /**
- * vr模式下，红绿灯消息 AdasNoticeHelper
+ * vr模式下，摄像头消息 AdasNoticeHelper
 */
 public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<MogoSnapshotSetData> {
-    private static final String TAG = "liyz";
+    private static final String TAG = "CameraLiveNoticeHelper";
    private Context mContext;
    private static IMogoMarker mMogoMarker;
    private CloudRoadData mCloudRoadData;
@@ -84,22 +84,23 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     */
    private void addVrCameraMarker(CloudRoadData roadData) {
        Logger.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);

-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
-            mMogoMarker.showInfoWindow();
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
+                mMogoMarker.showInfoWindow();
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
        }
    }

@@ -110,22 +111,22 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     */
    private void addNormalCameraMarker(CloudRoadData roadData) {
        Logger.d(TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        mMogoMarker.hideInfoWindow();
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            mMogoMarker.hideInfoWindow();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);

-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
-
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
        }
    }

@@ -154,26 +155,30 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
        if (obj != null) {
            mCloudRoadData = obj.getCamera();
            if (mCloudRoadData != null) {
-                Logger.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
+                Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
                if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) {
                    if (isVrMode == isVrModeMarker) {
                        // do nothing.
+                        Log.e(TAG, "-------------1------------");
                    } else {
                        if (isVrMode) {
                            addVrCameraMarker(mCloudRoadData);
                            isVrModeMarker = true;
+                            Log.d(TAG, "-------------2------------");
                        } else {
                            addNormalCameraMarker(mCloudRoadData);
+                            Log.d(TAG, "-------------3------------");
                            isVrModeMarker = false;
                        }
                    }
                } else {
-                    Logger.d(TAG, "mCurrentUuid  !=   ----------");
                    mCurrentUuid = mCloudRoadData.getUuid();
                    if (isVrMode) {
+                        Log.d(TAG, "-------------4------------");
                        addVrCameraMarker(mCloudRoadData);
                        isVrModeMarker = true;
                    } else {
+                        Log.d(TAG, "-------------5------------");
                        addNormalCameraMarker(mCloudRoadData);
                        isVrModeMarker = false;
                    }
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -88,7 +88,7 @@

    <!--    module_map_layout_navi_info_panel.xml-->
    <dimen name="module_ext_top_view_width">1058px</dimen>
-    <dimen name="module_ext_top_view_width_in_vr_mode">760px</dimen>
+    <dimen name="module_ext_top_view_width_in_vr_mode">822px</dimen>
    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">700px</dimen>
    <dimen name="module_ext_navi_info_panel_width">544px</dimen>
    <dimen name="module_ext_navi_info_panel_height">117px</dimen>
--- a/modules/mogo-module-guide/build.gradle
+++ b/modules/mogo-module-guide/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.alibaba.arouter'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'android-aspectjx'

 android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -51,7 +50,6 @@ dependencies {
    implementation rootProject.ext.dependencies.androidxviewpager2
    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
-    implementation rootProject.ext.dependencies.aspectj
    implementation rootProject.ext.dependencies.indicator

    if (Boolean.valueOf(RELEASE)) {
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -150,7 +150,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
                mPauseImage = mWindowView.findViewById(R.id.window_play_pause_new);

                if (mPauseImage != null) {
-                    mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                    mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
                }

                int yPos =
@@ -294,7 +294,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
                if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) {
                    // kw音乐做的容错
                    if (mPauseImage != null) {
-                        mPauseImage.setImageResource(R.drawable.module_media_window_pop_play);
+                        mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
                    }
                    if (mAnimCircleImageView != null) {
                        mAnimCircleImageView.startAnim();
@@ -314,7 +314,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
 //                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
                }else{
                    Logger.e(TAG, "mMediaInfoData == null  ");
-                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img);
+                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img_new);
                }
            }
        } else {
@@ -371,7 +371,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
        updateWindowUI(false);
        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
            if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_play);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
            }

            if (mAnimCircleImageView != null) {
@@ -396,7 +396,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
        Log.d(TAG, "onMusicPause: ===" + mMediaInfoData);
        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
            if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
            }

            if (mAnimCircleImageView != null) {
@@ -421,7 +421,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
        Log.d(TAG, "onMusicStopped===" + mMediaInfoData);
        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
            if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
            }

            if (mAnimCircleImageView != null) {
--- a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png
+++ b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png
--- a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png
+++ b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png
--- a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png
+++ b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
+++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
@@ -32,7 +32,8 @@
        android:id="@+id/window_circle_img_new"
        android:layout_width="@dimen/module_media_pop_window_anim_img_size_new"
        android:layout_height="@dimen/module_media_pop_window_anim_img_size_new"
-        android:src="@drawable/module_media_default_music_img"
+        android:src="@drawable/module_media_default_music_img_new"
+        android:scaleType="fitCenter"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
@@ -43,7 +44,7 @@
        android:layout_width="@dimen/module_media_pop_window_pause"
        android:layout_height="@dimen/module_media_pop_window_pause"
        android:background="@drawable/module_media_play_bg_selector"
-        android:src="@drawable/module_media_window_pop_play"
+        android:src="@drawable/module_media_window_pop_play_new"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
@@ -71,7 +71,7 @@
    <dimen name="module_media_pop_window_anim_img_size">80px</dimen>
    <dimen name="module_media_pop_window_anim_img_size_new">101px</dimen>
    <dimen name="module_media_pop_window_pause">60px</dimen>
-    <dimen name="module_media_pop_window_size">116px</dimen>
+    <dimen name="module_media_pop_window_size">115px</dimen>
    <dimen name="module_media_pop_window_text_width">230px</dimen>
    <dimen name="module_media_pop_window_text_margin">14px</dimen>
    <dimen name="module_media_pop_window_text_top_size">35px</dimen>
--- a/modules/mogo-module-media/src/main/res/values/colors.xml
+++ b/modules/mogo-module-media/src/main/res/values/colors.xml
@@ -3,5 +3,7 @@
    <color name="modules_media_music_title_text_color">#fff</color>
    <color name="modules_media_music_time_text_color">#7affffff</color>
    <color name="modules_media_music_bg_color">#444E6E</color>
-    <color name="modules_media_music_circle_color">#80ffffff</color>
+    <color name="modules_media_music_circle_color">#f6ffffff</color>
+    <color name="modules_media_music_circle_color_start">#1Affffff</color>
+    <color name="modules_media_music_circle_color_end">#ffffff</color>
 </resources>
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -3,7 +3,6 @@ package com.mogo.module.small.map;
 import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
@@ -15,21 +14,13 @@ import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.maps.AMap;
 import com.amap.api.maps.CameraUpdate;
 import com.amap.api.maps.CameraUpdateFactory;
-import com.amap.api.maps.TextureMapView;
 import com.amap.api.maps.UiSettings;
-import com.amap.api.maps.model.BitmapDescriptor;
-import com.amap.api.maps.model.BitmapDescriptorFactory;
 import com.amap.api.maps.model.CameraPosition;
-import com.amap.api.maps.model.CustomMapStyleOptions;
 import com.amap.api.maps.model.MyLocationStyle;
 import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.module.common.view.RoundLayout;
 import com.mogo.module.small.map.animation.DirectionRotateAnimation;
-import com.mogo.module.small.map.utils.MapAssetStyleUtils;
-
-import java.io.IOException;
-import java.io.InputStream;

 /**
 * 小地图的方向View
@@ -71,9 +62,20 @@ public class SmallMapDirectionView extends RoundLayout {
        mIvMapBorder = findViewById(R.id.ivMapBorder);
        mAMapNaviView = findViewById(R.id.aMapNaviView);
        mAMapNaviView.onCreate(null);
+
        // 车头朝上
        mAMapNaviView.setNaviMode(AMapNaviView.CAR_UP_MODE);
+        // 设置电子眼所在路线的可见性
+        mAMapNaviView.setRouteOverlayVisible(false);
        mAMap = mAMapNaviView.getMap();
+        // 关闭地图文字标注
+        mAMap.showMapText(false);
+        // 设置地图的样式
+        mUiSettings = mAMap.getUiSettings();
+        mUiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
+        mUiSettings.setAllGesturesEnabled(false);// 所有手势
+        mUiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮
+        mUiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可

        // 导航地图
        AMapNaviViewOptions options = mAMapNaviView.getViewOptions();
@@ -95,8 +97,6 @@ public class SmallMapDirectionView extends RoundLayout {
                    R.drawable.icon_module_small_map_four_corners));
            // 设置指南针图标否在导航界面显示，默认显示。true，显示；false，隐藏。
            options.setCompassEnabled(false);
-            // 黑夜模式
-            options.setNaviNight(true);
            //设置路况光柱条是否显示（只适用于驾车导航，需要联网）。
            options.setTrafficBarEnabled(false);
            // 设置[实时交通图层开关按钮]是否显示（只适用于驾车导航，需要联网）。
@@ -137,27 +137,17 @@ public class SmallMapDirectionView extends RoundLayout {
            //options.setPointToCenter(0.7D, 0.5D);
            // 2D模式
            options.setTilt(0);
+            // 黑夜模式
+            options.setNaviNight(true);
+            // 自定义地图样式
+//            options.setCustomMapStylePath("/mnt/sdcard/amap/style.data");
            mAMapNaviView.setViewOptions(options);
        }
-        // 设置电子眼所在路线的可见性
-        mAMapNaviView.setRouteOverlayVisible(false);
-        // 设置是否隐藏AMapNaviView上的CarOverlay，包括自车、罗盘
-        mAMapNaviView.setCarOverlayVisible(true);
-        mAMapNaviView.setViewOptions(options);

        //设置希望展示的地图缩放级别
        mCameraUpdate = CameraUpdateFactory.zoomTo(12);
        mAMap.moveCamera(mCameraUpdate);

-        // 设置当前位置的样式
-//        myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类
-//        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。
-//        myLocationStyle.interval(1000); //设置连续定位模式下的定位间隔，只在连续定位模式下生效，单次定位模式下不会生效。单位为毫秒。
-//        BitmapDescriptor location = BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo);
-//        myLocationStyle.myLocationIcon(location);
-//        mAMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style
-//        mAMap.setMyLocationEnabled(true);// 设置为true表示启动显示定位蓝点，false表示隐藏定位蓝点并不进行定位，默认是false。
-
        mAMap.setOnCameraChangeListener(new AMap.OnCameraChangeListener() {
            @Override
            public void onCameraChange(CameraPosition cameraPosition) {
@@ -173,22 +163,20 @@ public class SmallMapDirectionView extends RoundLayout {
            }
        });

-        // 关闭地图文字标注
-        mAMap.showMapText(false);
+//        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions();
+//        customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(context));
+//        customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(context));
+//        customMapStyleOptions.setEnable(true);
+//        mAMap.setCustomMapStyle(customMapStyleOptions);

-        // 设置地图的样式
-        mUiSettings = mAMap.getUiSettings();
-        mUiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
-        mUiSettings.setAllGesturesEnabled(false);// 所有手势
-        mUiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮
-        mUiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可
-
-
-        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions();
-        customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(context));
-        customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(context));
-        customMapStyleOptions.setEnable(true);
-        mAMap.setCustomMapStyle(customMapStyleOptions);
+        // 设置当前位置的样式
+//        myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类
+//        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。
+//        myLocationStyle.interval(1000); //设置连续定位模式下的定位间隔，只在连续定位模式下生效，单次定位模式下不会生效。单位为毫秒。
+//        BitmapDescriptor location = BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo);
+//        myLocationStyle.myLocationIcon(location);
+//        mAMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style
+//        mAMap.setMyLocationEnabled(true);// 设置为true表示启动显示定位蓝点，false表示隐藏定位蓝点并不进行定位，默认是false。

    }

--- a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java
+++ b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java
@@ -0,0 +1,18 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.enums.RouteType;
+import com.alibaba.android.arouter.facade.model.RouteMeta;
+import com.alibaba.android.arouter.facade.template.IRouteGroup;
+import com.mogo.module.tanlu.fragment.TanluCardViewProvider;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Group$$tanlu implements IRouteGroup {
+  @Override
+  public void loadInto(Map<String, RouteMeta> atlas) {
+    atlas.put("/tanlu/ui", RouteMeta.build(RouteType.PROVIDER, TanluCardViewProvider.class, "/tanlu/ui", "tanlu", null, -1, -2147483648));
+  }
+}
--- a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java
+++ b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.java
@@ -0,0 +1,18 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.enums.RouteType;
+import com.alibaba.android.arouter.facade.model.RouteMeta;
+import com.alibaba.android.arouter.facade.template.IProviderGroup;
+import com.mogo.module.tanlu.fragment.TanluCardViewProvider;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Providers$$mogomoduletanlu implements IProviderGroup {
+  @Override
+  public void loadInto(Map<String, RouteMeta> providers) {
+    providers.put("com.mogo.service.tanlu.IMogoTanluUiProvider", RouteMeta.build(RouteType.PROVIDER, TanluCardViewProvider.class, "/tanlu/ui", "tanlu", null, -1, -2147483648));
+  }
+}
--- a/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java
+++ b/modules/mogo-module-tanlu/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.java
@@ -0,0 +1,17 @@
+package com.alibaba.android.arouter.routes;
+
+import com.alibaba.android.arouter.facade.template.IRouteGroup;
+import com.alibaba.android.arouter.facade.template.IRouteRoot;
+import java.lang.Class;
+import java.lang.Override;
+import java.lang.String;
+import java.util.Map;
+
+/**
+ * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
+public class ARouter$$Root$$mogomoduletanlu implements IRouteRoot {
+  @Override
+  public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
+    routes.put("tanlu", ARouter$$Group$$tanlu.class);
+  }
+}
--- a/modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java
+++ b/modules/mogo-module-tanlu/build/generated/source/buildConfig/debug/com/mogo/module/tanlu/BuildConfig.java
@@ -0,0 +1,18 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mogo.module.tanlu;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.module.tanlu";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
+  public static final String APPLICATION_ID = "com.mogo.module.tanlu";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.3.1.24";
+}
--- a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.module.tanlu"
+    android:versionCode="1"
+    android:versionName="1.3.1.24" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="22" />
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application>
+        <activity
+            android:name="com.mogo.module.tanlu.video.FullMediaActivity"
+            android:hardwareAccelerated="true" >
+        </activity>
+
+        <receiver android:name="com.mogo.module.tanlu.receiver.MarkerInfoReceiver" >
+            <intent-filter>
+                <action android:name="com.zhidao.roadcondition.marker.info" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.mogo.module.tanlu.receiver.GetInfoFailedReceiver" >
+            <intent-filter>
+                <action android:name="com.zhidao.roadcondition.getinfo.failed" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.mogo.module.tanlu.receiver.PushReceiver" >
+            <intent-filter>
+                <action android:name="com.zhidao.roadcondition.split" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.mogo.module.tanlu.receiver.ShareDialogReceiver" >
+            <intent-filter>
+                <action android:name="com.zhidao.sharedialog" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.mogo.module.tanlu.receiver.DataErrorReceiver" >
+            <intent-filter>
+                <action android:name="com.zhidao.tanlu.dataerror" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>
--- a/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
+++ b/modules/mogo-module-tanlu/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.3.1.24","enabled":true,"outputFile":"mogo-module-tanlu-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.module.tanlu","split":""}}]
--- a/modules/mogo-module-tanlu/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ b/modules/mogo-module-tanlu/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
@@ -0,0 +1 @@
+{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
--- a/modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar
+++ b/modules/mogo-module-tanlu/build/intermediates/compile_library_classes/debug/classes.jar
--- a/modules/mogo-module-tanlu/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
+++ b/modules/mogo-module-tanlu/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\debug\jniLibs"/></dataSet></merger>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\debug\shaders"/></dataSet></merger>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugAssets/merger.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\main\assets"/><source path="F:\Station\Launcher\modules\mogo-module-tanlu\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Station\Launcher\modules\mogo-module-tanlu\src\debug\assets"/></dataSet></merger>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -0,0 +1,135 @@
+#Tue Dec 15 19:30:07 CST 2020
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_left_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_solid_left_page_up_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_heart_like.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\share_failed_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_upload_222533.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_upload_222533.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\module_tanlu_upload_fail.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_left_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_solid_left_page_up_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_normal_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\media_previous.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_navi.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_dialog_neterror_layout.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_dialog_neterror_layout.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_like.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_222533.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\main_view_empty_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_right_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_solid_right_page_up_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_heart_unlike.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_chat_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_view_empty_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_normal_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_video_cover_media.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_item_video_cover_media.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_video_pause_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\app_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\app_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_main_media_recycler.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_item_main_media_recycler.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_navi.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_chat_nomal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_play.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_bg_btn_play.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_right_page_up_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_solid_right_page_up_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_head_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_heart_like_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_heart_unlike_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_event_type_red_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_event_type_red_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_heart_like.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_heart_like_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\module_tanlu_upload_success.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_solid_left_page_up.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_bg_solid_left_page_up.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\icon_window_close_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_window_close_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_normal_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\loading_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\loading_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_like.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\anim\\v2x_like_heart_animation.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\anim\\v2x_like_heart_animation.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\share_failed_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_dialog_cutom_layout.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_dialog_cutom_layout.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_button_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_dialog_button_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\public_arrow_back_iv.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\public_arrow_back_iv.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_main_media_recycler.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_main_media_recycler.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_navi.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_bottom_button_right_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_dialog_bottom_button_right_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_upload_press.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_upload_press.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\main_video_pause_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\app_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\app_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_heart_unlike_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\anim\\v2x_unlike_heart_animation.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\anim\\v2x_unlike_heart_animation.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\media_next.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_icon_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\media_next.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_normal_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_normal_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_chat_btn.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_chat_btn.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_fullscreen_video_view_pager.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_fullscreen_video_view_pager.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\module_tanlu_upload_fail.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_left_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_solid_left_page_up_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_refresh_btn.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_video_refresh_btn.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_icon_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_video_play_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\module_tanlu_upload_success.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_heart_unlike.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533_6px_bottom.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_222533_6px_bottom.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_main_media_recycler_new.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_main_media_recycler_new.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_head_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_alert_window_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_alert_window_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_chat_nomal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_window_close_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_pause.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_bg_btn_pause.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_head_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_tanlu_top_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_tanlu_top_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_99191c25_4px.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_99191c25_4px.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_chat_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_unlike_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_heart_unlike_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_heart_like.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_heart_like.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_top_bg.9.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_top_bg.9.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_right_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_solid_right_page_up_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_solid_left_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_solid_left_page_up_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\main_video_pause_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_refresh_btn.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_video_refresh_btn.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\share_failed_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\media_previous.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\media_previous.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_icon_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_heart_unlike.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_heart_unlike.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_type_button_blue_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_type_button_blue_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_solid_right_page_up.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_bg_solid_right_page_up.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\public_arrow_back_iv.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\public_arrow_back_iv.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_navi.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_navi.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_dialog_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\share_failed_icon.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\share_failed_icon.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\module_tanlu_upload_success.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\module_tanlu_upload_success.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\media_next.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_video_cover.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_item_video_cover.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_gradual_change_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_gradual_change_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\module_tanlu_upload_fail.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\module_tanlu_upload_fail.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_chat.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\small_video_seekbar_style.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\small_video_seekbar_style.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_bg_btn_upload.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_bg_btn_upload.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_bg_222533_9px.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_bg_222533_9px.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_view_empty_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\icon_window_close_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat_nomal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_chat_nomal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\tanlu_top_bg.9.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\tanlu_top_bg.9.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_item_main_media_recycler_new.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_item_main_media_recycler_new.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\tanlu_chat_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\tanlu_chat_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_neterror_button_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_dialog_neterror_button_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\selector_btn_close.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_btn_close.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\main_video_play_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_view_empty_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\main_view_empty_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\main_video_play_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\layout\\tanlu_activity_media_full.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\layout\\tanlu_activity_media_full.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\media_next.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\media_next.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\media_previous.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\media_previous.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_heart_like_bg.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_heart_like_bg.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\shape_tanlu_top_bg_light.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\shape_tanlu_top_bg_light.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_window_close_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_window_close_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_chat.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_chat.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\tanlu_icon_logo.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\tanlu_icon_logo.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi\\tanlu_head_image.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\tanlu_head_image.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable\\tanlu_dialog_button_right_bg.xml=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable\\tanlu_dialog_button_right_bg.xml
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\icon_window_close_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_play_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_video_play_btn_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\icon_window_close_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-xhdpi-1920x1000\\icon_window_close_press.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-1920x1000-v4\\icon_window_close_press.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-ldpi\\main_solid_right_page_up_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-ldpi-v4\\main_solid_right_page_up_normal.png
+F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\src\\main\\res\\drawable-mdpi\\main_video_pause_btn_normal.png=F\:\\Station\\Launcher\\modules\\mogo-module-tanlu\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\main_video_pause_btn_normal.png
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-mdpi-v4/values-mdpi-v4.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tanlu_button_radius_size">6px</dimen>
+    <dimen name="tanlu_dialog_button_height">69px</dimen>
+    <dimen name="tanlu_dialog_content_size">22px</dimen>
+    <dimen name="tanlu_dialog_first_margin_top">18px</dimen>
+    <dimen name="tanlu_dialog_height">278px</dimen>
+    <dimen name="tanlu_dialog_margin_button_top">32px</dimen>
+    <dimen name="tanlu_dialog_margin_top">36px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_height">56px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_top">20px</dimen>
+    <dimen name="tanlu_dialog_neterror_margin_left">23px</dimen>
+    <dimen name="tanlu_dialog_neterror_radius">8px</dimen>
+    <dimen name="tanlu_dialog_radius">10px</dimen>
+    <dimen name="tanlu_dialog_width">418px</dimen>
+    <dimen name="tanlu_head_image_size">28px</dimen>
+    <dimen name="tanlu_image_size">56px</dimen>
+    <dimen name="tanlu_module_bottom_height">72px</dimen>
+    <dimen name="tanlu_module_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_button_height">26px</dimen>
+    <dimen name="tanlu_module_card_address_margin_top">5px</dimen>
+    <dimen name="tanlu_module_card_address_size">15px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_bottom">15px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_top">2px</dimen>
+    <dimen name="tanlu_module_card_distance_size">13px</dimen>
+    <dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">2px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop">10px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop_2">23px</dimen>
+    <dimen name="tanlu_module_card_height">186px</dimen>
+    <dimen name="tanlu_module_card_inner_height">176px</dimen>
+    <dimen name="tanlu_module_card_margin_left">6px</dimen>
+    <dimen name="tanlu_module_card_margin_top">13px</dimen>
+    <dimen name="tanlu_module_card_next_margin_left">28px</dimen>
+    <dimen name="tanlu_module_card_next_size">16px</dimen>
+    <dimen name="tanlu_module_card_previous_height">44px</dimen>
+    <dimen name="tanlu_module_card_previous_margin_left">30px</dimen>
+    <dimen name="tanlu_module_card_previous_width">136px</dimen>
+    <dimen name="tanlu_module_card_video_height">158px</dimen>
+    <dimen name="tanlu_module_card_video_marginbottom">19px</dimen>
+    <dimen name="tanlu_module_card_video_width">250px</dimen>
+    <dimen name="tanlu_module_card_width">642px</dimen>
+    <dimen name="tanlu_module_close_height">45px</dimen>
+    <dimen name="tanlu_module_full_back_height">25px</dimen>
+    <dimen name="tanlu_module_full_back_width">25px</dimen>
+    <dimen name="tanlu_module_full_bottom_height">90px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">10px</dimen>
+    <dimen name="tanlu_module_full_bottom_width">700px</dimen>
+    <dimen name="tanlu_module_full_loading_height">96px</dimen>
+    <dimen name="tanlu_module_full_loading_width">96px</dimen>
+    <dimen name="tanlu_module_full_margin_left">16px</dimen>
+    <dimen name="tanlu_module_full_margin_right">48px</dimen>
+    <dimen name="tanlu_module_full_margin_top">22px</dimen>
+    <dimen name="tanlu_module_full_margin_width">700px</dimen>
+    <dimen name="tanlu_module_full_start_height">56px</dimen>
+    <dimen name="tanlu_module_full_start_width">56px</dimen>
+    <dimen name="tanlu_module_full_title_content">18px</dimen>
+    <dimen name="tanlu_module_full_title_time">14px</dimen>
+    <dimen name="tanlu_module_full_top_height">72px</dimen>
+    <dimen name="tanlu_module_loading_height">48px</dimen>
+    <dimen name="tanlu_module_loading_width">48px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">16px</dimen>
+    <dimen name="tanlu_module_map_bottom">32px</dimen>
+    <dimen name="tanlu_module_map_bottom_height">44px</dimen>
+    <dimen name="tanlu_module_map_left">400px</dimen>
+    <dimen name="tanlu_module_map_right">80px</dimen>
+    <dimen name="tanlu_module_map_top">150px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
+    <dimen name="tanlu_module_margin_right">13px</dimen>
+    <dimen name="tanlu_module_margin_top">3px</dimen>
+    <dimen name="tanlu_module_mavi_height">18px</dimen>
+    <dimen name="tanlu_module_radius">22px</dimen>
+    <dimen name="tanlu_module_shade_size">4px</dimen>
+    <dimen name="tanlu_module_small_player_height">6px</dimen>
+    <dimen name="tanlu_module_start_height">52px</dimen>
+    <dimen name="tanlu_module_start_width">52px</dimen>
+    <dimen name="tanlu_module_upload_radius">26px</dimen>
+    <dimen name="tanlu_module_upload_width">260px</dimen>
+    <dimen name="tanlu_normal_image_radius_size">16px</dimen>
+</resources>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-1920x1000-v4/values-xhdpi-1920x1000-v4.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tanlu_button_radius_size">10px</dimen>
+    <dimen name="tanlu_dialog_button_height">130px</dimen>
+    <dimen name="tanlu_dialog_content_size">40px</dimen>
+    <dimen name="tanlu_dialog_first_margin_top">36px</dimen>
+    <dimen name="tanlu_dialog_height">524px</dimen>
+    <dimen name="tanlu_dialog_margin_button_top">59px</dimen>
+    <dimen name="tanlu_dialog_margin_top">66px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_height">105px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_top">44px</dimen>
+    <dimen name="tanlu_dialog_neterror_margin_left">44px</dimen>
+    <dimen name="tanlu_dialog_neterror_radius">16px</dimen>
+    <dimen name="tanlu_dialog_radius">20px</dimen>
+    <dimen name="tanlu_dialog_width">790px</dimen>
+    <dimen name="tanlu_head_image_size">50px</dimen>
+    <dimen name="tanlu_image_size">90px</dimen>
+    <dimen name="tanlu_module_bottom_height">72px</dimen>
+    <dimen name="tanlu_module_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_button_height">46px</dimen>
+    <dimen name="tanlu_module_card_address_margin_top">11px</dimen>
+    <dimen name="tanlu_module_card_address_size">28px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_bottom">28px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_top">4px</dimen>
+    <dimen name="tanlu_module_card_distance_size">26px</dimen>
+    <dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">2px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop">20px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop_2">40px</dimen>
+    <dimen name="tanlu_module_card_height">326px</dimen>
+    <dimen name="tanlu_module_card_inner_height">306px</dimen>
+    <dimen name="tanlu_module_card_margin_left">12px</dimen>
+    <dimen name="tanlu_module_card_margin_top">19px</dimen>
+    <dimen name="tanlu_module_card_next_margin_left">50px</dimen>
+    <dimen name="tanlu_module_card_next_size">30px</dimen>
+    <dimen name="tanlu_module_card_previous_height">82px</dimen>
+    <dimen name="tanlu_module_card_previous_margin_left">60px</dimen>
+    <dimen name="tanlu_module_card_previous_width">255px</dimen>
+    <dimen name="tanlu_module_card_video_height">290px</dimen>
+    <dimen name="tanlu_module_card_video_marginbottom">32px</dimen>
+    <dimen name="tanlu_module_card_video_width">480px</dimen>
+    <dimen name="tanlu_module_card_width">1233px</dimen>
+    <dimen name="tanlu_module_close_height">80px</dimen>
+    <dimen name="tanlu_module_full_back_height">50px</dimen>
+    <dimen name="tanlu_module_full_back_width">50px</dimen>
+    <dimen name="tanlu_module_full_bottom_height">100px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">12px</dimen>
+    <dimen name="tanlu_module_full_bottom_width">700px</dimen>
+    <dimen name="tanlu_module_full_loading_height">96px</dimen>
+    <dimen name="tanlu_module_full_loading_width">96px</dimen>
+    <dimen name="tanlu_module_full_margin_left">30px</dimen>
+    <dimen name="tanlu_module_full_margin_right">92px</dimen>
+    <dimen name="tanlu_module_full_margin_top">40px</dimen>
+    <dimen name="tanlu_module_full_margin_width">800px</dimen>
+    <dimen name="tanlu_module_full_start_height">106px</dimen>
+    <dimen name="tanlu_module_full_start_width">106px</dimen>
+    <dimen name="tanlu_module_full_title_content">34px</dimen>
+    <dimen name="tanlu_module_full_title_time">24px</dimen>
+    <dimen name="tanlu_module_full_top_height">135px</dimen>
+    <dimen name="tanlu_module_loading_height">48px</dimen>
+    <dimen name="tanlu_module_loading_width">48px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">32px</dimen>
+    <dimen name="tanlu_module_map_bottom">60px</dimen>
+    <dimen name="tanlu_module_map_bottom_height">82px</dimen>
+    <dimen name="tanlu_module_map_left">750px</dimen>
+    <dimen name="tanlu_module_map_right">120px</dimen>
+    <dimen name="tanlu_module_map_top">270px</dimen>
+    <dimen name="tanlu_module_margin_left">30px</dimen>
+    <dimen name="tanlu_module_margin_right">24px</dimen>
+    <dimen name="tanlu_module_margin_top">9px</dimen>
+    <dimen name="tanlu_module_mavi_height">27px</dimen>
+    <dimen name="tanlu_module_radius">40px</dimen>
+    <dimen name="tanlu_module_shade_size">4px</dimen>
+    <dimen name="tanlu_module_small_player_height">10px</dimen>
+    <dimen name="tanlu_module_start_height">98px</dimen>
+    <dimen name="tanlu_module_start_width">98px</dimen>
+    <dimen name="tanlu_module_upload_radius">50px</dimen>
+    <dimen name="tanlu_module_upload_width">488px</dimen>
+    <dimen name="tanlu_normal_image_radius_size">30px</dimen>
+</resources>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values-xhdpi-v4/values-xhdpi-v4.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tanlu_button_radius_size">10px</dimen>
+    <dimen name="tanlu_dialog_button_height">130px</dimen>
+    <dimen name="tanlu_dialog_content_size">40px</dimen>
+    <dimen name="tanlu_dialog_first_margin_top">36px</dimen>
+    <dimen name="tanlu_dialog_height">524px</dimen>
+    <dimen name="tanlu_dialog_margin_button_top">59px</dimen>
+    <dimen name="tanlu_dialog_margin_top">66px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_height">105px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_top">44px</dimen>
+    <dimen name="tanlu_dialog_neterror_margin_left">44px</dimen>
+    <dimen name="tanlu_dialog_neterror_radius">16px</dimen>
+    <dimen name="tanlu_dialog_radius">20px</dimen>
+    <dimen name="tanlu_dialog_width">790px</dimen>
+    <dimen name="tanlu_head_image_size">50px</dimen>
+    <dimen name="tanlu_image_size">98px</dimen>
+    <dimen name="tanlu_module_bottom_height">72px</dimen>
+    <dimen name="tanlu_module_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_button_height">46px</dimen>
+    <dimen name="tanlu_module_card_address_margin_top">11px</dimen>
+    <dimen name="tanlu_module_card_address_size">28px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_bottom">28px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_top">4px</dimen>
+    <dimen name="tanlu_module_card_distance_size">26px</dimen>
+    <dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">2px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop">20px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop_2">40px</dimen>
+    <dimen name="tanlu_module_card_height">330px</dimen>
+    <dimen name="tanlu_module_card_inner_height">306px</dimen>
+    <dimen name="tanlu_module_card_margin_left">13px</dimen>
+    <dimen name="tanlu_module_card_margin_top">19px</dimen>
+    <dimen name="tanlu_module_card_next_margin_left">50px</dimen>
+    <dimen name="tanlu_module_card_next_size">30px</dimen>
+    <dimen name="tanlu_module_card_previous_height">82px</dimen>
+    <dimen name="tanlu_module_card_previous_margin_left">60px</dimen>
+    <dimen name="tanlu_module_card_previous_width">255px</dimen>
+    <dimen name="tanlu_module_card_video_height">290px</dimen>
+    <dimen name="tanlu_module_card_video_marginbottom">32px</dimen>
+    <dimen name="tanlu_module_card_video_width">421px</dimen>
+    <dimen name="tanlu_module_card_width">1060px</dimen>
+    <dimen name="tanlu_module_close_height">80px</dimen>
+    <dimen name="tanlu_module_full_back_height">50px</dimen>
+    <dimen name="tanlu_module_full_back_width">50px</dimen>
+    <dimen name="tanlu_module_full_bottom_height">100px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">12px</dimen>
+    <dimen name="tanlu_module_full_bottom_width">700px</dimen>
+    <dimen name="tanlu_module_full_loading_height">96px</dimen>
+    <dimen name="tanlu_module_full_loading_width">96px</dimen>
+    <dimen name="tanlu_module_full_margin_left">30px</dimen>
+    <dimen name="tanlu_module_full_margin_right">92px</dimen>
+    <dimen name="tanlu_module_full_margin_top">40px</dimen>
+    <dimen name="tanlu_module_full_margin_width">800px</dimen>
+    <dimen name="tanlu_module_full_start_height">106px</dimen>
+    <dimen name="tanlu_module_full_start_width">106px</dimen>
+    <dimen name="tanlu_module_full_title_content">34px</dimen>
+    <dimen name="tanlu_module_full_title_time">24px</dimen>
+    <dimen name="tanlu_module_full_top_height">135px</dimen>
+    <dimen name="tanlu_module_loading_height">48px</dimen>
+    <dimen name="tanlu_module_loading_width">48px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">32px</dimen>
+    <dimen name="tanlu_module_map_bottom">60px</dimen>
+    <dimen name="tanlu_module_map_bottom_height">82px</dimen>
+    <dimen name="tanlu_module_map_left">750px</dimen>
+    <dimen name="tanlu_module_map_right">120px</dimen>
+    <dimen name="tanlu_module_map_top">270px</dimen>
+    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_right">24px</dimen>
+    <dimen name="tanlu_module_margin_top">9px</dimen>
+    <dimen name="tanlu_module_mavi_height">27px</dimen>
+    <dimen name="tanlu_module_radius">40px</dimen>
+    <dimen name="tanlu_module_shade_size">4px</dimen>
+    <dimen name="tanlu_module_small_player_height">10px</dimen>
+    <dimen name="tanlu_module_start_height">98px</dimen>
+    <dimen name="tanlu_module_start_width">98px</dimen>
+    <dimen name="tanlu_module_upload_radius">50px</dimen>
+    <dimen name="tanlu_module_upload_width">488px</dimen>
+    <dimen name="tanlu_normal_image_radius_size">30px</dimen>
+</resources>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="search_fail_voice_array">
+        <item>找不到相关地址</item>
+        <item>找不到地址，是小智不好</item>
+        <item>未找到其他车主分享的路况信息</item>
+    </array>
+    <array name="searching_voice_string_array">
+        <item>正在为您搜索路况</item>
+        <item>探路系统正在为您搜索</item>
+        <item>小智这就去查，您稍等一下</item>
+    </array>
+    <color name="all_transparent_white">#00FFFFFF</color>
+    <color name="colorAccent">#1F7FFF</color>
+    <color name="colorPrimary">#000000</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="color_000000">#000000</color>
+    <color name="color_0091FF">#0091FF</color>
+    <color name="color_0DFFFFFF">#0DFFFFFF</color>
+    <color name="color_171F7FFF">#171F7FFF</color>
+    <color name="color_191C25">#99191C25</color>
+    <color name="color_1E212C">#1E212C</color>
+    <color name="color_1F7FFF">#1F7FFF</color>
+    <color name="color_213142">#213142</color>
+    <color name="color_222533">#222533</color>
+    <color name="color_3">#333333</color>
+    <color name="color_303447">#303447</color>
+    <color name="color_323131">#323131</color>
+    <color name="color_4B5369">#4B5369</color>
+    <color name="color_4d191C25">#4d191C25</color>
+    <color name="color_545362">#545362</color>
+    <color name="color_59FFFFFF">#59FFFFFF</color>
+    <color name="color_5a979797">#5a979797</color>
+    <color name="color_666666">#99666666</color>
+    <color name="color_69718B">#69718B</color>
+    <color name="color_99191C25">#99191C25</color>
+    <color name="color_999999">#999999</color>
+    <color name="color_99FFFFFF">#99FFFFFF</color>
+    <color name="color_9A9A9A">#9A9A9A</color>
+    <color name="color_A2A2A2">#A2A2A2</color>
+    <color name="color_B3000000">#B3000000</color>
+    <color name="color_DADAE2">#DADAE2</color>
+    <color name="color_F8F8F8">#F8F8F8</color>
+    <color name="color_b3000000">#b3000000</color>
+    <color name="color_d9000000">#d9000000</color>
+    <color name="color_time_FFFFFF">#99FFFFFF</color>
+    <color name="half_transparent_white">#80FFFFFF</color>
+    <color name="red_tips">#FF1B1B</color>
+    <color name="tanlu_555A_F5F5">#555A75</color>
+    <color name="tanlu_555A_F5F5F5">#F5F5F5</color>
+    <color name="tanlu_dialog_bt_defalt_text_color">#FFFFFF</color>
+    <color name="tanlu_dialog_bt_endcolor">#5CC1FF</color>
+    <color name="tanlu_dialog_bt_press_text_color">#FFFFFF</color>
+    <color name="tanlu_dialog_bt_right_color">#50526E</color>
+    <color name="tanlu_dialog_bt_startcolor">#3E7FFC</color>
+    <color name="tanlu_dialog_endcolor">#2A2B38</color>
+    <color name="tanlu_dialog_startcolor">#3F4057</color>
+    <color name="tanlu_dialog_textcolor">#FFFFFF</color>
+    <color name="tanlu_top_bg_endcolor">#3F4057</color>
+    <color name="tanlu_top_bg_startcolor">#5E6079</color>
+    <color name="tanlu_white">#FFFFFF</color>
+    <color name="white">#FFFFFF</color>
+    <color name="white_50">#80FFFFFF</color>
+    <color name="white_alpha20">#33FFFFFF</color>
+    <dimen name="tanlu_button_radius_size">6px</dimen>
+    <dimen name="tanlu_dialog_button_height">69px</dimen>
+    <dimen name="tanlu_dialog_content_size">22px</dimen>
+    <dimen name="tanlu_dialog_first_margin_top">18px</dimen>
+    <dimen name="tanlu_dialog_height">278px</dimen>
+    <dimen name="tanlu_dialog_margin_button_top">32px</dimen>
+    <dimen name="tanlu_dialog_margin_top">36px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_height">56px</dimen>
+    <dimen name="tanlu_dialog_neterror_button_top">20px</dimen>
+    <dimen name="tanlu_dialog_neterror_margin_left">23px</dimen>
+    <dimen name="tanlu_dialog_neterror_radius">8px</dimen>
+    <dimen name="tanlu_dialog_radius">10px</dimen>
+    <dimen name="tanlu_dialog_width">418px</dimen>
+    <dimen name="tanlu_head_image_size">28px</dimen>
+    <dimen name="tanlu_image_size">56px</dimen>
+    <dimen name="tanlu_module_bottom_height">72px</dimen>
+    <dimen name="tanlu_module_bottom_margin">5px</dimen>
+    <dimen name="tanlu_module_button_height">26px</dimen>
+    <dimen name="tanlu_module_card_address_margin_top">5px</dimen>
+    <dimen name="tanlu_module_card_address_size">15px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_bottom">15px</dimen>
+    <dimen name="tanlu_module_card_distance_margin_top">2px</dimen>
+    <dimen name="tanlu_module_card_distance_size">13px</dimen>
+    <dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">2px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop">10px</dimen>
+    <dimen name="tanlu_module_card_empty_tv_magintop_2">23px</dimen>
+    <dimen name="tanlu_module_card_height">186px</dimen>
+    <dimen name="tanlu_module_card_inner_height">176px</dimen>
+    <dimen name="tanlu_module_card_margin_left">6px</dimen>
+    <dimen name="tanlu_module_card_margin_top">13px</dimen>
+    <dimen name="tanlu_module_card_next_margin_left">28px</dimen>
+    <dimen name="tanlu_module_card_next_size">16px</dimen>
+    <dimen name="tanlu_module_card_previous_height">44px</dimen>
+    <dimen name="tanlu_module_card_previous_margin_left">30px</dimen>
+    <dimen name="tanlu_module_card_previous_width">136px</dimen>
+    <dimen name="tanlu_module_card_video_height">158px</dimen>
+    <dimen name="tanlu_module_card_video_marginbottom">19px</dimen>
+    <dimen name="tanlu_module_card_video_width">250px</dimen>
+    <dimen name="tanlu_module_card_width">642px</dimen>
+    <dimen name="tanlu_module_close_height">45px</dimen>
+    <dimen name="tanlu_module_full_back_height">25px</dimen>
+    <dimen name="tanlu_module_full_back_width">25px</dimen>
+    <dimen name="tanlu_module_full_bottom_height">90px</dimen>
+    <dimen name="tanlu_module_full_bottom_margin">10px</dimen>
+    <dimen name="tanlu_module_full_bottom_width">700px</dimen>
+    <dimen name="tanlu_module_full_loading_height">96px</dimen>
+    <dimen name="tanlu_module_full_loading_width">96px</dimen>
+    <dimen name="tanlu_module_full_margin_left">16px</dimen>
+    <dimen name="tanlu_module_full_margin_right">48px</dimen>
+    <dimen name="tanlu_module_full_margin_top">22px</dimen>
+    <dimen name="tanlu_module_full_margin_width">700px</dimen>
+    <dimen name="tanlu_module_full_start_height">56px</dimen>
+    <dimen name="tanlu_module_full_start_width">56px</dimen>
+    <dimen name="tanlu_module_full_title_content">18px</dimen>
+    <dimen name="tanlu_module_full_title_time">14px</dimen>
+    <dimen name="tanlu_module_full_top_height">72px</dimen>
+    <dimen name="tanlu_module_loading_height">48px</dimen>
+    <dimen name="tanlu_module_loading_width">48px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">16px</dimen>
+    <dimen name="tanlu_module_map_bottom">32px</dimen>
+    <dimen name="tanlu_module_map_bottom_height">44px</dimen>
+    <dimen name="tanlu_module_map_left">400px</dimen>
+    <dimen name="tanlu_module_map_right">80px</dimen>
+    <dimen name="tanlu_module_map_top">150px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
+    <dimen name="tanlu_module_margin_right">13px</dimen>
+    <dimen name="tanlu_module_margin_top">3px</dimen>
+    <dimen name="tanlu_module_mavi_height">18px</dimen>
+    <dimen name="tanlu_module_radius">22px</dimen>
+    <dimen name="tanlu_module_shade_size">4px</dimen>
+    <dimen name="tanlu_module_small_player_height">6px</dimen>
+    <dimen name="tanlu_module_start_height">52px</dimen>
+    <dimen name="tanlu_module_start_width">52px</dimen>
+    <dimen name="tanlu_module_upload_radius">26px</dimen>
+    <dimen name="tanlu_module_upload_width">260px</dimen>
+    <dimen name="tanlu_normal_image_radius_size">16px</dimen>
+    <string name="affirm">返回</string>
+    <string name="app_name">tanlu</string>
+    <string name="cancel">取消授权</string>
+    <string name="custom_send_road_condition">上报路况</string>
+    <string name="first_custom_send_content">您还可以试试语音上报</string>
+    <string name="first_week_tts_content">欢迎使用探路，您可以在探路内查看到周边的实时路况，也可以通过关键词“上报路况”来分享一段视频给其他车主</string>
+    <string name="main_empty_content"><Data><![CDATA[<font color="#8F95AA">未找到其他用户分享的拥堵信息,<br/>您可以试试</font><font color="#51B0FF">分享拥堵</font>]]></Data></string>
+    <string name="main_empty_content_info">未找到其他用户分享的路况</string>
+    <string name="main_empty_location">未知区域</string>
+    <string name="splash_agreement">《探路共享计划》</string>
+    <string name="splash_agreement_bt">探路共享计划 >> </string>
+    <string name="splash_agreement_dialog_title">探路APP用户服务协议</string>
+    <string name="start_already_agreement">已同意</string>
+    <string name="start_mogo_car_connect">开启小智车联</string>
+    <string name="start_mogo_share">共享计划</string>
+    <string name="tanlu_cancle_time">取消（%s）</string>
+    <string name="tanlu_navi_voice_play">为你查询到导航路线沿途的路况信息，可以对我说上一条、下一条来查看</string>
+    <string name="tanlu_neterror_cancle_time">好的（%s）</string>
+    <string name="tanlu_next">下一条</string>
+    <string name="tanlu_prepare_play">将为您播放</string>
+    <string name="tanlu_previous">上一条</string>
+    <string name="tanlu_share_failed">上传失败</string>
+    <string name="tanlu_share_success">已分享成功，你分享的内容将帮助%s位车友</string>
+    <string name="tanlu_upload_roadcondition">上报路况</string>
+    <string name="text_searching_information">正在更新情报数据</string>
+    <string name="voice_get_informations_tts">为您找到%s条路况信息</string>
+    <style name="BottomDialog" parent="AlertDialog.AppCompat">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:fullBright">@color/all_transparent_white</item>
+        <item name="android:fullDark">@color/all_transparent_white</item>
+        <item name="android:topBright">@color/all_transparent_white</item>
+        <item name="android:topDark">@color/all_transparent_white</item>
+        <item name="android:borderlessButtonStyle">@color/all_transparent_white</item>
+    </style>
+    <declare-styleable name="RoundLayout">
+        <attr format="dimension" name="roundLayoutRadius"/>
+    </declare-styleable>
+</resources>
--- a/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merger.xml
+++ b/modules/mogo-module-tanlu/build/intermediates/incremental/packageDebugResources/merger.xml
--- a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class
--- a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduletanlu.class
--- a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduletanlu.class
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]`
				`@@ -0,0 +1 @@`
				`{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}`
				`@@ -0,0 +1 @@`
				`[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-tanlu-api-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.tanlu.api","split":""}}]`