From 3959ab92d27389a87b181be457956994e9815f82 Mon Sep 17 00:00:00 2001 From: AmuCN114514 Date: Sun, 8 Nov 2026 08:55:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=AD=8C=E6=89=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8C=89=E7=B1=BB=E5=9E=8B=E5=9B=BA=E5=AE=9A=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=AE=89=E8=A3=85=E5=90=8E=20DiffSi?= =?UTF-8?q?nger=20=E8=B7=91=E5=88=B0=E6=9C=80=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SingerGroups 的分组顺序取决于目录枚举顺序,安装新歌手后 DiffSinger 组 可能排到 UTAU 组前面。新增 SingerListHelper 按 USingerType 顺序展开分组, SingerManagementViewModel 与 SingerPickerViewModel 统一调用,组内仍沿用 Core 的本地化排序。 --- OpenUtauMobile/Helpers/SingerListHelper.cs | 38 +++++++++++++++++++ .../ViewModels/SingerManagementViewModel.cs | 20 +--------- .../ViewModels/SingerPickerViewModel.cs | 21 ++-------- 3 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 OpenUtauMobile/Helpers/SingerListHelper.cs diff --git a/OpenUtauMobile/Helpers/SingerListHelper.cs b/OpenUtauMobile/Helpers/SingerListHelper.cs new file mode 100644 index 00000000..d6e702c7 --- /dev/null +++ b/OpenUtauMobile/Helpers/SingerListHelper.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Linq; +using OpenUtau.Core; +using OpenUtau.Core.Ustx; + +namespace OpenUtauMobile.Helpers; + +/// +/// 歌手列表辅助方法。 +/// +public static class SingerListHelper +{ + /// + /// 按歌手类型固定顺序展开 。 + /// 的分组顺序取决于文件系统的目录枚举顺序, + /// 安装新歌手后目录顺序变化会让 DiffSinger 等分组跑到列表最前面,因此这里按 + /// 的数值顺序展开以保证列表稳定;分组内部保持 Core 已有的本地化排序。 + /// + /// 按类型、再按名称排序后的歌手列表。 + public static List GetOrderedSingers() + { + Dictionary> groups = SingerManager.Inst.SingerGroups; + List singers = []; + foreach (KeyValuePair> pair in groups.OrderBy(pair => pair.Key)) + { + if (pair.Value == null) continue; + foreach (USinger singer in pair.Value) + { + if (singer != null) + { + singers.Add(singer); + } + } + } + + return singers; + } +} diff --git a/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs b/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs index 9765f3ae..18dbf212 100644 --- a/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs +++ b/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs @@ -2,7 +2,6 @@ using System.Reactive; using System.Threading.Tasks; using DynamicData.Binding; -using OpenUtau.Core; using OpenUtau.Core.Ustx; using OpenUtauMobile.Helpers; using OpenUtauMobile.Services.Dialogs; @@ -80,23 +79,8 @@ public override void OnNavigatedTo() private async Task RefreshSingersAsync() { - List list = await Task.Run(() => - { - List singers = []; - foreach (var group in SingerManager.Inst.SingerGroups.Values) - { - if (group == null) continue; - foreach (var singer in group) - { - if (singer != null) - { - singers.Add(singer); - } - } - } - - return singers; - }); + // 按歌手类型固定顺序展开,避免安装新歌手后分组顺序随目录枚举顺序变化 + List list = await Task.Run(SingerListHelper.GetOrderedSingers); Singers.Load(list); } diff --git a/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs b/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs index 746acc82..9c435d9e 100644 --- a/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs +++ b/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs @@ -2,8 +2,8 @@ using System.Reactive; using System.Threading.Tasks; using DynamicData.Binding; -using OpenUtau.Core; using OpenUtau.Core.Ustx; +using OpenUtauMobile.Helpers; using ReactiveUI; using ReactiveUI.Fody.Helpers; @@ -38,23 +38,8 @@ public SingerPickerViewModel() private async Task LoadSingersAsync() { IsLoading = true; - List list = await Task.Run(() => - { - List singers = []; - foreach (var group in SingerManager.Inst.SingerGroups.Values) - { - if (group == null) continue; - foreach (var singer in group) - { - if (singer != null) - { - singers.Add(singer); - } - } - } - - return singers; - }); + // 按歌手类型固定顺序展开,保证与歌手管理页顺序一致 + List list = await Task.Run(SingerListHelper.GetOrderedSingers); Singers.Load(list); IsLoading = false; } From 683ff85c596b67b9b892fe133159a7e5e7a1bbd6 Mon Sep 17 00:00:00 2001 From: AmuCN114514 Date: Sun, 8 Nov 2026 08:55:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=AE=89=E8=A3=85=20UTAU=20?= =?UTF-8?q?=E6=AD=8C=E6=89=8B=E6=97=B6=E5=86=99=E5=85=A5=E6=89=80=E9=80=89?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 压缩包自带 character.yaml 时,安装器只补写 singer_type,忽略向导中选择的 textEncoding;yaml 未写入 text_file_encoding 时加载器默认按 shift_jis 读取, 导致预览正常、安装后乱码。现在编码与所选不一致时一并写入并保存。 --- OpenUtau.Core/Classic/VoicebankInstaller.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenUtau.Core/Classic/VoicebankInstaller.cs b/OpenUtau.Core/Classic/VoicebankInstaller.cs index 8f43e77d..26dac726 100644 --- a/OpenUtau.Core/Classic/VoicebankInstaller.cs +++ b/OpenUtau.Core/Classic/VoicebankInstaller.cs @@ -69,8 +69,19 @@ public void Install(string path, string singerType) { using (var stream = File.Open(filePath, FileMode.Open)) { config = VoicebankConfig.Load(stream); } + bool changed = false; if (string.IsNullOrEmpty(config.SingerType)) { config.SingerType = singerType; + changed = true; + } + // Honor the text encoding chosen in the wizard. Without this, a + // character.yaml lacking text_file_encoding keeps being read as + // shift_jis even after the user picks another encoding. + if (!string.Equals(config.TextFileEncoding, textEncoding.WebName, StringComparison.OrdinalIgnoreCase)) { + config.TextFileEncoding = textEncoding.WebName; + changed = true; + } + if (changed) { SaveConfigSafely(filePath, config); } }