From a7d20263f28aa009ef8e064a7f9700d7cd642492 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 10:06:47 +0800
Subject: [PATCH] 2020-06-10-1
---
HDL_ON/UI/Music/View/DialogView.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/Music/View/DialogView.cs b/HDL_ON/UI/Music/View/DialogView.cs
index e6bc935..b136a9a 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 = "閫変腑瑙ｉ櫎鎾斁鍣�",
+ TextID = StringId.checkTheReleasePlayer,
+ //Text = "閫変腑瑙ｉ櫎鎾斁鍣�",
IsBold = true,
};
topFra.AddChidren(txetBtn);
@@ -864,7 +864,7 @@
{
if (playList1.Count == 0)
{
- new PublicAssmebly().TipMsgAutoClose("杩樻病鏈夐�夋嫨瑙ｉ櫎缁勬挱鏀惧櫒", 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("瑙ｉ櫎涓�...");
+ MusicMain.loading.Start(Language.StringByID(StringId.lifting));
var slaveList = new List<Slave>();
slaveList.AddRange(a31player.Slave.slave_list);
// bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
@@ -1224,8 +1224,7 @@
TextColor = Color.TextColor,
TextSize = TextSize.Text16,
TextAlignment = TextAlignment.Center,
- //TextID = StringId.readyPlay,
- Text="璋冭妭闊抽噺",
+ TextID = StringId.volumeAdjustment,
IsBold = true,
};
topFra.AddChidren(txetBtn);
@@ -1301,11 +1300,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