diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c42353..82b798cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,3 @@ -2022/05/20 +2022/05/26 -1. 重新使用DNS over Https,解决一些地区DNS污染。 -2. 优化重连逻辑,出错时尽快恢复连接。 -3. 其它优化 \ No newline at end of file +添加预览版语音,需要打开预览语音开关,当选择预览版语音时,如果卡住了,杀掉应用重进!!! \ No newline at end of file diff --git a/app/src/main/java/me/ag2s/tts/MainActivity.java b/app/src/main/java/me/ag2s/tts/MainActivity.java index b2374828..7a6c424c 100644 --- a/app/src/main/java/me/ag2s/tts/MainActivity.java +++ b/app/src/main/java/me/ag2s/tts/MainActivity.java @@ -1,6 +1,7 @@ package me.ag2s.tts; import static me.ag2s.tts.services.Constants.CUSTOM_VOICE; +import static me.ag2s.tts.services.Constants.USE_PREVIEW; import android.annotation.SuppressLint; import android.app.Activity; @@ -109,8 +110,8 @@ protected void onCreate(Bundle savedInstanceState) { binding.switchUseDict.setChecked(APP.getBoolean(Constants.USE_DICT, false)); binding.switchUseDict.setOnCheckedChangeListener((buttonView, isChecked) -> APP.putBoolean(Constants.USE_DICT, isChecked)); -// binding.switchUsePreview.setChecked(APP.getBoolean(Constants.USE_PREVIEW,false)); -// binding.switchUsePreview.setOnCheckedChangeListener(((buttonView, isChecked) -> APP.putBoolean(CUSTOM_VOICE,isChecked))); + binding.switchUsePreview.setChecked(APP.getBoolean(Constants.USE_PREVIEW, false)); + binding.switchUsePreview.setOnCheckedChangeListener(((buttonView, isChecked) -> APP.putBoolean(USE_PREVIEW, isChecked))); TtsActorAdapter actorAdapter = new TtsActorAdapter(TtsActorManger.getInstance().getActors()); @@ -151,6 +152,8 @@ protected void onCreate(Bundle savedInstanceState) { }); + Toast.makeText(this, "选择预览版语音时,如果卡住了,杀掉应用重进!!!", Toast.LENGTH_LONG).show(); + if (APP.getBoolean(Constants.USE_AUTO_UPDATE, true)) { checkUpdate(); diff --git a/app/src/main/java/me/ag2s/tts/services/TTSService.java b/app/src/main/java/me/ag2s/tts/services/TTSService.java index 1f52c190..74e0ea52 100644 --- a/app/src/main/java/me/ag2s/tts/services/TTSService.java +++ b/app/src/main/java/me/ag2s/tts/services/TTSService.java @@ -566,7 +566,7 @@ public WebSocket getOrCreateWs() { String url; String origin = Constants.EDGE_ORIGIN; - if (TokenHolder.token != null) { + if (TokenHolder.token != null && APP.getBoolean(Constants.USE_PREVIEW, false)) { url = "wss://eastus.tts.speech.microsoft.com/cognitiveservices/websocket/v1?Authorization=bearer " + TokenHolder.token + "&X-ConnectionId=" + CommonTool.getMD5String(new Date().toString()); origin = "https://azure.microsoft.com"; } else { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9efde7e0..549c8788 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -39,23 +39,26 @@ + android:text="@string/use_dict" /> - - - - - - + android:text="@string/use_preview" /> + + + + diff --git a/release/TTS_release_v0.2_202205261737.apk b/release/TTS_release_v0.2_202205261737.apk new file mode 100644 index 00000000..1cc7afe9 Binary files /dev/null and b/release/TTS_release_v0.2_202205261737.apk differ diff --git a/release/TTS_release_v0.2_202205261737.apk.idsig b/release/TTS_release_v0.2_202205261737.apk.idsig new file mode 100644 index 00000000..fb87054f Binary files /dev/null and b/release/TTS_release_v0.2_202205261737.apk.idsig differ