改动拼音错误的bug

.vscode/settings.json

@@ -53,7 +53,8 @@
         "statusBar.debuggingBackground": "#1857a4",
         "statusBar.debuggingForeground": "#e7e7e7",
         "activityBar.activeBorder": "#e7e7e7",
-        "activityBarTop.activeBorder": "#e7e7e7"
+        "activityBarTop.activeBorder": "#e7e7e7",
+        "statusBar.inactiveBackground": "#1857a4"
     },
     "peacock.color": "#1857a4"
 }

src/api/miaoguo/miaoguoController.js

@@ -5266,10 +5266,13 @@ export async function GetMiaoguoTestExamine(ctx) {
                         result = await hanzi.GetHanziUnitWords(param);
                     }
 
+                    //用 MiaoguoLiteracy 中的标准拼音纠正多音字与轻声（如 勒紧 的“勒”读 lēi，石榴 的“榴”读 liu）
+                    await fixWordsPinyinByLiteracy(result);
+
                     for (const item of result) {
                         if (item.Pinyin) {
                             item.Pinyin = item.Pinyin.split(",")[0];
-                            item.CombineWords2 = stringUtils.ReplaceAllString(item.CombineWords, item.Name, item.Pinyin);
+                            item.CombineWords2 = stringUtils.ReplaceAllString(item.CombineWords, item.Name, item.PinyinInWord || item.Pinyin);
                             if (item.CombineWords.length == 2 && item.CombineWords[0] == item.CombineWords[1]) {
                                 switch (item.CombineWords) {
                                     case "妈妈":
@@ -6111,6 +6114,59 @@ function getEF(EF, Q) {
     return result;
 }
 
+//用 MiaoguoLiteracy 中的标准拼音，纠正汉字在词语里的读音（多音字、轻声）
+//如：勒紧 的“勒”应为 lēi，石榴 的“榴”应为 liu
+async function fixWordsPinyinByLiteracy(words) {
+    if (!words || words.length === 0)
+        return;
+
+    const wordList = [];
+    for (const item of words) {
+        if (!item.CombineWords)
+            continue;
+        for (const word of String(item.CombineWords).split(",")) {
+            if (word && wordList.indexOf(word) < 0)
+                wordList.push(word);
+        }
+    }
+    if (wordList.length === 0)
+        return;
+
+    const pinyinMap = await hanzi.GetMiaoguoLiteracyPinyin({ Words: wordList.join("','") });
+    for (const item of words) {
+        if (!item.CombineWords || !item.Pinyin || !item.Name)
+            continue;
+        for (const word of String(item.CombineWords).split(",")) {
+            const arrPinyin = pinyinMap[word];
+            if (!arrPinyin || arrPinyin.length !== word.length)
+                continue;
+            //完全没有声调的脏数据不采信（如 毛泽东 被记为 “mao ze dong”）
+            if (!/[āáǎàōóǒòēéěèīíǐìūúǔùǖǘǚǜ]/.test(arrPinyin.join("")))
+                continue;
+            const index = word.indexOf(item.Name);
+            if (index < 0 || word.lastIndexOf(item.Name) !== index)
+                continue;
+            const pinyinInWord = arrPinyin[index];
+            if (!pinyinInWord || pinyinInWord == item.Pinyin)
+                continue;
+            //轻声只会出现在词尾，非词尾却没有声调的数据不采信（如 吾国 被记为 “wu guó”）
+            if (index !== word.length - 1 && !/[āáǎàōóǒòēéěèīíǐìūúǔùǖǘǚǜ]/.test(pinyinInWord))
+                continue;
+            item.PinyinInWord = pinyinInWord;
+            //多音字：词语中的读音本来就是该字的读音之一，则字本身的读音也采用词语中的读音
+            const arrReading = String(item.Pinyin).split(",");
+            if (arrReading.length > 1 && arrReading.indexOf(pinyinInWord) > 0)
+                item.Pinyin = pinyinInWord;
+            break;
+        }
+    }
+}
+
+function getPinyinNormalText(pinyin) {
+    const result = getPinyinNormal(pinyin);
+    return result ? result : pinyin;
+}
+
 function getWordJSON(param, words) {
     const taskList = [];
     if (words[0].Pinyin) {
@@ -6125,9 +6181,10 @@ function getWordJSON(param, words) {
                 ],
             };
             taskInfo.Word = word.Name;
-            const pinyinNormal = "(" + getPinyinNormal(word.Pinyin) + ")";
-            const combineWords = stringUtils.ReplaceAllString(word.CombineWords, word.Name, word.Name + pinyinNormal);
-            taskInfo.ReadString = word.Name + pinyinNormal + "," + combineWords + "的" + word.Name + pinyinNormal;
+            const pinyinNormal = "(" + getPinyinNormalText(word.Pinyin) + ")";
+            const pinyinNormalInWord = "(" + getPinyinNormalText(word.PinyinInWord || word.Pinyin) + ")";
+            const combineWords = stringUtils.ReplaceAllString(word.CombineWords, word.Name, word.Name + pinyinNormalInWord);
+            taskInfo.ReadString = word.Name + pinyinNormal + "," + combineWords + "的" + word.Name + pinyinNormalInWord;
 
             if (param.TestType == "read") {
                 taskInfo.Content[0].Content = ["怎么念"];

src/model/hanzi.js

@@ -491,11 +491,46 @@ class Hanzi {
                         order by Word,SearchType desc;`;
             return await query(sql);
         } catch (error) {
-            console.error('获取妙果识字词语失败:', error);
+            console.error('获取秒过识字词语失败:', error);
             throw error;
         }
     }
 
+    /**
+     * 获取秒过识字词语的标准拼音(按字拆分，用于纠正多音字与轻声)
+     * @param {Object} obj 查询参数（Words：'词语1','词语2'）
+     * @returns {Promise<Object>} { 词语: [拼音1,拼音2...] }
+     */
+    static async GetMiaoguoLiteracyPinyin(obj) {
+        try {
+            const sql = `select Word,SearchType,JSONString 
+                        from MiaoguoLiteracy 
+                        where Word in ('${obj.Words}') 
+                        and (SearchType is null or (SearchType<>'shici' and SearchType<>'eng')) 
+                        order by Word,SearchType desc;`;
+            const list = await query(sql);
+            const result = {};
+            for (const item of list) {
+                if (result[item.Word] || !item.JSONString)
+                    continue;
+                let json = null;
+                try {
+                    json = JSON.parse(item.JSONString);
+                } catch (error) {
+                    continue;
+                }
+                const pinyin = json && json.CHN && json.CHN.PinYin && json.CHN.PinYin[0] ? json.CHN.PinYin[0].pinyin : "";
+                if (!pinyin)
+                    continue;
+                result[item.Word] = String(pinyin).trim().split(/\s+/);
+            }
+            return result;
+        } catch (error) {
+            console.error('获取秒过识字拼音失败:', error);
+            return {};
+        }
+    }
+
     /**
      * 获取没有图片的汉字列表
      * @returns {Promise<Array>} 汉字列表