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

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);
+        }
     }
 }