Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/CustomControl/RichText/RichTextAutoBottom.cs

@@ -36,14 +36,16 @@ namespace UAS_MES.CustomControl.RichText
             if (color == Color.Red && Entity.SystemInf.CheckAudioEnable)
             {
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
             }
-            else
+            else if(color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
-                FileName = Application.StartupPath + @"\Resources\Sound\69978.wav";
+                FileName = Application.StartupPath + @"\Resources\Sound\8378.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
             }
-            thread.Start();
-            thread = new Thread(PlaySound);
         }
 
         /// <summary>
@@ -61,14 +63,16 @@ namespace UAS_MES.CustomControl.RichText
             if (color == Color.Red && Entity.SystemInf.CheckAudioEnable)
             {
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
             }
-            else
+            else if(color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
                 //颜色是绿色，进行正确提示音
-                FileName = Application.StartupPath + @"\Resources\Sound\69978.wav";
+                FileName = Application.StartupPath + @"\Resources\Sound\8378.wav";
+                thread.Start();
+                thread = new Thread(PlaySound);
             }
-            thread.Start();
-            thread = new Thread(PlaySound);
         }
 
         private void PlaySound()