Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8

2020-11-29 14:09:47 +08:00
parent 9bbfd2bf75 1fb2b461dd
commit 5773086c96
7 changed files with 10 additions and 5 deletions
--- 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
@@ -96,6 +96,7 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog
     * @param type 面板位置索引
     */
    private void showPanelByStatus(String target, int type){
+        MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
        if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) {
            MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type);
        } else {