From 2ce6e1649fbd69c899393c9a5d5cb6aa8706c100 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 17 May 2022 11:55:16 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E6=AD=BB=E9=94=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reason: LogisticsCenter.class和AIAssisst.class锁导致的 --- .../src/main/java/com/mogo/commons/voice/AIAssist.java | 9 +++++---- tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java index d719a47846..2ccb0e63da 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java @@ -2,11 +2,9 @@ package com.mogo.commons.voice; import android.content.Context; -import com.alibaba.android.arouter.launcher.ARouter; 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.MogoTTSConstants; import com.mogo.tts.base.PreemptType; /** @@ -45,10 +43,13 @@ public class AIAssist { sInstance = null; } - private AIAssist(Context context) { try { - mTTS = (IMogoTTS) ARouter.getInstance().build(MogoTTSConstants.API_PATH).navigation(context.getApplicationContext()); + // 暂时换成反射,解决死锁问题 + Class clazz = Class.forName("com.mogo.tts.pad.PadTTS"); + mTTS = (IMogoTTS) clazz.getConstructor().newInstance(); + mTTS.init(context); +// mTTS = (IMogoTTS) ARouter.getInstance().build(MogoTTSConstants.API_PATH).navigation(context.getApplicationContext()); } catch (Exception e) { e.printStackTrace(); ToastUtils.showShort("TTS 模块初始化异常"); diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index e8aa685a9e..fd253070e1 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -47,9 +47,9 @@ import java.util.concurrent.ConcurrentHashMap; * @author congtaowang * @since 2020/10/12 *

- * 描述 + * 被依赖 {@link com.mogo.commons.voice.AIAssist} */ -@Route(path = MogoTTSConstants.API_PATH) +//@Route(path = MogoTTSConstants.API_PATH) public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener { private static final String TAG = "PadTTS";