diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
index ceccf22eb6..b22bfc46a6 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java
@@ -48,7 +48,9 @@ public class AMapWrapper implements IMogoMap {
         mContext = context;
         mUIcontroller = controller;
         // 设置实现自定义 info window
-        mAMap.setInfoWindowAdapter( new AMapInfoWindowAdapter() );
+        if(mAMap!=null) {
+            mAMap.setInfoWindowAdapter(new AMapInfoWindowAdapter());
+        }
         AMapUIController.getInstance().initClient( mUIcontroller );
     }
 
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
index c5db25251a..a2f84bb756 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
@@ -5,6 +5,7 @@ import android.view.Gravity;
 import android.view.WindowManager;
 
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.service.IMogoServiceApis;
@@ -15,6 +16,9 @@ public class BackToMainHomeManager {
     private static final String TAG = "BackToMainHomeManager";
 
     public static void backToLauncher() {
+        if (!DebugConfig.isLauncher()) {
+            return;
+        }
 
         Intent intent2 = new Intent();
         // 是否发自系统消息
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
index f7a08caf37..bf232742c9 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -100,8 +100,8 @@ public class SchemeIntent implements IMogoStatusChangedListener {
 
         if ( !mApis.getStatusManagerApi().isMainPageOnResume() ) {
             long delay = 0L;
-            if ( isNaviIntent( intent ) ) {
-                delay = 2_000L;
+            if ( isDelay( intent ) ) {
+                delay = 5_000L;
             }
             mNextIntent = new IntentWrapper( intent, delay );
             mApis.getLauncherApi().backToLauncher( mContext );
@@ -127,13 +127,13 @@ public class SchemeIntent implements IMogoStatusChangedListener {
         mNextIntent = null;
     }
 
-    private boolean isNaviIntent( Intent intent ) {
-        if ( intent == null || intent.getData() == null ) {
+    private boolean isDelay(Intent intent ) {
+        if ( mApis.getStatusManagerApi().isMainPageLaunched() || intent == null || intent.getData() == null ) {
             return false;
         }
         Uri target = intent.getData();
         String type = target.getQueryParameter( "type" );
-        return TextUtils.equals( TYPE_NAVI, type );
+        return TextUtils.equals(TYPE_NAVI, type) || TextUtils.equals(TYPE_SHOW_SHARE_PANEL, type);
     }
 
     private void handleSwitch2Action( Uri target ) {