fix: failed to load sound effects

再次弹出键盘丢失按键音效
osfans · Apr 26, 2024 · 1197273 · 1197273
1 parent fc8e3aa
commit 1197273
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt b/app/src/main/java/com/osfans/trime/data/sound/SoundEffectManager.kt
@@ -56,12 +56,14 @@ object SoundEffectManager {
 
     @JvmStatic
     fun switchSound(name: String) {
-        if (getSound(name) == null) {
-            Timber.w("Unknown sound package name: $name")
-            return
+        getSound(name).let {
+            if (it == null) {
+                Timber.w("Unknown sound package name: $name")
+                return
+            }
+            currentSoundEffect = it
+            AppPrefs.defaultInstance().keyboard.customSoundPackage = name
         }
-        AppPrefs.defaultInstance().keyboard.customSoundPackage = name
-        currentSoundEffect = getSound(name)!!
     }
 
     fun init() {

diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -232,7 +232,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                     Timber.d("Running Trime.onCreate")
                     ColorManager.init(resources.configuration)
                     textInputManager = TextInputManager(this@TrimeInputMethodService, rime)
-                    InputFeedbackManager.init(this@TrimeInputMethodService)
+                    InputFeedbackManager.init()
                     restartSystemStartTimingSync()
                     try {
                         for (listener in eventListeners) {
@@ -465,7 +465,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
         Timber.d("onStartInputView: restarting=%s", restarting)
         lifecycleScope.launch(Dispatchers.Main) {
             rime.runOnReady {
-                InputFeedbackManager.loadSoundEffects()
+                InputFeedbackManager.loadSoundEffects(this@TrimeInputMethodService)
                 InputFeedbackManager.resetPlayProgress()
                 for (listener in eventListeners) {
                     listener.onStartInputView(attribute, restarting)

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/InputFeedbackManager.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/InputFeedbackManager.kt
@@ -34,24 +34,24 @@ object InputFeedbackManager {
     private var lastPressedKeycode = 0
     private val soundIds: MutableList<Int> = mutableListOf()
 
-    fun init(context: Context) {
+    fun init() {
         runCatching {
-            tts = TextToSpeech(context, null)
-            soundPool =
-                SoundPool.Builder()
-                    .setMaxStreams(1)
-                    .setAudioAttributes(
-                        AudioAttributes.Builder()
-                            .setLegacyStreamType(AudioManager.STREAM_SYSTEM)
-                            .build(),
-                    ).build()
             SoundEffectManager.init()
         }.getOrElse {
             Timber.w(it, "Failed to initialize InputFeedbackManager")
         }
     }
 
-    fun loadSoundEffects() {
+    fun loadSoundEffects(context: Context) {
+        tts = TextToSpeech(context, null)
+        soundPool =
+            SoundPool.Builder()
+                .setMaxStreams(1)
+                .setAudioAttributes(
+                    AudioAttributes.Builder()
+                        .setLegacyStreamType(AudioManager.STREAM_SYSTEM)
+                        .build(),
+                ).build()
         SoundEffectManager.getActiveSoundFilePaths().onSuccess { path ->
             soundIds.clear()
             soundIds.addAll(path.map { soundPool?.load(it, 1) ?: 0 })