diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
index 70f9dc5dd4..5b70818cc9 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java
@@ -109,12 +109,12 @@ public class AppNavigatorFragment extends MvpFragment< AppNavigatorView, AppNavi
 
     @Override
     public void setCurrentXiaoZhiEmoji( AnimRes.EmojiType type ) {
-        boolean started = mAnim.isStarted();
-        mAnim.stop();
-        mAnim.setCurrentAnim( type );
-        if ( started ) {
-            mAnim.start();
-        }
+//        boolean started = mAnim.isStarted();
+//        mAnim.stop();
+//        mAnim.setCurrentAnim( type );
+//        if ( started ) {
+//            mAnim.start();
+//        }
     }
 
     @Override
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 95c4d02378..cbfca98eda 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
@@ -293,6 +293,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mMogoStatusManager.setMainPageResumeStatus( TAG, false );
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
         mServiceApis.getAuthManagerApi().dismiss();
+        if ( shouldCloseADASPanelWhenPause() ) {
+            mServiceApis.getAdasControllerApi().closeADAS();
+        }
         if ( mServiceApis.getLauncherApi() != null ) {
             mServiceApis.getLauncherApi().setFloatButtonVisible( true );
         }
@@ -309,9 +312,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     protected void onStop() {
         super.onStop();
         mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true );
-        if ( shouldCloseADASPanelWhenPause() ) {
-            mServiceApis.getAdasControllerApi().closeADAS();
-        }
     }
 
     @Override
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
index 00c3f832c4..691fbe525f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
@@ -75,30 +75,37 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog
                 break;
             case VOICE_QUERY_HISTORY_INDEX:
                 Log.d("语音指令","VOICE_QUERY_HISTORY_INDEX");
-                Intent startForHis = new Intent( Intent.ACTION_VIEW );
-                startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
-                startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) );
-                context.startActivity( startForHis );
+                showPanelByStatus("showHistoryPanel", 0);
                 break;
             case VOICE_QUERY_SURROUNDING_INDEX:
                 Log.d("语音指令","VOICE_QUERY_SURROUNDING_INDEX");
-                Intent startForSurrounding = new Intent( Intent.ACTION_VIEW );
-                startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
-                startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) );
-                context.startActivity( startForSurrounding );
+                showPanelByStatus("showSurroundingPanel", 1);
                 break;
             case VOICE_QUERY_HEART_INDEX:
                 Log.d("语音指令","VOICE_QUERY_HEART_INDEX");
-                Intent start = new Intent( Intent.ACTION_VIEW );
-                start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
-                start.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSharePanel" ) );
-                context.startActivity( start );
+                showPanelByStatus("showSharePanel", 2);
                 break;
             default:
                 break;
         }
     }
 
+    /**
+     * 根据主页状态调用不同打开方式
+     * @param target 面板类型
+     * @param type 面板位置索引
+     */
+    private void showPanelByStatus(String target, int type){
+        if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) {
+            MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type);
+        } else {
+            Intent start = new Intent( Intent.ACTION_VIEW );
+            start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
+            start.setData( Uri.parse( "mogo://launcher/main/switch2?type="+target ) );
+            context.startActivity( start );
+        }
+    }
+
     @Override
     public void onCmdSelected(String cmd) {
         Logger.d(TAG, "收到免唤醒词指令: " + cmd);