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

change the callerlogger

Browse Source
This commit is contained in:
zhongchao
2022-03-14 21:50:11 +08:00
parent e19ff59a89
commit 6102e55ed3
1315 changed files with 4162 additions and 61965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ import com.aispeech.lite.AuthType;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.commons.BuildConfig;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.tts.base.IMogoTTS;
import com.mogo.tts.base.IMogoTTSCallback;
@@ -60,7 +60,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private Context mContext;
public synchronized void release() {
Logger.d(TAG, "release");
CallerLogger.INSTANCE.d(TAG, "release");
if (mCmdMap != null && !mCmdMap.isEmpty() && mVoiceClient != null) {
for (String cmd : mCmdMap.keySet()) {
try {
@@ -115,7 +115,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private void initTtsConfig() {
try {
Logger.d(TAG, "initTtsConfig");
CallerLogger.INSTANCE.d(TAG, "initTtsConfig");
//在线授权配置
AuthConfig.Builder onlineBuilder = new AuthConfig.Builder()
.setType(AuthType.ONLINE)
@@ -146,23 +146,23 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
.create(), new DUILiteSDK.InitListener() {
@Override
public void success() {
Logger.d(TAG, "授权成功");
CallerLogger.INSTANCE.d(TAG, "授权成功");
mHasAuth = true;
initTtsEngine();
}
@Override
public void error(String errorCode, final String errorInfo) {
Logger.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
CallerLogger.INSTANCE.e(TAG, "error code : " + errorCode + " , error info :" + errorInfo);
// throw new IllegalStateException("授权失败,请检查授权配置");
}
});
boolean isAuthorized = DUILiteSDK.isAuthorized(mContext);//查询授权状态，DUILiteSDK.init之后随时可以调
Logger.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized);
CallerLogger.INSTANCE.d(TAG, "DUILite SDK is isAuthorized ？ " + isAuthorized);
String core_version = DUILiteSDK.getCoreVersion();//获取内核版本号
Logger.d(TAG, "core version is: " + core_version);
CallerLogger.INSTANCE.d(TAG, "core version is: " + core_version);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("PadTTS 模块初始化异常");
@@ -170,7 +170,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
}
private void initTtsEngine() {
Logger.d(TAG, "initTtsEngine");
CallerLogger.INSTANCE.d(TAG, "initTtsEngine");
if (mEngine != null) {
mEngine.destroy();
}
@@ -221,7 +221,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
* 初始化
*/
private void initSpeech(Context context) {
Logger.d(TAG, "initSpeech");
CallerLogger.INSTANCE.d(TAG, "initSpeech");
mogoVoiceManager = MogoVoiceManagerImpl.getInstance();
mogoVoiceManager.init(context, new OnConnStatusListener() {
@Override
@@ -251,7 +251,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
if (!mCmdMap.containsKey(cmd)) {
return;
}
Logger.d(TAG, "received command: %s", cmd);
CallerLogger.INSTANCE.d(TAG, "received command : " + cmd);
Iterator<IMogoTTSCallback> iterator = null;
try {
@@ -356,7 +356,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
* @param text
*/
public void speakTTSVoice(String text) {
Logger.d(TAG, "speakTTSVoice");
CallerLogger.INSTANCE.d(TAG, "speakTTSVoice");
if (mEngine != null && mHasAuth) {
// 合成并播放
mEngine.speak(text, text, mAILocalTTSIntent);
@@ -447,7 +447,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords);
mCacheUnWakeupCommands.remove(cmd);
}
Logger.i(TAG, "cache un wakeup command2. %s", cmd);
CallerLogger.INSTANCE.i(TAG, "cache un wakeup command2. " + cmd);
mCacheUnWakeupCommands.put(cmd, cmdWords);
}
@@ -463,7 +463,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
mVoiceClient.registerCustomWakeupCmd(cmd, cmdWords);
mCacheUnWakeupCommands.remove(cmd);
}
Logger.i(TAG, "cache un wakeup command. %s", cmd);
CallerLogger.INSTANCE.i(TAG, "cache un wakeup command. " + cmd);
mCacheUnWakeupCommands.put(cmd, cmdWords);
}
@@ -514,14 +514,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) {
Logger.w(TAG, "startAssistant status = %d", status);
CallerLogger.INSTANCE.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");
Logger.d(TAG, "status = %d", status);
CallerLogger.INSTANCE.d(TAG, "status = " + status);
context.sendBroadcast(intent);
}
@@ -530,7 +530,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
return;
}
mHasFlush = true;
Logger.d(TAG, "flush cache voice command when voice service ready.");
CallerLogger.INSTANCE.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));
@@ -539,11 +539,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
private boolean isVoiceServiceReady(Context context) {
if (isProcessRunning(context, getPackageUid(context, "com.zhidao.speech"))) {
Logger.d(TAG, "pad txz is voiceServiceReady");
CallerLogger.INSTANCE.d(TAG, "pad txz is voiceServiceReady");
return true;
} else if (isProcessRunning(context, getPackageUid(context, "com.txznet.txz"))
&& isProcessRunning(context, getPackageUid(context, "com.txznet.adapter"))) {
Logger.d(TAG, "txz is voiceServiceReady");
CallerLogger.INSTANCE.d(TAG, "txz is voiceServiceReady");
return true;
}
return true;
@@ -629,7 +629,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
} else {
initSpeech(context);
}
Logger.w(TAG, "voice is mHasFlush = %s mInitReady= %s", mHasFlush, mInitReady);
CallerLogger.INSTANCE.w(TAG, "voice is mHasFlush = " + mHasFlush + " mInitReady= " + mInitReady);
}
}
@@ -640,13 +640,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void startAIAssist(Context context, int status) {
Logger.w(TAG, "startAIAssist status = %d", status);
CallerLogger.INSTANCE.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");
Logger.d(TAG, "status = %d", status);
CallerLogger.INSTANCE.d(TAG, "status = " + status);
context.sendBroadcast(intent);
}
@@ -654,17 +654,17 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onInit(int status) {
Logger.d(TAG, "初始化完成，返回值：" + status);
CallerLogger.INSTANCE.d(TAG, "初始化完成，返回值：" + status);
if (status == AIConstant.OPT_SUCCESS) {
Logger.d(TAG, "初始化成功!");
CallerLogger.INSTANCE.d(TAG, "初始化成功!");
} else {
Logger.d(TAG, "初始化失败!code:" + status);
CallerLogger.INSTANCE.d(TAG, "初始化失败!code:" + status);
}
}
@Override
public void onError(String utteranceId, AIError aiError) {
Logger.d(TAG, "检测到错误:" + aiError.toString());
CallerLogger.INSTANCE.d(TAG, "检测到错误:" + aiError.toString());
IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId);
if (callBack != null) {
callBack.onSpeakError(utteranceId, aiError.getError());
@@ -673,12 +673,12 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onReady(String s) {
Logger.d(TAG, "开始播放");
CallerLogger.INSTANCE.d(TAG, "开始播放");
}
@Override
public void onCompletion(String utteranceId) {
Logger.d(TAG, "播放完成");
CallerLogger.INSTANCE.d(TAG, "播放完成");
IMogoTTSCallback callBack = PadTTS.this.mSpeakVoiceMap.remove(utteranceId);
if (callBack != null) {
callBack.onSpeakEnd(utteranceId);
@@ -687,24 +687,23 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
@Override
public void onProgress(int currentTime, int totalTime, boolean isRefTextTTSFinished) {
//Logger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished);
//CallerLogger.INSTANCE.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished);
}
@Override
public void onSynthesizeStart(String utteranceId) {
Logger.d(TAG, "合成开始");
CallerLogger.INSTANCE.d(TAG, "合成开始");
}
@Override
public void onSynthesizeDataArrived(String utteranceId, byte[] audioData) {
//Log.d(Tag, "合成pcm音频数据:" + audioData.length);
//正常合成结束后会收到size大小为0的audioData,即audioData.length == 0。应用层可以根据该标志停止播放
//若合成过程中取消(stop或release)，则不会收到该结束标志
}
@Override
public void onSynthesizeFinish(String utteranceId) {
Logger.d(TAG, "合成结束");
CallerLogger.INSTANCE.d(TAG, "合成结束");
}
}