Merge branch 'dev' into dev_1.1.2

app/build.gradle

@@ -44,9 +44,9 @@ android {
             signingConfig signingConfigs.release
         }
         release {
-            minifyEnabled true
-            zipAlignEnabled true
-            shrinkResources true
+            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

app/proguard-rules.pro

@@ -335,9 +335,12 @@
 
 #-----Netty-----
 -keepattributes Signature,InnerClasses
--keepclasseswithmembers class io.netty.** {
-    *;
-}
+-keep class io.netty.** {*;}
+-keep class org.apache.** {*;}
+-keep class org.apache.logging.**{*;}
+-keepclasseswithmembers class io.netty.** {*;}
+-keepclasseswithmembers class org.apache.logging.**{*;}
+-keep class org.apache.http.**{*;}
 -dontwarn io.netty.**
 -dontwarn sun.**
 
@@ -354,8 +357,17 @@
 -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.locupload.**{*;}
+-keep class com.zhidao.tcloginsdk.**{*;}
+-keep class com.zhidao.utils.**{*;}
+-keep class com.hw.videoprocessor.**{*;}
 -dontwarn com.elegant.network.**
 
+-keep class com.bytedance.boost_multidex.**{*;}
+
 
 
 

gradle.properties

@@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.16
+MOGO_MODULE_TANLU_VERSION=1.3.1.20
 # 车聊聊
 CARCHATTING_VERSION=1.4.8
 # 车聊聊接口
@@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.16
+TANLULIB_VERSION=1.3.1.20
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java

@@ -662,4 +662,21 @@ public class TopViewAnimHelper {
         tvTurnInfo.setVisibility(visibility);
 
     }
+
+    public void removeAllView(){
+        Logger.d(TAG, "remove all view");
+        isTopViewOut = true;
+        int lastCount = topContainer.getChildCount();
+        for (int i = 0; i < lastCount; i++) {
+            View child = topContainer.getChildAt(i);
+            viewCaches.remove(child);
+            IMogoTopViewStatusListener listener = statusListenerMap.remove(child);
+            if (listener != null) {
+                listener.onViewRemoved(child);
+            }
+        }
+        topContainer.removeAllViews();
+        hideNaviView();
+        MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, Scene.AIMLESS);
+    }
 }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java

@@ -6,8 +6,12 @@ import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.module.extensions.R;
+import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 
@@ -21,10 +25,18 @@ public class TopViewManager implements IMogoTopViewManager {
 
     private Context context;
     private LayoutParams parentParams;
+    private IMogoServiceApis serviceApis;
 
     @Override
     public void init(Context context) {
         this.context = context;
+        serviceApis =
+                (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
+        serviceApis.getStatusManagerApi().registerStatusChangedListener(MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER, StatusDescriptor.MAIN_PAGE_RESUME, (descriptor, isTrue) -> {
+            if (!isTrue) {
+                TopViewAnimHelper.getInstance().removeAllView();
+            }
+        });
     }
 
     @Override

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java

@@ -154,6 +154,7 @@ public class MapPresenter extends Presenter< MapView > implements
                                 mLauncher.backToLauncher( getContext() );
                             }
                         }, 500L );
+                        mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
                         return;
                     }
                     onStopNaviInternal();