fixed conflict

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java

@@ -23,4 +23,13 @@ public class ExtensionsModuleConst {
 
     public static final String TYPE_ENTRANCE = "entrance";
 
+    //免唤醒语音命令
+    public static final String[] CMD_CANCLE_SHARE = {"取消分享"};
+    public static final String[] CMD_CLOSE_PAGE = {"关闭页面"};
+    public static final String[] CMD_CLOSE = {"关闭"};
+
+    public static final String CANCLE_SHARE = "com.zhidao.launcher.cancle.share";
+    public static final String CLOSE_PAGE = "com.zhidao.launcher.close.page";
+    public static final String CLOSE = "com.zhidao.launcher.close";
+
 }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -163,7 +163,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
     @NonNull
     @Override
     protected EntrancePresenter createPresenter() {
-        return new EntrancePresenter( this );
+        return new EntrancePresenter(getContext(), this );
     }
 
     @Override

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java

@@ -1,6 +1,11 @@
 package com.mogo.module.extensions.entrance;
 
+import android.content.Context;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.commons.voice.AIAssist;
+import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
+import com.mogo.module.extensions.ExtensionsModuleConst;
+import com.mogo.module.share.ShareControl;
 
 /**
  * @author congtaowang
@@ -10,7 +15,54 @@ import com.mogo.commons.mvp.Presenter;
  */
 public class EntrancePresenter extends Presenter<EntranceView> {
 
-    public EntrancePresenter( EntranceView view ) {
-        super( view );
+    private Context mContext;
+
+    public EntrancePresenter(Context context, EntranceView view) {
+        super(view);
+        mContext = context;
+        registerUnWake();
     }
+
+    private void registerUnWake() {
+        AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.CLOSE,
+                ExtensionsModuleConst.CMD_CLOSE, mogoVoiceListener);
+        AIAssist.getInstance(mContext).registerUnWakeupCommand(ExtensionsModuleConst.CANCLE_SHARE,
+                ExtensionsModuleConst.CMD_CANCLE_SHARE, mogoVoiceListener);
+    }
+
+    /**
+     * 免唤醒语音监听
+     */
+    private IMogoVoiceCmdCallBack mogoVoiceListener = new IMogoVoiceCmdCallBack() {
+        @Override
+        public void onCmdSelected(String cmd) {
+            if (cmd.equals(ExtensionsModuleConst.CANCLE_SHARE)
+                    || cmd.equals(ExtensionsModuleConst.CLOSE)) { //取消分享，关闭页面
+                ShareControl.getInstance(mContext).dismissDialog();
+            }
+        }
+
+        @Override
+        public void onCmdAction(String speakText) {
+        }
+
+        @Override
+        public void onCmdCancel(String speakText) {
+        }
+
+        @Override
+        public void onSpeakEnd(String speakText) {
+        }
+
+        @Override
+        public void onSpeakSelectTimeOut(String speakText) {
+        }
+    };
+
+
+    private void unregisterUnWake() {
+        AIAssist.getInstance(mContext).unregisterUnWakeupCommand(ExtensionsModuleConst.CANCLE_SHARE);
+        AIAssist.getInstance(mContext).unregisterUnWakeupCommand(ExtensionsModuleConst.CLOSE);
+    }
+
 }