Merge branch 'iteration-temp-http' into online

src/constant/instruments.ts

@@ -7,6 +7,7 @@ export default {
   "Harpsichord": "羽管键琴",
   "Clavichord": "科拉维科特琴",
   "Celesta": "钢片琴",
+  "Glockenspiel": "钢片琴",
   "Music box": "八音盒",
   "Vibraphone": "颤音琴",
   "Marimba": "马林巴",
@@ -52,21 +53,25 @@ export default {
   "French Horn": "法国号",
   "Brass Section": "铜管组",
   "Synth Brass": "合成铜管音色",
-  "Soprano Sax": "高音萨克斯风",
-  "Alto Sax": "中音萨克斯风",
-  "Tenor Sax": "次中音萨克斯风",
-  "Baritone Sax": "低音萨克斯风",
+  "Soprano Sax": "高音萨克斯管",
+  "Alto Sax": "中音萨克斯管",
+  "Tenor Sax": "次中音萨克斯管",
+  "Baritone Sax": "低音萨克斯管",
   "Oboe": "双簧管",
   "English Horn": "英国管",
   "Bassoon": "巴松",
-  "Clarinet": "单簧管",
+  "Soprano Saxophone": "高音萨克斯管",
+  "Alto Saxophone": "中音萨克斯管",
+  "Tenor Saxophone": "次中音萨克斯管",
+  "Baritone Saxophone": "低音萨克斯管",
   "Piccolo": "短笛",
   "Flute": "长笛",
   "Recorder": "竖笛",
+  "Soprano Recorder": "高音竖笛",
   "Pan Flute": "排箫",
   "Bottle Blow": "瓶木管",
   "Whistle": "口哨声",
-  "Ocarina": "奥卡雷那",
+  "Ocarina": "陶笛",
   "Lead": "合成主音",
   "Lead lead": "合成主音",
   "Pad age": "合成音色",
@@ -81,12 +86,18 @@ export default {
   "Fiddle": "民族提琴",
   "Shanai": "山奈",
   "Tinkle Bell": "叮当铃",
-  "Agogo": "阿哥哥铃",
+  "Agogos": "阿戈戈铃",
   "Steel Drums": "钢鼓",
   "Taiko Drum": "太鼓",
-  "Melodic Tom": "通通鼓",
-  "Synth Drum": "合成鼓",
-  "Reverse Cymbal": "铜钹",
+  "Melodic Toms": "嗵嗵鼓",
+  "Synth Drums": "合成鼓",
+  "Reverse Cymbals": "反向镲",
+  "Agogo Bells": "阿戈戈铃",
+  "Taiko Drums": "太鼓",
+  "Bongos": "邦戈鼓",
+  "Bongo Bell": "邦戈铃",
+  "Congas": "康加鼓",
+  "Guiro": "刮壶",
   "Guitar Fret Noise": "吉他换把杂音",
   "Breath Noise": "呼吸声",
   "Seashore": "海浪声",
@@ -97,67 +108,98 @@ export default {
   "Gunshot": "枪声",
   "Acoustic Bass Drum": "大鼓",
   "Bass Drum": "大鼓",
-  "Side Stick": "小鼓鼓边",
+  "Side Drum": "小鼓鼓边",
   "Acoustic Snare": "小鼓",
-  "Hand Clap": "拍手",
+  "Hand Claps": "拍手",
   "Electric Snare": "小鼓",
-  "Low Floor Tom": "低音鼓",
-  "Closed Hi-Hat": "闭合钹",
-  "High Floor Tom": "低音鼓",
-  "Pedal Hi-Hat": "脚踏钹",
-  "Low Tom": "中音鼓",
-  "Open Hi-Hat": "强音钹",
-  "Low-Mid Tom": "中音鼓",
+  "Low Floor Tom": "低音嗵鼓",
+  "Closed Hi-Hat": "闭合踩镲",
+  "High Floor Tom": "高音落地嗵鼓",
+  "Pedal Hi-Hat": "脚踏踩镲",
+  "Low Tom": "低音嗵鼓",
+  "Open Hi-Hat": "开音踩镲",
+  "Low-Mid Tom": "中低音嗵鼓",
   "Hi Mid Tom": "高音鼓",
-  "Crash Cymbal": "强音钹",
-  "High Tom": "高音鼓",
-  "Ride Cymbal": "打点钹",
-  "Chinese Cymbal": "钹",
+  "Crash Cymbals": "对镲",
+  "High Tom": "高音嗵鼓",
+  "Ride Cymbals": "叮叮镲",
+  "Chinese Cymbals": "中国镲",
   "Ride Bell": "圆铃",
   "Tambourine": "铃鼓",
-  "Splash Cymbal": "小钹铜钹",
+  "Splash Cymbal": "溅音镲",
   "Cowbell": "牛铃",
+  "Crash Cymbal": "强音钹",
   "Vibra-Slap": "颤音器",
-  "Hi Bongo": "高音邦加鼓",
-  "Low Bongo": "低音邦加鼓",
+  "Ride Cymbal": "打点钹",
+  "Hi Bongo": "高音邦戈鼓",
+  "Low Bongo": "低音邦戈鼓",
   "Mute Hi Conga": "弱音高音康加鼓",
   "Open Hi Conga": "强音高音康加鼓",
   "Low Conga": "低音康加鼓",
   "High Timbale": "高音天巴鼓",
   "Low Timbale": "低音天巴鼓",
-  "High Agogo": "高音阿哥哥",
-  "Low Agogo": "低音阿哥哥",
-  "Cabasa": "串珠",
-  "Maracas": "沙铃",
+  "High Agogo": "高音阿戈戈铃",
+  "Low Agogo": "低音阿戈戈铃",
+  "Cabasa": "卡巴萨",
+  "Maracas": "沙锤",
   "Short Whistle": "短口哨",
   "Long Whistle": "长口哨",
   "Short Guiro": "短刮壶",
   "Long Guiro": "长刮壶",
-  "Claves": "梆子",
-  "Hi Wood Block": "高音木块",
-  "Low Wood Block": "低音木块",
+  "Claves": "响棒",
+  "Hi Wood Block": "高音木鱼",
+  "Low Wood Block": "低音木鱼",
   "Mute Triangle": "弱音三角铁",
   "Open Triangle": "强音三角铁",
+  "Drum Set": "架子鼓",
   "Hulusi flute": "葫芦丝",
   "Melodica": "口风琴",
   "Snare Drum": "小军鼓",
-  "Cymbal": "镲",
-  "Cymbals": "镲",
   "Horn in F": "圆号",
   "Triangle": "三角铁",
   "Vibrato": "颤音琴",
-  "Suspend Cymbal": "吊镲",
+  "Suspend Cymbals": "吊镲",
+  "Suspended Cymbals": "吊镲",
   "Tom-Toms": "嗵嗵鼓",
   "Bell": "铃铛",
   "Bells": "铃铛",
   "Alto Clarinet": "中音单簧管",
-  "Soprano Saxophone": "高音萨克斯风",
-  "Alto Saxophone": "中音萨克斯风",
-  "Tenor Saxophone": "次中音萨克斯风",
-  "Baritone Saxophone": "低音萨克斯风",
+  "Bass Clarinet": "低音单簧管",
+  "Clarinet": "单簧管",
   "Cornet": "短号",
   "Euphonium": "上低音号",
   "crash cymbals": "对镲",
-  "Suspend cymbals": "吊镲",
-  "Castanets": "响板"
-}
+  "Castanets": "响板",
+  "Shaker": "沙锤",
+  "Mark tree": "音树",
+  "Chimes": "管钟",
+  "Mark Tree": "音树",
+  "Tom-toms": "嗵嗵鼓",
+  "Hi-Hat": "踩镲",
+  "Sleigh Bells": "雪橇铃",
+  "Flexatone": "弹音器",
+  "Brake drum": "闸鼓",
+  "Gong": "锣",
+  "concert tom": "音乐会嗵嗵鼓",
+  "brake drum": "车轮鼓",
+  "finger cymbal": "指钹",
+  "ride cymbal": "叮叮镲",
+  "Concert Toms": "音乐会嗵嗵鼓",
+  "Vibraslap": "弹音器",
+  "Wood Blocks": "木鱼",
+  "Temple Blocks": "木鱼",
+  "Wood Block": "木鱼",
+  "Field Drum": "军鼓",
+  "Quad-Toms": "筒鼓",
+  "Quads": "筒鼓",
+  "Drums set": "架子鼓",
+  "High Bongo": "邦戈",
+  "Timbales": "天巴鼓",
+  "rain stick": "雨棒",
+  "String Bass": "弦乐低音",
+  "Floor Tom": "侧嗵鼓",
+  "Brake Drum": "闸鼓",
+  "Tam-tam": "大锣",
+  "Cymbal": "镲",
+  "Cymbals": "镲",
+}

src/helpers/utils.ts

@@ -46,18 +46,18 @@ export const browser = () => {
 }
 
 export const getRequestHostname = () => {
-  let search : any = ''
+  let search: any = ''
   try {
     search = qs.parse(location.search)
-  } catch (error) {}
-  if(search?.client){
+  } catch (error) { }
+  if (search?.client) {
     return search.client === 'student' ? '/api-student' : search.client === 'teacher' ? '/api-teacher' : '/api-backend'
   }
   const browserInfo = browser();
-  if (browserInfo.isStudent){
+  if (browserInfo.isStudent) {
     return '/api-student'
   }
-  if (browserInfo.isTeacher){
+  if (browserInfo.isTeacher) {
     return '/api-teacher'
   }
   return '/api-backend'
@@ -92,7 +92,7 @@ export const toNext = (hash: string, query?: any) => {
   // location.replace(nextUrl)
 }
 
-export const noop = (): void => {}
+export const noop = (): void => { }
 
 export const getImageUrl = (name: string) => {
   return new URL(`./dir/${name}.png`, location.origin).href
@@ -100,7 +100,7 @@ export const getImageUrl = (name: string) => {
 
 export const setTongjiTag = (event: any[]) => {
   if ((window as any)._czc) {
-    ;(window as any)._czc.push(event)
+    ; (window as any)._czc.push(event)
   }
 }
 
@@ -185,7 +185,7 @@ export const getVoiceChinesName = (name: string | undefined) => {
           //   循环名称: n,
           //   匹配: name.match(n)
           // })
-          viewname = name.replace(n, appState.chinesePartName[n])
+          viewname = appState.chinesePartName[n] //name.replace(n, appState.chinesePartName[n])
           break
         }
       }
@@ -208,5 +208,5 @@ export const setGlobalData = (_key: string, _value: any) => {
   if (!_key || !_value) return;
   const GYM = (window as any).GYM || {};
   GYM[_key] = _value
-  ;(window as any).GYM = GYM
+    ; (window as any).GYM = GYM
 }