From e1a12cde10ced338e9cd4bde5923a1278afff23b Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 9 Oct 2020 19:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20launcher=20ACC=20OFF=20?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E9=A1=B5=E9=9D=A2=E5=81=B6=E7=8E=B0=E8=A2=AB?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/main/launcher/MainLauncherActivity.java   | 12 ++++++++++++
 .../main/java/com/mogo/module/main/MainActivity.java |  4 ++++
 .../fragment/recycler/TanluSlideAdapterNew.java      |  3 +++
 3 files changed, 19 insertions(+)

diff --git 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
index 48c9b4c52f..8597763868 100644
--- 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
@@ -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();
+        }
+    }
 }
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index fe256c300b..ca1f04905f 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -347,6 +347,10 @@ 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();
+        mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this );
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
         mMogoMapService = null;
         mMogoMapUIController = null;
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
index de39f21bd8..356443d7f1 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
@@ -509,6 +509,9 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
 
     @Override
     public void onMapUiModeChanged(EnumMapUI mapUI) {
+        if ( mRoundLayout == null ) {
+            return;
+        }
         switch ( mapUI ) {
             case Type_Night:
                 Log.d("liyz", "Type_Night ---------> ");