| .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/UI/Music/MusicMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/Music/View/DialogView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,11 +1,13 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/DialogView.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/A31LoveMusicList.cs"> <Files> <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="185" Column="1" /> <File FileName="../旧版本Music/MyMusic.cs" Line="1412" Column="1" /> <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="153" Column="51" /> <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="196" Column="52" /> <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="710" Column="26" /> <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="154" Column="1" /> <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="294" Column="84" /> <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="561" Column="42" /> <File FileName="HDL_ON/UI/Music/A31PlayStatus.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/Music/A31LoveMusicList.cs" Line="23" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -16,9 +18,8 @@ <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="Music" expanded="True"> <Node name="View" expanded="True"> <Node name="DialogView.cs" selected="True" /> </Node> <Node name="View" expanded="True" /> <Node name="A31LoveMusicList.cs" selected="True" /> </Node> <Node name="UI0-Public" expanded="True" /> <Node name="UI2" expanded="True"> .vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL_ON/UI/Music/MusicMain.cs
@@ -201,18 +201,8 @@ musicView.View(verticalRefresh); musicView.singerBtn.Text = a31player.A31PlayStatus.Artist; musicView.songNameBtn.Text = a31player.A31PlayStatus.Title; //musicView.musicNameBtn.Text = a31player.Name; if (a31player.ServerClientType == 1) { musicView.musicNameBtn.Text = a31player.MainPlayName; } else { musicView.musicNameBtn.Text = a31player.Name; } musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player); musicView.regionBtn.TextID = StringId.region; EventHandler<MouseEventArgs> clickMergence = (sender, e) => { @@ -292,14 +282,7 @@ { musicView.singerBtn.Text = a31player.A31PlayStatus.Artist; musicView.songNameBtn.Text = a31player.A31PlayStatus.Title; if (a31player.ServerClientType == 1) { musicView.musicNameBtn.Text = a31player.MainPlayName; } else { musicView.musicNameBtn.Text = a31player.Name; } musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player); if (a31player.A31PlayStatus.status == "play") { musicView.playBtn.IsSelected = true; HDL_ON/UI/Music/View/DialogView.cs
@@ -342,10 +342,9 @@ TextColor = Color.TextColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterLeft, Text = player.Name, Text = NamePlayer(player), }; PlayRow.AddChidren(PlayNameBtn); //选中图标控件 Button selectedIconBtn = new Button @@ -404,6 +403,20 @@ if (playList1.Count <= 1) { new PublicAssmebly().TipMsgAutoClose("至少选中两个以上播放器", false); return; } int number = 0; foreach (var musin in playList1) { if (musin.ServerClientType == 1) { number++; } } if (number >= 2) { new PublicAssmebly().TipMsgAutoClose("不能选中两个或两个以上主播放器进行组合", false); //如果都是主播放我就不能组合; return; } ///查询是否已经存在主播放; @@ -548,6 +561,51 @@ }; verticalScrolViewLayout.AddChidren(addFlieRow); if (player.A31PlayStatus.status == "play") { Button songNameBtn = new Button { X = Application.GetRealWidth(20), Y = Application.GetRealHeight(15), Width = Application.GetRealWidth(150), Height = Application.GetRealHeight(20), TextColor = Color.TextColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterLeft, Text = player.A31PlayStatus.Title, }; addFlieRow.AddChidren(songNameBtn); var wText = songNameBtn.GetTextWidth();//获取文本宽度 if (wText > 280) { songNameBtn.Width = Application.GetRealWidth(280); } else { songNameBtn.Width = wText + 5; } //歌手控件 Button singerBtn = new Button { X = songNameBtn.Right, Y = Application.GetRealHeight(15), Width = Application.GetRealWidth(280 - songNameBtn.Width), Height = Application.GetRealHeight(20), TextColor = Color.MusicNoTxetColor, TextSize = TextSize.Text12, TextAlignment = TextAlignment.CenterLeft, Text = "-" + player.A31PlayStatus.Artist.Trim(), }; addFlieRow.AddChidren(singerBtn); if (wText > 280) { ///歌名长度小于250才可以显示歌手出来 singerBtn.Width = Application.GetRealWidth(0); } } else { //播放器名称控件 Button PlayNameBtn = new Button { @@ -558,9 +616,11 @@ TextColor = Color.TextColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterLeft, Text = player.Name, Text = NamePlayer(player), }; addFlieRow.AddChidren(PlayNameBtn); } //选中图标控件 Button selectedIconBtn = new Button @@ -680,8 +740,8 @@ TextSize = TextSize.Text16, TextAlignment = TextAlignment.Center, //TextID = StringId.selectedMergence, Text = "选中解除播放器", IsBold = true, Text= a31player.Name, }; topFra.AddChidren(txetBtn); @@ -743,7 +803,7 @@ TextColor = Color.TextColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterLeft, Text = player.Name, Text = NamePlayer(player), }; PlayRow.AddChidren(PlayNameBtn); @@ -1064,6 +1124,19 @@ }); } public string NamePlayer(A31MusicModel a31player) { if (a31player.ServerClientType == 1) { return a31player.MainPlayName; } else { return a31player.Name; } } } [System.Serializable] public class A31Wifi {
