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_Android/Assets/Language.ini | 9 ++++
HDL_ON/Common/R.cs | 22 ++++++++---
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 14 ++++--
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
HDL_ON/UI/Music/View/DialogView.cs | 20 +++++-----
6 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index fb8d022..9ae7b10 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,24 +1,28 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/A31PlayMusicPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/MusicMain.cs">
<Files>
- <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1141" Column="36" />
- <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="330" Column="22" />
+ <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1305" Column="18" />
+ <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="390" Column="10" />
<File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="291" Column="22" />
<File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="32" Column="5" />
+ <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="18" Column="37" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
<Node name="UI" expanded="True">
<Node name="Music" expanded="True">
<Node name="View" expanded="True" />
- <Node name="A31PlayMusicPage.cs" selected="True" />
+ <Node name="MusicMain.cs" selected="True" />
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 868db9c..c34ba87 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
index b2dd167..262c6af 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 3e4b739..6fea727 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -185,3 +185,12 @@
5034=鐢靛彴
5035=閫夋嫨缁勫悎
5036=闇�瑕佹挱鏀�
+5037=鑷冲皯閫変腑涓や釜浠ヤ笂鎾斁鍣�
+5038=涓嶈兘閫変腑涓や釜鎴栦袱涓互涓婁富鎾斁鍣ㄨ繘琛岀粍鍚�
+5039=杩樻病閫変腑鎾斁鍣�
+5040=閫変腑瑙ｉ櫎鎾斁鍣�
+5041=杩樻病鏈夐�夋嫨瑙ｉ櫎缁勬挱鏀惧櫒
+5042=閰嶇疆涓�...
+5043=瑙ｉ櫎涓�...
+5044=闊抽噺
+5045=鎬婚煶閲�
\ No newline at end of file
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 2423974..0567fd0 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -47,7 +47,7 @@
public readonly static int AtStartup = 149;
public readonly static int Unprotected = 148;
public readonly static int VerificationCodeError = 147;
- public readonly static int MultipleChoicesOfPagesYouNeedToProtect= 146;
+ public readonly static int MultipleChoicesOfPagesYouNeedToProtect = 146;
public readonly static int PleaseSelectThePageToBeUnlocked = 145;
public readonly static int UesrName = 144;
public readonly static int UesrNameCannotBeEmpty = 143;
@@ -99,7 +99,7 @@
public readonly static int DefaultGallery = 97;
public readonly static int DeleteRoom = 96;
public readonly static int Save = 95;
- public readonly static int FunctionManagement=94;
+ public readonly static int FunctionManagement = 94;
public readonly static int Floor = 93;
public readonly static int RoomName = 92;
@@ -116,7 +116,7 @@
public readonly static int DelFloorTip = 88;
public readonly static int Tip = 87;
public readonly static int Del = 86;
- public readonly static int Scenes=85;
+ public readonly static int Scenes = 85;
public readonly static int AddFloorFailed_FloorAlreadyExist = 84;
public readonly static int EditFloorName = 83;
public readonly static int AddFloors = 82;
@@ -154,12 +154,12 @@
public readonly static int BoundMobileInfo = 50;
public readonly static int MyQRcode = 49;
public readonly static int Name = 48;
- public readonly static int PersonalCenter=47;
+ public readonly static int PersonalCenter = 47;
public readonly static int InvalidLoginCertificate = 46;
public readonly static int AccountNotExist = 45;
public readonly static int ConfirmReset = 44;
public readonly static int RegistrationFailedPleaseTryAgain = 43;
- public readonly static int NetworkAnomaly=42;
+ public readonly static int NetworkAnomaly = 42;
public readonly static int FailedToSendVerificationCode = 41;
public readonly static int LoginFailed_AccountOrPasswordError = 40;
public readonly static int Personal = 39;
@@ -180,7 +180,7 @@
public readonly static int PlsEntryCorrectEmailAddress = 24;
public readonly static int VerificationCodeWrong = 23;
public readonly static int AccountAlreadyExists = 22;
- public readonly static int PasswordIsUnqualified=21;
+ public readonly static int PasswordIsUnqualified = 21;
public readonly static int IncorrectRepeatPassword = 20;
public readonly static int PlsEntryCorrectMobilNeumber = 19;
public readonly static int PlsEntryVerificationCode = 18;
@@ -239,5 +239,15 @@
public readonly static int radioLove = 5034;
public readonly static int selectedMergence = 5035;
public readonly static int readyPlay = 5036;
+ public readonly static int selectAtLeastTwoPlayers = 5037;
+ public readonly static int cannotSelectTwoOrMoreMainPlayersToCombine = 5038;
+ public readonly static int noSelectedPlay = 5039;
+ public readonly static int checkTheReleasePlayer = 5040;
+ public readonly static int noCheckTheReleasePlayer = 5041;
+ public readonly static int inConfiguration = 5042;
+ public readonly static int lifting = 5043;
+ public readonly static int volumeMusic = 5044;
+ public readonly static int totalVolume = 5045;
+
}
}
\ No newline at end of file
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 = "閫変腑瑙ｉ櫎鎾斁鍣�",
+ 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; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
@@ -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