yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.8.2][Opt]新增语音合成的P2级别

Browse Source
This commit is contained in:
chenfufeng
2024-12-05 16:17:50 +08:00
parent 5b3bb09104
commit 961e8953e8
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,11 @@ public class AIAssist {
private static volatile AIAssist sInstance;
public static final int LEVEL0 = 3;//P0
public static final int LEVEL1 = 2;//P1
public static final int LEVEL2 = 1;//P2
public static final int LEVEL3 = 0;//P3
public static final int LEVEL0 = 4;//P0
public static final int LEVEL1 = 3;//P1
public static final int NEW_LEVEL_2 = 2;// P2
public static final int LEVEL2 = 1;//P3
public static final int LEVEL3 = 0;//P4
private IMogoTTS mTTS;
private IGlobalTtsCallback mTTSCallback;
@@ -144,7 +145,7 @@ public class AIAssist {
}
/**
* 等级由低到高为0、1、2、3，分别对应p3、p2、p1、p0
* 等级由低到高为0、1、2、3、4，分别对应p4、p3、p2、p1、p0(已更新)
*
* @param text
* @param level
@@ -159,7 +160,7 @@ public class AIAssist {
* 支持多语言的Tts
*
* @param ttsEntity: 多语言Entity
* @param level: 等级由低到高为0、1、2、3，分别对应p3、p2、p1、p0
* @param level: 等级由低到高为0、1、2、3、4，分别对应p4、p3、p2、p1、p0(已更新)
* @param callback
*/
public void speakMultiLangTTSWithLevel(MultiLangTtsEntity ttsEntity, int level, IMogoTTSCallback callback) {

5
tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
View File

@@ -234,6 +234,9 @@ class IFlyTekTts : IMogoTTS, InitListener {
d(TAG, "插入消息：$ttsEntity,level为：$ttsLevel")
insertTts(ttsEntity, ttsLevel)
return
} else if (ttsLevel == 2) {
d(TAG, "已有p2级别在播报，新内容直接丢弃!")
return
} else {
// 打断并合成新的
stopTts()
@@ -252,6 +255,8 @@ class IFlyTekTts : IMogoTTS, InitListener {
d(TAG, "===================")
d(TAG, "插入消息：$ttsEntity,level为：$ttsLevel")
insertTts(ttsEntity, ttsLevel)
} else if (ttsLevel == 2) {
d(TAG, "已有高级别在播报，新内容直接丢弃!")
}
return
}

7
tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
View File

@@ -413,7 +413,10 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack {
CallerLogger.d(TAG, "插入消息：" + ttsEntity + ",level为：" + ttsLevel);
insertTts(ttsEntity, ttsLevel);
return;
} else {
} else if (ttsLevel == 2) {
CallerLogger.d(TAG, "已有p2级别在播报，新内容直接丢弃!");
return;
} else {
// 打断并合成新的
stopTts();
CallerLogger.d(TAG, "非Level1同级别打断!");
@@ -431,6 +434,8 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack {
CallerLogger.d(TAG, "===================");
CallerLogger.d(TAG, "插入消息：" + ttsEntity + ",level为：" + ttsLevel);
insertTts(ttsEntity, ttsLevel);
} else if (ttsLevel == 2) {
CallerLogger.d(TAG, "已有高级别在播报，新内容直接丢弃!");
}
return;
}