| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/Music/View/DialogView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.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> .vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -185,3 +185,12 @@ 5034=电台 5035=选择组合 5036=需要播放 5037=至少选中两个以上播放器 5038=不能选中两个或两个以上主播放器进行组合 5039=还没选中播放器 5040=选中解除播放器 5041=还没有选择解除组播放器 5042=配置中... 5043=解除中... 5044=音量 5045=总音量 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; } } 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
