From 544c4f40fe66dd03d8e014a3a0ff74c2801e9abc Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 08 六月 2020 15:22:10 +0800
Subject: [PATCH] 2020-06-08-2

---
 HDL_ON/UI/Music/View/DialogView.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/Music/View/DialogView.cs b/HDL_ON/UI/Music/View/DialogView.cs
index e6bc935..c87a513 100644
--- a/HDL_ON/UI/Music/View/DialogView.cs
+++ b/HDL_ON/UI/Music/View/DialogView.cs
@@ -402,7 +402,7 @@
 
                 if (playList1.Count <= 1)
                 {
-                    new PublicAssmebly().TipMsgAutoClose("鑷冲皯閫変腑涓や釜浠ヤ笂鎾斁鍣�", false);
+                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.selectAtLeastTwoPlayers), false);
                     return;
                 }
                 int number = 0;
@@ -415,7 +415,7 @@
                 }
                 if (number >= 2)
                 {
-                    new PublicAssmebly().TipMsgAutoClose("涓嶈兘閫変腑涓や釜鎴栦袱涓互涓婁富鎾斁鍣ㄨ繘琛岀粍鍚�", false);
+                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.cannotSelectTwoOrMoreMainPlayersToCombine), false);
                     //濡傛灉閮芥槸涓绘挱鏀炬垜灏变笉鑳界粍鍚�;
                     return;
                 }
@@ -663,7 +663,7 @@
             {
                 if (selectedBtn.Name.ToString() == "No")
                 {
-                    new PublicAssmebly().TipMsgAutoClose("杩樻病閫変腑鎾斁鍣�", false);
+                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.noSelectedPlay), false);
                     return;
                 }
                 dialogF.Close();
@@ -739,8 +739,8 @@
                 TextColor = Color.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
-                //TextID = StringId.selectedMergence,
-                Text = "閫変腑瑙i櫎鎾斁鍣�",
+                TextID = StringId.checkTheReleasePlayer,
+                //Text = "閫変腑瑙i櫎鎾斁鍣�",
                 IsBold = true,
             };
             topFra.AddChidren(txetBtn);
@@ -864,7 +864,7 @@
             {
                 if (playList1.Count == 0)
                 {
-                    new PublicAssmebly().TipMsgAutoClose("杩樻病鏈夐�夋嫨瑙i櫎缁勬挱鏀惧櫒", false);
+                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.noCheckTheReleasePlayer), false);
                     return;
                 }
                 dialog.Close();
@@ -878,7 +878,7 @@
         /// <param name="musicList1"></param>
         void MergeThreading(A31MusicModel serverMusic, List<A31MusicModel> musicList1)
         {
-            MusicMain.loading.Start("閰嶇疆涓�...");
+            MusicMain.loading.Start(Language.StringByID(StringId.inConfiguration));
             bool _if = false;
             System.Threading.Tasks.Task.Run(() =>
             {
@@ -998,7 +998,7 @@
         /// <param name="playList1"></param>
         void RemoveThreading(A31MusicModel a31player, List<A31MusicModel> playList1)
         {
-            MusicMain.loading.Start("瑙i櫎涓�...");
+            MusicMain.loading.Start(Language.StringByID(StringId.lifting));
             var slaveList = new List<Slave>();
             slaveList.AddRange(a31player.Slave.slave_list);
            // bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙i櫎鐨勬挱鏀�
@@ -1301,11 +1301,11 @@
                 volumeFra.AddChidren(volumeTextBtn);
                 if (player.ServerClientType == -1)
                 {
-                    volumeTextBtn.Text = player.Name + "闊抽噺";
+                    volumeTextBtn.Text = player.Name + Language.StringByID(StringId.volumeMusic);
                 }
                 else if (player.ServerClientType == 1)
                 {
-                    volumeTextBtn.Text = "鎬婚煶閲�";
+                    volumeTextBtn.Text = Language.StringByID(StringId.totalVolume);
                 }
 
                 DiyImageSeekBar volSeekBar = new DiyImageSeekBar

--
Gitblit v1.8.0