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

gradle.properties

@@ -60,7 +60,7 @@ MOGO_MODULE_V2X_VERSION=1.2.1.20
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.0.10
+MOGO_MODULE_TANLU_VERSION=1.3.0.19
 # 车聊聊
 CARCHATTING_VERSION=1.4.6
 # 车聊聊接口
@@ -79,7 +79,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.0.10
+TANLULIB_VERSION=1.3.0.19
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java

@@ -47,6 +47,24 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
         AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true );
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        try {
+            AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
+        } catch ( Exception e ) {
+        }
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        try {
+            AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
+        } catch ( Exception e ) {
+        }
+    }
+
     @Override
     protected int getLayoutId() {
         return R.layout.module_apps_activity_list;

modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java

@@ -273,6 +273,8 @@ public class MediaWindow2 implements IMusicView {
 
     @Override
     public void onAppExit() {
-        mWindowView.setVisibility(View.GONE);
+        if ( mWindowView != null ) {
+            mWindowView.setVisibility(View.GONE);
+        }
     }
 }