diff --git a/FileMerger.cs b/FileMerger.cs index 25a2365..cde65c3 100644 --- a/FileMerger.cs +++ b/FileMerger.cs @@ -155,15 +155,15 @@ namespace SlideCombine try { string[] lines; - // 先尝试UTF-8,支持特殊字符如Ü、ü等 + // 在Windows上使用GB2312编码读取,正确处理中文字符 try { - lines = File.ReadAllLines(txtFile, Encoding.UTF8); + lines = File.ReadAllLines(txtFile, Encoding.GetEncoding("GB2312")); } catch { - // 如果UTF-8失败,尝试GBK - lines = File.ReadAllLines(txtFile, Encoding.GetEncoding("GBK")); + // 如果GB2312不可用,使用系统默认编码 + lines = File.ReadAllLines(txtFile, Encoding.Default); } foreach (var line in lines)