[6.0.0] log

This commit is contained in:
zhongchao
2023-08-24 11:16:26 +08:00
parent 4beb4a3532
commit c377ecc260
94 changed files with 2677 additions and 834 deletions

View File

@@ -71,7 +71,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private LinkedList<Pair<String, Integer>> linkedList = new LinkedList<>();
public void release() {
CallerLogger.INSTANCE.d(TAG, "release");
CallerLogger.d(TAG, "release");
ThreadUtils.runOnUiThread(() -> {
if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) {
for (String cmd : mCmdMap.keySet()) {
@@ -143,7 +143,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private void initTtsConfig(String sn) {
try {
CallerLogger.INSTANCE.d(TAG, "initTtsConfig");
CallerLogger.d(TAG, "initTtsConfig");
//在线授权配置
AuthConfig.Builder onlineBuilder = new AuthConfig.Builder()
.setType(AuthType.ONLINE)
@@ -183,7 +183,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
.create(), new DUILiteSDK.InitListener() {
@Override
public void success() {
CallerLogger.INSTANCE.d(TAG, "授权成功");
CallerLogger.d(TAG, "授权成功");
isAuthing = false;
ThreadUtils.runOnUiThread(() -> {
mHasAuth = true;
@@ -193,7 +193,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void error(String errorCode, final String errorInfo) {
CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
CallerLogger.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
isAuthing = false;
if (retryCount++ < 3) {
initDUILiteSDK(onlineBuilder, echoConfig);
@@ -203,15 +203,15 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
});
// boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态DUILiteSDK.init之后随时可以调
// CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized " + isAuthorized);
// CallerLogger.d(TAG, "DUILite SDK is isAuthorized " + isAuthorized);
//
// String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号
// CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version);
// CallerLogger.d(TAG, "core version is: " + core_version);
}
private void initTtsEngine() {
if (isInitEngine) return;
CallerLogger.INSTANCE.d(TAG, "initTtsEngine");
CallerLogger.d(TAG, "initTtsEngine");
// AILocalTTSConfig config = new AILocalTTSConfig();
// // 设置assets目录下合成字典名
// config.setDictResource(TTS_DICT_RES);//普通话字典
@@ -260,7 +260,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
* 初始化
*/
private void initSpeech(Context context) {
CallerLogger.INSTANCE.d(TAG, "initSpeech");
CallerLogger.d(TAG, "initSpeech");
mogoVoiceManager = MogoVoiceManagerImpl.getInstance();
mogoVoiceManager.init(context, new OnConnStatusListener() {
@Override
@@ -290,7 +290,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
if (!mCmdMap.containsKey(cmd)) {
return;
}
CallerLogger.INSTANCE.d(TAG, "received command : " + cmd);
CallerLogger.d(TAG, "received command : " + cmd);
Iterator<IMogoTTSCallback> iterator = null;
try {
@@ -403,7 +403,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
* @param text
*/
public void speakTTSVoice(String text) {
CallerLogger.INSTANCE.d(TAG, "speakTTSVoice");
CallerLogger.d(TAG, "speakTTSVoice");
if (mEngine != null && mHasAuth) {
// 合成并播放
mEngine.speak(text, text, mAILocalTTSIntent);
@@ -416,14 +416,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
if (ttsLevel == curTtsLevel) {
// 对应p3、p2级别的排队
if (ttsLevel == 0 || ttsLevel == 1) {
CallerLogger.INSTANCE.d(TAG, "===================");
CallerLogger.INSTANCE.d(TAG, "插入消息:" + text + ",level为" + ttsLevel);
CallerLogger.d(TAG, "===================");
CallerLogger.d(TAG, "插入消息:" + text + ",level为" + ttsLevel);
insertTts(text, ttsLevel);
return;
} else {
// 打断并合成新的
stopTts();
CallerLogger.INSTANCE.d(TAG, "非Level1同级别打断!");
CallerLogger.d(TAG, "非Level1同级别打断!");
}
} else {
// 将要TTS的比现在正在TTS的优先级高
@@ -432,11 +432,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
// 打断并合成高优先级的
stopTts();
}
CallerLogger.INSTANCE.d(TAG, "高优先级打断低级别的!");
CallerLogger.d(TAG, "高优先级打断低级别的!");
} else {
if (ttsLevel == 0 || ttsLevel == 1) {
CallerLogger.INSTANCE.d(TAG, "===================");
CallerLogger.INSTANCE.d(TAG, "插入消息:" + text + ",level为" + ttsLevel);
CallerLogger.d(TAG, "===================");
CallerLogger.d(TAG, "插入消息:" + text + ",level为" + ttsLevel);
insertTts(text, ttsLevel);
}
return;
@@ -445,7 +445,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
curTtsLevel = ttsLevel;
curTtsContent = text;
// 合成并播放
CallerLogger.INSTANCE.d(TAG, "tts准备合成" + text + ",curTtsLevel为" + curTtsLevel);
CallerLogger.d(TAG, "tts准备合成" + text + ",curTtsLevel为" + curTtsLevel);
mEngine.speak(text, text, mAILocalTTSIntent);
}
}
@@ -477,9 +477,9 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
}
for (Pair<String, Integer> ttsPair:
linkedList) {
CallerLogger.INSTANCE.d(TAG, "tts文本为" + ttsPair.first + ",level为" + ttsPair.second);
CallerLogger.d(TAG, "tts文本为" + ttsPair.first + ",level为" + ttsPair.second);
}
CallerLogger.INSTANCE.d(TAG, "===================");
CallerLogger.d(TAG, "===================");
}
/**
@@ -579,7 +579,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords);
mCacheUnWakeupCommands.remove(cmd);
}
CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd);
CallerLogger.i(TAG, "cache un wakeup command2. " + cmd);
mCacheUnWakeupCommands.put(cmd, cmdWords);
}
@@ -595,7 +595,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords);
mCacheUnWakeupCommands.remove(cmd);
}
CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd);
CallerLogger.i(TAG, "cache un wakeup command. " + cmd);
mCacheUnWakeupCommands.put(cmd, cmdWords);
}
@@ -647,14 +647,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
* @param status window_start_cancel 0 - 结束, 1 - 显示, 2 - 未激活调试进入
*/
public static void startAssistant(Context context, int status) {
CallerLogger.INSTANCE.w(TAG, "startAssistant status = " + status);
CallerLogger.w(TAG, "startAssistant status = " + status);
final Intent intent = new Intent();
intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
intent.setAction("pvetec.intent.action.txz.switch");
intent.putExtra("window_start_cancel", status);
intent.putExtra("extra_switch_type", "window_start_cancel");
CallerLogger.INSTANCE.d(TAG, "status = " + status);
CallerLogger.d(TAG, "status = " + status);
context.sendBroadcast(intent);
}
@@ -663,7 +663,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
return;
}
mHasFlush = true;
CallerLogger.INSTANCE.d(TAG, "flush cache voice command when voice service ready.");
CallerLogger.d(TAG, "flush cache voice command when voice service ready.");
final Map<String, String[]> tmp = new HashMap<>(mCacheUnWakeupCommands);
for (String cmd : tmp.keySet()) {
registerUnWakeupCommand(cmd, tmp.get(cmd));
@@ -672,11 +672,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private boolean isVoiceServiceReady(Context context) {
if (isProcessRunning(context, getPackageUid(context, "com.zhidao.speech"))) {
CallerLogger.INSTANCE.d(TAG, "pad txz is voiceServiceReady");
CallerLogger.d(TAG, "pad txz is voiceServiceReady");
return true;
} else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz"))
&& isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) {
CallerLogger.INSTANCE.d(TAG, "txz is voiceServiceReady");
CallerLogger.d(TAG, "txz is voiceServiceReady");
return true;
}
return true;
@@ -762,7 +762,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
} else {
initSpeech(context);
}
CallerLogger.INSTANCE.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady);
CallerLogger.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady);
}
}
@@ -773,13 +773,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void startAIAssist(Context context, int status) {
CallerLogger.INSTANCE.w(TAG, "startAIAssist status = " + status);
CallerLogger.w(TAG, "startAIAssist status = " + status);
final Intent intent = new Intent();
intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
intent.setAction("pvetec.intent.action.txz.switch");
intent.putExtra("window_start_cancel", status);
intent.putExtra("extra_switch_type", "window_start_cancel");
CallerLogger.INSTANCE.d(TAG, "status = " + status);
CallerLogger.d(TAG, "status = " + status);
context.sendBroadcast(intent);
}
@@ -787,17 +787,17 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onInit(int status) {
CallerLogger.INSTANCE.d(TAG, "初始化完成,返回值:" + status);
CallerLogger.d(TAG, "初始化完成,返回值:" + status);
if (status == AIConstant.OPT_SUCCESS) {
CallerLogger.INSTANCE.d(TAG, "初始化成功!");
CallerLogger.d(TAG, "初始化成功!");
} else {
CallerLogger.INSTANCE.d(TAG, "初始化失败!code:" + status);
CallerLogger.d(TAG, "初始化失败!code:" + status);
}
}
@Override
public void onError(String utteranceId, AIError aiError) {
CallerLogger.INSTANCE.d(TAG, "检测到错误:" + aiError.toString());
CallerLogger.d(TAG, "检测到错误:" + aiError.toString());
curTtsLevel = -1;
curTtsContent = "";
IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId);
@@ -808,14 +808,14 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onReady(String s) {
CallerLogger.INSTANCE.d(TAG, "开始播放");
CallerLogger.d(TAG, "开始播放");
}
@Override
public void onCompletion(String utteranceId) {
curTtsLevel = -1;
curTtsContent = "";
CallerLogger.INSTANCE.d(TAG, "播放完成");
CallerLogger.d(TAG, "播放完成");
ttsNext();
IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId);
if (callBack != null) {
@@ -825,12 +825,12 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onProgress(int currentTime, int totalTime, boolean isRefTextTTSFinished) {
//CallerLogger.INSTANCE.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished);
//CallerLogger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished);
}
@Override
public void onSynthesizeStart(String utteranceId) {
CallerLogger.INSTANCE.d(TAG, "合成开始");
CallerLogger.d(TAG, "合成开始");
}
@Override
@@ -841,7 +841,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onSynthesizeFinish(String utteranceId) {
CallerLogger.INSTANCE.d(TAG, "合成结束");
CallerLogger.d(TAG, "合成结束");
}
}
@@ -849,11 +849,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private void ttsNext() {
if (!linkedList.isEmpty()) {
Pair<String, Integer> ttsPair = linkedList.removeFirst();
CallerLogger.INSTANCE.i(TAG, "排队播放的下一条文本为:" + ttsPair.first + ",级别为:" + ttsPair.second);
CallerLogger.i(TAG, "排队播放的下一条文本为:" + ttsPair.first + ",级别为:" + ttsPair.second);
curTtsLevel = ttsPair.second;
speakTTSVoice(ttsPair.first);
} else {
CallerLogger.INSTANCE.i(TAG, "队列为空");
CallerLogger.i(TAG, "队列为空");
}
}