Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

@@ -1,5 +1,7 @@
 package com.mogo.commons.debug;
 
+import com.mogo.utils.logger.Logger;
+
 /**
  * @author congtaowang
  * @since 2019-12-23
@@ -51,6 +53,17 @@ public class DebugConfig {
 
     private static int sNetMode = NET_MODE_RELEASE;
 
+    /**
+     * 语音使用同行者
+     */
+    public static final int AI_TYPE_TXZ = 1;
+    /**
+     * 语音使用思必驰
+     */
+    public static final int AI_TYPE_SPEECH = 2;
+
+    private static int sAIType = AI_TYPE_TXZ;
+
     /**
      * 获取网络环境类型
      *
@@ -100,6 +113,22 @@ public class DebugConfig {
         DebugConfig.sUseCustomNavi = sUseCustomNavi;
     }
 
+    /**
+     * 设置使用哪个语音助手
+     * @param aiType {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
+     */
+    public static void setAIType(int aiType){
+        Logger.d("DebugConfig", "setAiType: " + aiType);
+        sAIType = aiType;
+    }
+
+    /**
+     * 使用哪个语音助手  {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
+     */
+    public static int getAIType(){
+        return sAIType;
+    }
+
     /**
      * 是否作为launcher运行
      */

foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java

@@ -380,6 +380,9 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack, OnTtsListener {
         if ( isProcessRunning( context, getPackageUid( context, "com.zhidao.speech" ) )
                 && isProcessRunning( context, getPackageUid( context, "com.zhidao.speech.adapter" ) ) ) {
             return true;
+        } else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz")) && isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) {
+            Logger.d(TAG, "txz is voiceServiceReady");
+            return true;
         }
         return false;
     }