From 8f20329b337b9923c55e588bf5529beeb9e529ed Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Mon, 8 Jun 2020 19:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2qq=E9=9F=B3=E4=B9=90=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=AF=AD=E9=9F=B3=E4=B8=BA=E7=88=B1=E8=B6=A3=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/media/MediaWindow2.java   | 18 +++++++-
 .../media/receiver/MediaSpeechReceiver.java   | 41 +++++++++++--------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
index 2c89aead5d..69c9f8068a 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java
@@ -7,6 +7,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.voice.AIAssist;
+import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.module.media.constants.MusicConstant;
 import com.mogo.module.media.listener.NoDoubleClickListener;
 import com.mogo.module.media.model.MediaInfoData;
@@ -21,6 +24,7 @@ import com.mogo.module.media.widget.ScrollingTextView;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
+import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
 
 /**
  * 适配爱趣听的window
@@ -54,7 +58,19 @@ public class MediaWindow2 implements IMusicView {
         mPresenter = new WeCarFlowPresenter(this);
         mPresenter.init(context);
 
-        isFirstPlay = true;
+        if(DebugConfig.isLauncher()) {
+            AIAssist.getInstance(context).registerUnWakeupCommand("flow_we_car_stop", new String[]{"停止播放", "暂停播放"}, new IMogoVoiceCmdCallBack() {
+                @Override
+                public void onCmdSelected(String cmd) {
+                    // 简单添加暂停播放全局免唤醒词
+                    if ("flow_we_car_stop".equals(cmd)) {
+                        FlowPlayControl.getInstance().doPause();
+                    }
+                }
+            });
+        }
+
+       isFirstPlay = true;
     }
 
     private void addWindowView() {
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java
index 5fecc7468d..fd35cc5bb6 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java
@@ -9,6 +9,9 @@ import com.mogo.module.media.utils.MusicControlBroadCast;
 import com.mogo.utils.ActivityLifecycleManager;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
+import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
+
+import io.reactivex.processors.FlowableProcessor;
 
 /**
  * 我要听{歌手/歌名}：
@@ -35,30 +38,32 @@ public class MediaSpeechReceiver extends BroadcastReceiver {
                     //我要听{歌手/歌名}
                     Logger.d("MediaSpeechReceiver","  "+"type qq ");
                     String musicModel = intent.getStringExtra("music_model");
-                    if (appActive){
-                        MusicControlBroadCast.playSomeBodyMusic(musicModel);
-                        MusicControlBroadCast.mediaCenterBroadcast();
-                    }else {
-                        MusicControlBroadCast.playSomeBodyMusic(musicModel);
-                        UiThreadHandler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                MusicControlBroadCast.qqOpenQQMusic();
-                            }
-                        },300);
-                    }
+                    FlowPlayControl.getInstance().semanticSearch(context, "launcher", musicModel);
+//                    if (appActive){
+//                        MusicControlBroadCast.playSomeBodyMusic(musicModel);
+//                        MusicControlBroadCast.mediaCenterBroadcast();
+//                    }else {
+//                        MusicControlBroadCast.playSomeBodyMusic(musicModel);
+//                        UiThreadHandler.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                MusicControlBroadCast.qqOpenQQMusic();
+//                            }
+//                        },300);
+//                    }
                 }else if (cmdAction.equals("com.zhidao.speech.awake.notify")){
                    //播放音乐
                     String musicCmd = intent.getStringExtra("command");
                     Logger.d("MediaSpeechReceiver","  "+"qq book"+musicCmd==null?"":musicCmd);
                     if (musicCmd.equals("com.ileja.music.playapp")){
                         //QQ音乐
-                        if (appActive){
-                            MusicControlBroadCast.qqPlayQQMusic();
-                            MusicControlBroadCast.mediaCenterBroadcast();
-                        }else{
-                            MusicControlBroadCast.qqOpenQQMusic();
-                        }
+                        FlowPlayControl.getInstance().doPlay();
+//                        if (appActive){
+//                            MusicControlBroadCast.qqPlayQQMusic();
+//                            MusicControlBroadCast.mediaCenterBroadcast();
+//                        }else{
+//                            MusicControlBroadCast.qqOpenQQMusic();
+//                        }
                     }else if (musicCmd.equals("com.zhidao.book.play")){
                         //懒人听书
                         if (appActive){