Merge remote-tracking branch 'origin/qa_1.1.6' into dev

# Conflicts:
#	modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java

main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java

@@ -2,6 +2,7 @@ package com.zhidao.mogo.module.main.launcher;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Process;
 import android.text.TextUtils;
 import android.view.View;
 
@@ -82,4 +83,15 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     protected boolean shouldCloseADASPanelWhenPause() {
         return !mIsHomeKeyDown;
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        try {
+            // acc off 之后会出现进程还在，但是页面被杀的情况，这个直接杀掉进程，然后让整个进程重启
+            Process.killProcess( Process.myPid() );
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
 }

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -347,6 +347,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     protected void onDestroy() {
         super.onDestroy();
         mMogoMapService.getHostListenerRegister().unregisterMarkerClickListener();
+        mMogoMapService.getHostListenerRegister().unregisterHostAimlessModeListener();
+        mMogoMapService.getHostListenerRegister().unregisterHostNaviListener();
+        mMogoMapService.getHostListenerRegister().unregisterHostMapListener();
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
         mMogoMapService = null;
         mMogoMapUIController = null;

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java

@@ -539,7 +539,10 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
 
     @Override
     public void onMapUiModeChanged(EnumMapUI mapUI) {
-        switch (mapUI) {
+        if ( mRoundLayout == null ) {
+            return;
+        }
+        switch ( mapUI ) {
             case Type_Night:
                 Log.d("liyz", "Type_Night ---------> ");
                 mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg);