Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

# Conflicts: # libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java # modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
2021-01-05 19:27:13 +08:00
parent 40afbccfcc 8be440d6b2
commit e6600df3a3
570 changed files with 644 additions and 10499 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
    <groovy codeStyle="LEGACY" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
 </project>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,10 @@ android {
    }
    buildTypes {
        debug {
-            debuggable = true
+            debuggable = false
            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
            signingConfig signingConfigs.release
        }
        release {
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -60,7 +60,12 @@
 # 这句话能够使我们的项目混淆后产生映射文件
 # 包含有类名->混淆后类名的映射关系
 -verbose
-
+# 保持测试相关的代码
+-dontnote junit.framework.**
+-dontnote junit.runner.**
+-dontwarn android.test.**
+-dontwarn android.support.test.**
+-dontwarn org.junit.**

 #
 # ----------------------------- 默认保留 -----------------------------
@@ -79,16 +84,22 @@
 -keep public class * extends android.preference.Preference
 -keep public class * extends android.view.View

-keep public class androidx.*{*;}
-keep public class * extends androidx.*{*;}
-keep interface androidx.* {*;}
+-keep public class androidx.**{*;}
+-keep public class * extends androidx.**{*;}
+-keep interface androidx.**{*;}
+-keep class androidx.appcompat.app.*{*;}
+-keep class androidx.appcompat.app.AppCompatActivity{*;}
+-keep class androidx.appcompat.app.AppCompatCallback{*;}
+-keep class androidx.appcompat.app.AppCompatDelegate{*;}
+
 -dontwarn androidx.**

-dontwarn android.support.design.**
 -keep public class android.support.design.R$* { *; }
-keep class com.google.android.material.* {*;}
+-keep class com.google.android.material.**{*;}
+-dontwarn android.support.design.**
+-dontwarn com.google.android.material.**

-keepclasseswithmembernames class * {
+-keepclasseswithmembernames,allowshrinking class * {
    native <methods>;
 }

@@ -177,33 +188,50 @@
 -keep @kotlin.Metadata class *
 -keepclasseswithmembers @kotlin.Metadata class * { *; }

-dontwarn android.telephony.TelephonyManager.**
-keep class android.telephony.TelephonyManager.**{*;}
+-keep class kotlinx.coroutines.android.** {*;}
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
+-keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
+
+-keep class android.telephony.TelephonyManager{*;}
+-keep class android.telephony.TelephonyManager$CellInfoCallback{*;}
+-dontwarn android.telephony.TelephonyManager
+
+-dontwarn org.apache.*.**
+-dontwarn org.dom4j.*.**
+-dontwarn com.pdager.*.**
+-dontwarn com.*.**
+-dontwarn javax.*.**
+-dontwarn android.support.**

 #----------------------------------------第三方库----------------------------------------------
-#-----高德地图-----
-
 #内置语音 V5.6.0之后
-keep class com.alibaba.idst.nls.**{*;}
-keep class com.google.**{*;}
-keep class com.nlspeech.nlscodec.** {*;}
-keep public class com.alibaba.mit.alitts.*{*;}
-keep class com.alibaba.mit.alitts.** {*;}
-dontwarn com.alibaba.mit.alitts.ICallback
+-keep class com.alibaba.mit.alitts.*{*;}
+-keep class com.alibaba.mit.alitts.ICallback$TtsEvent{*;}
+-keepclassmembers class com.alibaba.mit.alitts.ICallback$TtsEvent{*;}
+-keepnames class com.alibaba.mit.alitts.ICallback$TtsEvent{*;}
+-keepclassmembernames class com.alibaba.mit.alitts.ICallback$TtsEvent{*;}

+#-----高德地图-----
 #3D 地图 V5.0.0之后：
 -keep class com.amap.api.maps.**{*;}
 -keep class com.autonavi.**{*;}
 -keep class com.amap.api.trace.**{*;}
 #定位
-keep class com.loc.** {*;}
-keep class com.amap.api.location.**{*;}
-keep class com.amap.api.fence.**{*;}
+-keep class com.loc.*{*;}
+-keep class com.amap.api.location.*{*;}
+-keep class com.amap.api.fence.*{*;}
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 #搜索
 -keep class com.amap.api.services.**{*;}
 #导航
+-keep class com.amap.api.col.n3.*{*;}
 -keep class com.amap.api.navi.**{*;}
+-keep class com.alibaba.idst.nls.**{*;}
+-keep class com.nlspeech.nlscodec.NlsCodec2{*;}
+-keep class com.google.**{*;}


 #-----Gson-----
@@ -222,11 +250,15 @@
 }

 #-----ARouter-----
-keep public class com.alibaba.android.arouter.routes.**{*;}
-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class com.alibaba.android.arouter.routes.*{*;}
+-keep class com.alibaba.android.arouter.facade.annotation.*{*;}
+-keep class com.alibaba.android.arouter.facade.enums.*{*;}
+-keep class com.alibaba.android.arouter.facade.model.*{*;}
+-keep class com.alibaba.android.arouter.facade.template.IProvider{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
 # If you use the byType method to obtain Service, add the following rules to protect the interface:
 -keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
+-keep class * implements com.alibaba.android.arouter.facade.template.IProvider
 # If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation
 # -keep class * implements com.alibaba.android.arouter.facade.template.IProvider

@@ -246,32 +278,6 @@
 #如果你的 target API 低于 Android API 27，请添加：
 -dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder

-#-----Fresco-----
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
-keep,allowobfuscation @interface com.facebook.soloader.DoNotOptimize
-keep @com.facebook.common.internal.DoNotStrip class *
-keepclassmembers class * {
-    @com.facebook.common.internal.DoNotStrip *;
-}
-keep @com.facebook.soloader.DoNotOptimize class *
-keepclassmembers class * {
-    @com.facebook.soloader.DoNotOptimize *;
-}
-keepclassmembers class * {
-    native <methods>;
-}
-
-keep public class com.facebook.soloader.SoLoader {
-    public static void init(android.content.Context, int);
-}
-
-dontwarn okio.**
-dontwarn com.squareup.okhttp.**
-dontwarn okhttp3.**
-dontwarn javax.annotation.**
-dontwarn com.android.volley.toolbox.**
-dontwarn com.facebook.infer.**
-
 #-----Okio-----
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
 -dontwarn org.codehaus.mojo.animal_sniffer.*
@@ -312,6 +318,13 @@
 #-----ProtoBuf-----
 -keep class com.google.protobuf.** {*;}

+#-----flexbox-----
+-keepnames public class com.google.android.flexbox.FlexboxLayoutManager
+
+#-----zxing-----
+-dontwarn com.google.zxing.**
+-keep  class com.google.zxing.**{*;}
+
 #-----GSYVideoPlayer-----
 -keep class com.shuyu.gsyvideoplayer.video.** { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.**
@@ -344,29 +357,74 @@
 -dontwarn io.netty.**
 -dontwarn sun.**

+#-----boostMultidex-----
+-keep class com.bytedance.boost_multidex.*{*;}
+-keep class com.bytedance.boost_multidex.BoostMultiDex{*;}
+-keep class com.bytedance.boost_multidex.Result{*;}
+
+#-----geohash-----
+-keep class ch.hsr.geohash.**{*;}
+
+#-----viewpagerIndicator-----
+-keep class com.zhpan.indicator.annotation.*{*;}
+
+#-----COS-----
+-keep class com.tencent.cos.xml.common.*{*;}
+-keep class com.tencent.cos.xml.model.**{*;}
+-keep class com.tencent.cos.xml.transfer.TaskStateMonitor{*;}
+-keep class com.tencent.cos.xml.transfer.TransferState{*;}
+-keep class com.tencent.cos.xml.CosXmlSimpleService{*;}
+-keep class com.tencent.cos.xml.LogServerProxy{*;}
+-keep class com.tencent.cos.xml.MTAProxy{*;}
+-keep class com.tencent.qcloud.core.auth.STSCredentialScope{*;}
+-keep class com.tencent.qcloud.core.http.HttpLoggingInterceptor.Level{*;}
+
+#-----WebSocket-----
+-keep class org.java_websocket.enums.*{*;}
+
 #-----ZhiDaoService-----
+-keep class com.zhidao.adasconfig.**{*;}
+-keep class com.zhidao.accountsdk.**{*;}
+-keep class com.zhidao.account.sdk.**{*;}
 -keep class com.zhidao.auto.platform.**{*;}
 -keep class com.zhidao.auto.carcorder.**{*;}
-keep class com.zhidaohulian.**{*;}
-keep class com.zhidao.boot.**{*;}
-keep class com.elegant.**{*;}
-keep class com.zhidao.socketsdk.**{*;}
-keep class com.zhidao.socket.**{*;}
-keep class com.zhidao.ptech.**{*;}
-keep class com.zhidao.autopilotcore.**{*;}
+-keep class com.zhidao.autopilotcore.*{*;}
 -keep class com.zhidao.autopilot.support.**{*;}
-keep class com.zhidao.voice.library.**{*;}
-keep class com.zhidao.voicesdk.**{*;}
-keep class com.zhidao.smartv2x.**{*;}
-keep class com.zhidao.accountsdk.**{*;}
-keep class com.zhidao.account.**{*;}
+-keep class com.zhidao.boot.**{*;}
+-keep class com.zhidao.cosupload.**{*;}
 -keep class com.zhidao.locupload.**{*;}
+-keep class com.zhidao.ptech.**{*;}
+-keep class com.zhidao.smartv2x.**{*;}
+-keep class com.zhidao.support.adas.high.**{*;}
+-keep class com.zhidao.socket.**{*;}
+-keep class com.zhidao.socketsdk.**{*;}
 -keep class com.zhidao.tcloginsdk.**{*;}
 -keep class com.zhidao.utils.**{*;}
-keep class com.hw.videoprocessor.**{*;}
+-keep class com.zhidao.voicesdk.**{*;}
+-keep class com.zhidaohulian.**{*;}
+-keep class com.elegant.**{*;}
 -dontwarn com.elegant.network.**

-keep class com.bytedance.boost_multidex.**{*;}
+-keep class net.jodah.typetools.TypeResolver{*;}
+-keep class net.jodah.typetools.TypeDescriptor{*;}
+-keep class com.bt.hd.link.*{*;}
+-keep class com.nwd.kernel.aidl.*{*;}
+-keep class com.nwd.radio.service.**{*;}
+-keep class com.pvetec.carcordersdk.**{*;}
+-keep class com.pvetec.ctrlcenter.resfocus.aidl.**{*;}
+-keep class gnu.trove.**{*;}
+
+-keep class org.eclipse.jetty.alpn.ALPN$ClientProvider{*;}
+-keep class org.eclipse.jetty.npn.NextProtoNego$ClientProvider{*;}
+-keep class org.eclipse.jetty.npn.NextProtoNego$ServerProvider{*;}
+-keep class org.eclipse.jetty.alpn.ALPN$ServerProvider{*;}
+-keep class org.jboss.marshalling.ByteOutput{*;}
+-keep class org.jboss.marshalling.ByteInput{*;}
+-keep class org.conscrypt.AllocatedBuffer{*;}
+-keep class org.conscrypt.HandshakeListener{*;}
+-keep class org.conscrypt.BufferAllocator{*;}
+-keep class com.squareup.haha.guava.collect.*{*;}
+



--- a/config.gradle
+++ b/config.gradle
@@ -55,7 +55,7 @@ ext {
            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',
+            fresco                     : 'com.facebook.fresco:fresco:1.9.0',
            // 公司服务 - 语音
            aiassist                   : "com.zhidaoauto.common:service:1.0.8.4",
            // 语音替换方案 暂时只用TTS 解决焦点问题
--- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java
+++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/HttpDnsConst.java
@@ -2,7 +2,6 @@ package com.mogo.httpdns;

 import androidx.annotation.Keep;

-public
 /**
 * @author congtaowang
 * @since 2020/11/18
@@ -10,7 +9,7 @@ public
 * 描述
 */
@Keep
-class HttpDnsConst {
+public class HttpDnsConst {

    @Keep
    public static final String PATH = "/httpdns/api";
--- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsCallback.java
+++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsCallback.java
@@ -3,7 +3,6 @@ package com.mogo.httpdns;
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;

-public
 /**
 * @author congtaowang
 * @since 2020/11/19
@@ -11,7 +10,7 @@ public
 * dns 解析回调
 */
@Keep
-interface IHttpDnsCallback {
+public interface IHttpDnsCallback {

    @Keep
    void onParsed( @Nullable String ip );
--- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsTtlCallback.java
+++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IHttpDnsTtlCallback.java
@@ -2,7 +2,6 @@ package com.mogo.httpdns;

 import androidx.annotation.Keep;

-public
 /**
 * @author congtaowang
 * @since 2020/11/19
@@ -10,7 +9,7 @@ public
 * dns ttl 通知
 */
@Keep
-interface IHttpDnsTtlCallback {
+public interface IHttpDnsTtlCallback {

    @Keep
    void onTtl();
--- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java
+++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/IMogoHttpDns.java
@@ -9,7 +9,6 @@ import com.mogo.utils.network.HttpDns;
 import java.util.Collection;
 import java.util.List;

-public
 /**
 * @author congtaowang
 * @since 2020/11/18
@@ -17,13 +16,14 @@ public
 * http 请求做http dns转换
 */
@Keep
-interface IMogoHttpDns extends IProvider {
+public interface IMogoHttpDns extends IProvider {

    /**
     * 获取 dns 代理实例
     *
     * @return
     */
+    @Keep
    @Nullable
    HttpDns dns();

--- a/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java
+++ b/foudations/httpdns-base/src/main/java/com/mogo/httpdns/MogoHttpDnsHandler.java
@@ -18,8 +18,10 @@ class MogoHttpDnsHandler {

    }

-    private static IMogoHttpDns sHttpDns;
+    @Keep
+    private static volatile IMogoHttpDns sHttpDns;

+    @Keep
    public static IMogoHttpDns getHttpDnsApi() {
        if ( sHttpDns == null ) {
            synchronized ( MogoHttpDnsHandler.class ) {
--- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
+++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.ArrayMap;

+import androidx.annotation.Keep;
 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -30,6 +31,7 @@ import java.util.Map;

 import static com.mogo.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;

+@Keep
@Route(path = HttpDnsConst.PATH)
 public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListener {
    private HttpDnsHelper httpDnsHelper;
--- a/foudations/httpdns-noop/consumer-rules.pro
+++ b/foudations/httpdns-noop/consumer-rules.pro
@@ -0,0 +1 @@
+-keep class com.mogo.httpdns.noop.*{*;}
--- a/foudations/mogo-base-websocket-sdk/consumer-rules.pro
+++ b/foudations/mogo-base-websocket-sdk/consumer-rules.pro
@@ -1,2 +1,3 @@
 -keep class com.mogo.base.websocket.WebSocketData{*;}
-keep class com.mogo.base.websocket.WebSocketShakeHandsData{*;}
+-keep class com.mogo.base.websocket.WebSocketShakeHandsData{*;}
+-keep class com.mogo.base.websocket.WebSocketManager{*;}
--- a/foudations/mogo-commons/consumer-rules.pro
+++ b/foudations/mogo-commons/consumer-rules.pro
@@ -1,6 +1,4 @@
 #-----Foundation-Commons-----
 -keep class com.mogo.commons.data.BaseData{*;}
-keep class com.mogo.commons.voice.VoiceIntentTrack
-keep class com.mogo.commons.voice.VoiceTrack
-keep class com.mogo.commons.voice.VoicePreemptType
-keep interface * implements com.mogo.commons.mvp.IView
+-keep class com.mogo.commons.voice.*{*;}
+-keep interface * implements com.mogo.commons.mvp.*{*;}
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -24,6 +24,7 @@ import com.mogo.httpdns.MogoHttpDnsHandler;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.TipDrawable;
 import com.mogo.utils.TipToast;
+import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.NetConfig;

 import java.security.SecureRandom;
@@ -157,7 +158,9 @@ public abstract class AbsMogoApplication extends Application {
        }

        IMogoHttpDns dns = MogoHttpDnsHandler.getHttpDnsApi();
-
+        if(dns == null){
+            Logger.d(TAG,"dns is null");
+        }
        NetConfig.instance().setSignaturePrefix( Constants.SIGN_PREFIX )
                .setPublicParams( ParamsUtil.getStaticParams() )
                .setHostnameVerifier( new AllAllowedHostnameVerifier() )
--- a/foudations/mogo-utils/consumer-rules.pro
+++ b/foudations/mogo-utils/consumer-rules.pro
@@ -2,4 +2,7 @@
 -keep class com.mogo.utils.network.CallerType
 -keep class com.mogo.utils.network.CallerRestrictTo
 -keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType
-keep class com.mogo.utils.logger.LogLevel
+-keep class com.mogo.utils.logger.LogLevel{*;}
+-keep class com.mogo.utils.sqlite.**{*;}
+-keep class com.mogo.utils.network.HttpDns{*;}
+-keep class com.mogo.httpdnshelper.sdk.**{*;}
--- a/gradle.properties
+++ b/gradle.properties
@@ -139,9 +139,9 @@ HTTPDNS_NOOP_VERSION = 2.0.12

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.50
+CARCHATTING_VERSION=2.2.51
 # 车聊聊接口
-CARCHATTINGPROVIDER_VERSION=1.1.8
+CARCHATTINGPROVIDER_VERSION=1.1.9
 # websocket
 WEBSOCKET_VERSION=1.1.7
 # loglib
--- a/libraries/map-amap/consumer-rules.pro
+++ b/libraries/map-amap/consumer-rules.pro
@@ -1,5 +1,10 @@
 #-----library-MapAMap-----
-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;}
-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status
-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants
-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum
+-keep class com.mogo.map.impl.amap.hook.BnHooker{*;}
+-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status{*;}
+-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants{*;}
+-keep class com.mogo.map.impl.amap.overlay.RouteOverLayWrapper{
+    private hookRouteArrow();
+}
+-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum{*;}
+-keep class com.mogo.map.impl.amap.AMapUiSettingsWrapper{*;}
+-keep class com.mogo.map.impl.amap.AMapViewWrapper{*;}
--- a/libraries/map-custom/consumer-rules.pro
+++ b/libraries/map-custom/consumer-rules.pro
@@ -0,0 +1,17 @@
+-keep class com.mogo.map.impl.custom.AMapUiSettingsWrapper{*;}
+
+#-----自研地图-----
+-keepattributes EnclosingMethod
+-keep class com.autonavi.nge.**{*;}
+-keep class io.netty.**{*;}
+-keep class com.zhidaoauto.map.sdk.inner.abs.**{*;}
+-keep class com.zhidaoauto.map.sdk.inner.panel.**{*;}
+-keep class com.zhidaoauto.map.sdk.inner.search.**{*;}
+-keep class com.zhidaoauto.map.sdk.inner.element.**{*;}
+-keep class com.zhidaoauto.map.sdk.inner.obj.**{*;}
+-keep class com.zhidaoauto.map.sdk.open.**{*;}
+
+-keepattributes Exceptions,InnerClasses,...
+-keep class com.zhidaoauto.map.sdk.open.camera.CameraPosition{ *; }
+-keep class com.zhidaoauto.map.sdk.open.camera.CameraPosition$B { *; }
+-keep class com.zhidaoauto.map.sdk.open.camera.CameraPosition$C { *; }
--- 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
@@ -1,18 +0,0 @@
-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
@@ -1,18 +0,0 @@
-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
@@ -1,17 +0,0 @@
-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
@@ -1,18 +0,0 @@
-/**
- * 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
@@ -1,12 +0,0 @@
-<?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
@@ -1 +0,0 @@
-[{"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
@@ -1 +0,0 @@
-{"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
@@ -1,2 +0,0 @@
-<?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
@@ -1,2 +0,0 @@
-<?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
@@ -1,2 +0,0 @@
-<?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
@@ -1 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-<?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
@@ -1,12 +0,0 @@
-<?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
@@ -1,2 +0,0 @@
-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
@@ -1,14 +0,0 @@
-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
@@ -1 +0,0 @@
-[{"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
@@ -1,37 +0,0 @@
-- 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
@@ -54,7 +54,6 @@ dependencies {
        exclude group: 'com.zhidao.utils', module: 'utils'
    }
    implementation 'com.zhidao.video:video-processor:1.0.2.1'
-    implementation 'com.foundation.utils:common-utils:1.0.7'
    implementation rootProject.ext.dependencies.eventbus
    implementation rootProject.ext.dependencies.coroutinescore
    implementation rootProject.ext.dependencies.coroutinesandroid
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -131,7 +131,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
            mLeftShadowFrame.setVisibility(View.GONE);
            mApps.setVisibility(View.GONE);
        }else{
-            entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft_out_vr_mode );
+            entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_id_entrance_fragment_container_marginLeft );
            mLeftShadowFrame.setVisibility(View.VISIBLE);
            mApps.setVisibility(View.VISIBLE);
        }
--- a/main-extensions/mogo-module-main-launcher/src/main/res/values-ldpi/dimens.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_in_vr_mode" >0px</dimen>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_out_vr_mode" >444px</dimen>
+</resources>
--- a/main-extensions/mogo-module-main-launcher/src/main/res/values-mdpi/dimens.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_in_vr_mode" >0px</dimen>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_out_vr_mode" >444px</dimen>
+</resources>
--- a/main-extensions/mogo-module-main-launcher/src/main/res/values-xhdpi/dimens.xml
+++ b/main-extensions/mogo-module-main-launcher/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_in_vr_mode" >0px</dimen>
+    <dimen name="module_main_entrance_fragment_container_marginLeft_out_vr_mode" >800px</dimen>
+</resources>
--- a/modules/mogo-module-apps/consumer-rules.pro
+++ b/modules/mogo-module-apps/consumer-rules.pro
@@ -1,4 +1,5 @@
 #-----AppModule-----
-keep class com.mogo.module.apps.model.AppEnum
-keep class com.mogo.module.apps.view.**{*;}
+-keep class com.mogo.module.apps.anim.AnimRes.EmojiType{*;}
+-keep class com.mogo.module.apps.model.AppEnum{*;}
+-keep class com.mogo.module.apps.view.*{*;}
 -keep class com.mogo.module.apps.AppFilter
--- a/modules/mogo-module-common/consumer-rules.pro
+++ b/modules/mogo-module-common/consumer-rules.pro
@@ -1,8 +1,11 @@
 #-----CommonModule-----
-keep class com.mogo.module.common.entity.** {*;}
-keep class com.mogo.module.common.map.Interrupter
-keep class com.mogo.module.common.map.Scene
-keep class com.mogo.module.common.wm.** {*;}
-keep class com.mogo.module.common.ModuleNames
-keep class com.mogo.module.common.ModuleType
-keep class com.mogo.module.common.MogoModulePaths
+-keep class com.mogo.module.common.machinevision.*{*;}
+-keep class com.mogo.module.common.constants.*{*;}
+-keep class com.mogo.module.common.drawer.marker.*{*;}
+-keep class com.mogo.module.common.entity.*{*;}
+-keep class com.mogo.module.common.utils.SPConst{*;}
+-keep class com.mogo.module.common.view.*{*;}
+-keep class com.mogo.module.common.widget.*{*;}
+-keep class com.mogo.module.common.wm.* {*;}
+-keep class com.mogo.module.common.MogoModulePaths{*;}
+-keep class com.mogo.hook.*{*;}
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java
@@ -143,6 +143,8 @@ public class V2XMessageEntity<T> implements Serializable {
        int ALERT_VOICE_CALL_FOR_LIVECAR_SHOW = 1_010;
        // 基于预判目的地道路事件的路线推荐
        int ALERT_RECOMMEND_ROUTE = 1_011;
+        // 基于预判目的地违章高发停车场推荐
+        int ALERT_RECOMMEND_PARKING = 1_012;
        // 推送VR消息展示
        int ALERT_PUSH_VR_SHOW = 2_000;
        // 自车求助
@@ -165,6 +167,7 @@ public class V2XMessageEntity<T> implements Serializable {
            V2XTypeEnum.ALERT_CAR_FOR_HELP,
            V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW,
            V2XTypeEnum.ALERT_RECOMMEND_ROUTE,
+            V2XTypeEnum.ALERT_RECOMMEND_PARKING,
            V2XTypeEnum.ALERT_PUSH_VR_SHOW,
            V2XTypeEnum.ALERT_OBU_EVENT,
    })
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRecommendRouteEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRecommendRouteEntity.java
@@ -1,9 +1,39 @@
 package com.mogo.module.common.entity;

+import java.util.List;
+
 /**
- * created by wujifei on 2020/12/24 15:33
+ * created by wujifei on 2020/12/31 18:45
 * describe:基于目的地预判的道路事件
 */
 public class V2XRecommendRouteEntity {
+    private List<Double> toPoint; //目的地坐标
+    private String formatAddress;  //目的地地址
+    private String tts;   //播报内容

+    public V2XRecommendRouteEntity(List<Double> toPoint, String formatAddress) {
+        this.toPoint = toPoint;
+        this.formatAddress = formatAddress;
+    }
+
+    public List<Double> getToPoint() {
+        return toPoint;
+    }
+
+    public void setToPoint(List<Double> toPoint) {
+        this.toPoint = toPoint;
+    }
+
+    public String getFormatAddress() {
+        return formatAddress;
+    }
+
+    public void setFormatAddress(String formatAddress) {
+        this.formatAddress = formatAddress;
+    }
+
+    public String getTts() {
+        tts = "主人，我发现前往" + formatAddress + "沿途有拥堵，推荐你导航最优路线，现在开启导航吗？";
+        return tts;
+    }
 }
--- a/modules/mogo-module-extensions/consumer-rules.pro
+++ b/modules/mogo-module-extensions/consumer-rules.pro
@@ -1,8 +1,9 @@
 #-----ExtensionModule-----
-keep class com.mogo.module.extensions.userinfo.**{*;}
-keep class com.mogo.module.extensions.weather.Phenomena
-keep class com.mogo.module.extensions.weather.WeatherCallback
-keep interface com.mogo.module.extensions.net.UserInfoNetApiServices
-keep class com.mogo.module.extensions.utils.TopViewAnimHelper
-keep class com.mogo.module.extensions.ExtensionsView
-keep class com.mogo.module.extensions.ExtensionsModuleConst
+-keep class com.mogo.module.extensions.live.CameraLiveGSYVideoView{*;}
+-keep class com.mogo.module.extensions.live.PushCameraLiveWindow{*;}
+-keep class com.mogo.module.extensions.navi.*{*;}
+-keep class com.mogo.module.extensions.userinfo.*{*;}
+-keep class com.mogo.module.extensions.weather.Phenomena{*;}
+-keep class com.mogo.module.extensions.weather.StrokeTextView{*;}
+-keep class com.mogo.module.extensions.view.*{*;}
+-keep class com.mogo.module.extensions.bean.*{*;}
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
@@ -1,6 +1,5 @@
 package com.mogo.module.extensions.utils;

-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/modules/mogo-module-gps-simulator/consumer-rules.pro
+++ b/modules/mogo-module-gps-simulator/consumer-rules.pro
@@ -1,2 +0,0 @@
-#-----MogoGSPSimulator-----
-keep class com.mogo.module.gps.simulator.GpsSimulatorConstants
--- a/modules/mogo-module-left-panel/consumer-rules.pro
+++ b/modules/mogo-module-left-panel/consumer-rules.pro
@@ -1,2 +1,2 @@
 #-----ModuleLeftPanel-----
-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst
+-keep class com.zhidao.mogo.module.left.panel.LeftPanelConst{*;}
--- a/modules/mogo-module-main/consumer-rules.pro
+++ b/modules/mogo-module-main/consumer-rules.pro
@@ -1,6 +1,3 @@
 #-----MainModule-----
-keep class com.mogo.module.main.cards.MogoModulesHandler
-keep class com.mogo.module.main.constants.**{*;}
-keep class com.mogo.module.main.livedata.**{*;}
-keep class com.mogo.module.main.service.MogoMainService
-keep class com.mogo.module.main.windowview.IWindowViewHandler
+-keep class com.mogo.module.main.constants.*{*;}
+-keep class com.mogo.module.main.service.MogoMainService{*;}
--- a/modules/mogo-module-map/consumer-rules.pro
+++ b/modules/mogo-module-map/consumer-rules.pro
@@ -1,2 +1,3 @@
 #-----ModuleMap-----
-keep class com.mogo.module.map.NavConstants
+-keep class com.mogo.module.map.NavConstants{*;}
+-keep class com.mogo.module.map.VoiceConstants{*;}
--- a/modules/mogo-module-media/consumer-rules.pro
+++ b/modules/mogo-module-media/consumer-rules.pro
@@ -1,13 +1,11 @@
 #-----MediaModule-----
 -dontwarn com.mogo.module.media.**
-keep class com.mogo.module.media.listener.** { *; }
+-keep class com.mogo.module.media.api.* { *; }
+-keep class com.mogo.module.media.constants.* { *; }
 -keep class com.mogo.module.media.model.** { *; }
-keep class com.mogo.module.media.view.** { *; }
+-keep class com.mogo.module.media.view.* { *; }
 -keep class com.mogo.module.media.widget.** { *; }
-keep class com.mogo.module.media.api.** { *; }
-keep class com.mogo.module.media.constants.** { *; }
-keep class com.mogo.module.media.presenter.** { *; }
-keep class com.mogo.module.media.receiver.** { *; }
+-keep class com.mogo.module.media.receiver.* { *; }
 -keep class com.mogo.module.media.utils.OnBitmapToLocalListener
 -keep class com.mogo.module.media.utils.OnCompressListener
-keep class com.mogo.module.media.MediaConstants
+-keep class com.mogo.module.media.MediaConstants{*;}
--- a/modules/mogo-module-monitor/consumer-rules.pro
+++ b/modules/mogo-module-monitor/consumer-rules.pro
@@ -0,0 +1 @@
+-keep class com.zhidao.mogo.module.monitor.MogoMonitorConst.*{*;}
--- a/modules/mogo-module-push-base/consumer-rules.pro
+++ b/modules/mogo-module-push-base/consumer-rules.pro
@@ -0,0 +1 @@
+-keep class com.mogo.module.push.base.PushUIConstants{*;}
--- a/modules/mogo-module-push/consumer-rules.pro
+++ b/modules/mogo-module-push/consumer-rules.pro
@@ -0,0 +1,4 @@
+-keep class com.mogo.module.push.dao.*{*;}
+-keep class com.mogo.module.push.model.Button{*;}
+-keep class com.mogo.module.push.model.PushBean{*;}
+-keep class com.mogo.module.push.view.**{*;}
--- a/modules/mogo-module-search/consumer-rules.pro
+++ b/modules/mogo-module-search/consumer-rules.pro
@@ -1,8 +1,11 @@
 #-----SearchModule-----
-keep class com.mogo.module.navi.bean.**{*;}
-keep class com.mogo.module.navi.constants.**{*;}
-keep class com.mogo.module.navi.dao.**{*;}
-keep class com.mogo.module.navi.database.**{*;}
+-keep class com.mogo.module.navi.bean.*{*;}
+-keep class com.mogo.module.navi.constants.*{*;}
+-keep class com.mogo.module.navi.cp.PersonalInfoManagerImpl{
+    private static final <fields>;
+}
+-keep class com.mogo.module.navi.dao.*{*;}
+-keep class com.mogo.module.navi.database.*{*;}
 -keep class * extends com.mogo.module.navi.cp.PersonalInfoManager{
    public static final <fields>;
 }
--- a/modules/mogo-module-service/consumer-rules.pro
+++ b/modules/mogo-module-service/consumer-rules.pro
@@ -1,13 +1,17 @@
 #-----ServiceModule-----
-keep class com.mogo.module.service.carinfo.CarStateInfo.*{*;}
-keep class com.mogo.module.service.network.RefreshBody.*{*;}
-keep class com.mogo.module.service.network.bean.DemoUserInfoEntity.*{*;}
-keep interface com.mogo.module.service.intent.IntentHandler
-keep interface com.mogo.module.service.marker.IMarkerView
-keep interface com.mogo.module.service.network.RefreshApiService
-keep interface com.mogo.module.service.network.RefreshCallback
-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity
+-keep class com.mogo.module.service.carinfo.CarStateInfo{*;}
+-keep class com.mogo.module.service.launchercard.LauncherCardRefreshType{*;}
+-keep class com.mogo.module.service.network.bean.*{*;}
+-keep class com.mogo.module.service.network.RefreshBody{*;}
+-keep class com.mogo.module.service.onlinecar.panel.NavigationTargetInfo{*;}
+-keep class com.mogo.module.service.onlinecar.panel.OnlineCarStrategy{*;}
+-keep class com.mogo.module.service.websocket.*{*;}
+-keep interface com.mogo.module.service.intent.IntentHandler{*;}
+-keep interface com.mogo.module.service.network.RefreshApiService{*;}
+-keep interface com.mogo.module.service.network.RefreshCallback{*;}
+-keep interface com.mogo.module.service.network.bean.DemoUserInfoEntity{*;}
+-keep interface com.mogo.module.service.ttsConfig.TtsConfigApiService{*;}
 -keep class com.mogo.module.service.strategy.CarIconDisplayStrategy{
     public static final <fields>;
 }
- -keep class com.mogo.module.service.ServiceConst
+ -keep class com.mogo.module.service.ServiceConst{*;}
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
--- a/modules/mogo-module-share/consumer-rules.pro
+++ b/modules/mogo-module-share/consumer-rules.pro
@@ -1,5 +1,6 @@
 #-----ShareModule-----
+-keep class com.mogo.module.share.adas.*{*;}
 -keep class com.mogo.module.share.bean.**{*;}
-keep class com.mogo.module.share.constant.**{*;}
-keep class com.mogo.module.share.manager.ISeekHelpListener
-keep class com.mogo.module.share.net.ShareApiService
+-keep class com.mogo.module.share.constant.*{*;}
+-keep class com.mogo.module.share.net.*{*;}
+-keep class com.mogo.module.share.strategyreceiver.AccidentStrategyPushWrapper{*;}
--- a/modules/mogo-module-smp/consumer-rules.pro
+++ b/modules/mogo-module-smp/consumer-rules.pro
@@ -0,0 +1,4 @@
+-keep class com.mogo.module.small.map.SmallMapDirectionView{*;}
+-keep class com.amap.api.col.n3.*{*;}
+-keep class com.android.internal.policy.MyPhoneLayoutInflater{*;}
+-keep class com.mogo.module.small.map.SmallVisionProvider{*;}
--- 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
@@ -37,7 +37,7 @@ public class SmallMapDirectionView extends RelativeLayout {
    private AMapNaviView mAMapNaviView;
    private DirectionRotateAnimation mRotateAnimation;
    private int lastAngle = 0;
-    private int zoomLevel = 15;
+    private int zoomLevel = 17;

    public SmallMapDirectionView(Context context) {
        this(context, null);
--- a/modules/mogo-module-splash-noop/consumer-rules.pro
+++ b/modules/mogo-module-splash-noop/consumer-rules.pro
@@ -1 +1 @@
-keep class com.zhidao.mogo.module.splash.BydConst
+-keep class com.zhidao.mogo.module.splash.BydConst{*;}
--- a/modules/mogo-module-splash/consumer-rules.pro
+++ b/modules/mogo-module-splash/consumer-rules.pro
@@ -1,2 +1,2 @@
 #-----ModuleSplash-----
-keep class com.zhidao.mogo.module.splash.SplashConst.*{*;}
+-keep class com.zhidao.mogo.module.splash.SplashConst{*;}
--- 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
@@ -1,18 +0,0 @@
-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
@@ -1,18 +0,0 @@
-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
@@ -1,17 +0,0 @@
-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
@@ -1,18 +0,0 @@
-/**
- * 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
@@ -1,56 +0,0 @@
-<?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
@@ -1 +0,0 @@
-[{"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
@@ -1 +0,0 @@
-{"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
@@ -1,2 +0,0 @@
-<?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
@@ -1,2 +0,0 @@
-<?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
@@ -1,2 +0,0 @@
-<?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
@@ -1,135 +0,0 @@
-#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
@@ -1,80 +0,0 @@
-<?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
@@ -1,80 +0,0 @@
-<?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
@@ -1,80 +0,0 @@
-<?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
@@ -1,184 +0,0 @@
-<?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/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/BuildConfig.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/BuildConfig.class
--- a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/AlongTheWayCallback.class
--- a/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class
+++ b/modules/mogo-module-tanlu/build/intermediates/javac/debug/classes/com/mogo/module/tanlu/callback/DataSetChangedAdapter$1.class
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`[{"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":""}}]`
				`@@ -1 +0,0 @@`
				`{"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}`
				`@@ -1 +0,0 @@`
				`[{"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":""}}]`
				`@@ -0,0 +1 @@`
				`-keep class com.zhidao.mogo.module.monitor.MogoMonitorConst.{;}`
				`@@ -0,0 +1 @@`
				`-keep class com.mogo.module.push.base.PushUIConstants{*;}`