陈嘉乐
2020-05-27 e82cf12d701ebc716f85675ba63b6b024005d9b1
2020-05-27-1

我的列表文件夹快速播放音乐
9个文件已修改
135 ■■■■ 已修改文件
.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31MyList.cs 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31MyListMusic.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/MusicMain.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/View/MusicView.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.DS_Store
Binary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,13 +1,16 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/A31MusicSourcePage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/MusicView.cs">
    <Files>
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="525" Column="23" />
      <File FileName="../旧版本Music/MyMusic.cs" Line="813" Column="70" />
      <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="64" Column="1" />
      <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="19" Column="33" />
      <File FileName="HDL_ON/UI/Music/A31MyList.cs" Line="7" Column="27" />
      <File FileName="HDL_ON/UI/Music/A31MyListMusic.cs" Line="29" Column="46" />
      <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="201" Column="36" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="494" Column="37" />
      <File FileName="../旧版本Music/MyMusic.cs" Line="385" Column="21" />
      <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="176" Column="1" />
      <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="91" Column="58" />
      <File FileName="HDL_ON/UI/Music/A31MyList.cs" Line="257" Column="30" />
      <File FileName="HDL_ON/UI/Music/A31MyListMusic.cs" Line="207" Column="61" />
      <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="204" Column="40" />
      <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="215" Column="28" />
      <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="298" Column="23" />
      <File FileName="HDL_ON/UI/Music/View/MusicView.cs" Line="102" Column="23" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -17,7 +20,9 @@
              <Node name="Common" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="Music" expanded="True">
                  <Node name="A31MusicSourcePage.cs" selected="True" />
                  <Node name="View" expanded="True">
                    <Node name="MusicView.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
HDL_ON/UI/Music/A31MyList.cs
@@ -102,33 +102,60 @@
                    Height = Application.GetMinRealAverage(24),
                    UnSelectedImagePath = "MusicIcon/filePause.png",
                    SelectedImagePath = "MusicIcon/filePlay.png",
                    Tag= list.ListName,
                    Tag= list,
                };
                addFlieRow.AddChidren(playIconBtn);
                playIconBtn.MouseUpEventHandler += (sender, e) =>
                playIconBtn.MouseUpEventHandler = (sender, e) =>
                {
                    if (list.MusicInfoList.Count == 0)
                    {
                        return;
                    }
                    ///取随机数;
                    var ra = new Random { }.Next(0, list.MusicInfoList.Count);
                    ///查找当前的音乐;
                    var songs = list.MusicInfoList[ra];
                    //点击按钮随机播放音乐
                    System.Threading.Tasks.Task.Run(() =>
                    ///查找当前播放音乐是否这个列表
                    var music = list.MusicInfoList.Find((c) => (c.URL == A31MusicModel.Current.A31PlayStatus.TrackURL) && (list.ListName == A31MusicModel.Current.A31PlayStatus.Artist));
                    if (playIconBtn.IsSelected)
                    {
                        System.Threading.Thread.Sleep(50);
                        Application.RunOnMainThread(() =>
                        if (music != null && A31MusicModel.Current.A31PlayStatus.status == "play")
                        {
                            //移除界面
                            SendMethod.Pause(A31MusicModel.Current);
                            A31MusicModel.Current.A31PlayStatus.status = "pause";
                        }
                    }
                    else
                    {
                        if (music != null && A31MusicModel.Current.A31PlayStatus.status != "play")
                        {
                            SendMethod.Play(A31MusicModel.Current);
                            A31MusicModel.Current.A31PlayStatus.status = "play";
                        }
                        else
                        {
                            ///取随机数;
                            var ra = new Random { }.Next(0, list.MusicInfoList.Count);
                            ///查找当前的音乐;
                            var songs = list.MusicInfoList[ra];
                            //点击按钮随机播放音乐
                            System.Threading.Tasks.Task.Run(() =>
                            {
                                PushList(songs, list.ListName, list.MusicInfoList);
                                System.Threading.Thread.Sleep(50);
                                Application.RunOnMainThread(() =>
                                {
                                    //移除界面
                                    System.Threading.Tasks.Task.Run(() =>
                                    {
                                        PushList(songs, list.ListName, list.MusicInfoList);
                                    });
                                });
                            });
                        });
                    });
                        }
                    }
                };
                //文件名控件
                Button fileNameBtn = new Button
@@ -230,7 +257,10 @@
                            {
                                RowLayout view = (RowLayout)middViewLayout.GetChildren(i);
                                var playBtn = (Button)view.GetChildren(1);//直接FrameLayout父控件找到该控件Button
                                if (A31MusicModel.Current.A31PlayStatus.Artist == playBtn.Tag.ToString())
                                var listIfon = playBtn.Tag as FileListInfo;//强制转换为FileListInfo类型;
                                ///查找当前播放音乐是否这个列表
                                var musics = listIfon.MusicInfoList.Find((c) => c.URL == A31MusicModel.Current.A31PlayStatus.TrackURL);
                                if (musics!=null&&A31MusicModel.Current.A31PlayStatus.Artist == listIfon.ListName && A31MusicModel.Current.A31PlayStatus.status == "play")
                                {
                                    playBtn.IsSelected = true;
                                }
HDL_ON/UI/Music/A31MyListMusic.cs
@@ -65,10 +65,12 @@
                    //防止歌手名字为空抛异常
                    songs.Artist = " ";
                }
                FrameLayout musicViewFl = new FrameLayout
                RowLayout musicViewFl = new RowLayout
                {
                    Width = Application.GetRealWidth(375),
                    Height = Application.GetRealHeight(44),
                    LineColor = Color.WhiteColor,
                    SubViewWidth = Application.GetRealWidth(90),//改变编辑控件宽度多少;
                };
                middViewLayout.AddChidren(musicViewFl);
                //列表当前播放音乐图标
@@ -177,7 +179,21 @@
                {
                    loveIcon.IsSelected = false;
                }
                ///删除控件
                var delBtn = new Button
                {
                    BackgroundColor = Color.MusicDelColor,
                    Text = Language.StringByID(StringId.delMusic),
                    TextColor = Color.WhiteColor,
                    TextSize = TextSize.Text16,
                };
                musicViewFl.AddRightView(delBtn);
                delBtn.MouseUpEventHandler += (sender, e) =>
                {
                    fileListInfo.MusicInfoList.Remove(songs);
                    A31MusicModel.Save();
                    musicViewFl.RemoveFromParent();
                };
                //添加到我的列表
                Button addIcon = new Button
                {
HDL_ON/UI/Music/MusicMain.cs
@@ -81,7 +81,7 @@
            else
            {
                clearA31Threads();
                verticalRefresh.RemoveAll();
               //verticalRefresh.RemoveAll();
                for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
                {
                    var a31player = A31MusicModel.A31MusicModelList[i];
@@ -203,19 +203,14 @@
            {
                musicView.playBtn.IsSelected = false;
            }
            EventHandler<MouseEventArgs> clickPlay = (sender, e) =>
            {
                A31MusicModel.Current = a31player;//当前播放器
            musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
                 A31MusicModel.Current = a31player;//当前播放器
                var a31PlayMusicPage = new A31PlayMusicPage();
                MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                a31PlayMusicPage.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            musicView.singerBtn.MouseUpEventHandler += clickPlay;
            musicView.songNameBtn.MouseUpEventHandler += clickPlay;
            musicView.musicNameBtn.MouseUpEventHandler += clickPlay;
            musicView.regionBtn.MouseUpEventHandler += clickPlay;
                 MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                 a31PlayMusicPage.Show();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
            ///上一曲点击事件
            musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
HDL_ON/UI/Music/View/MusicView.cs
@@ -138,6 +138,16 @@
            TextAlignment = TextAlignment.CenterLeft,
        };
        /// <summary>
        /// 点击事件
        /// </summary>
        public Button clickBtn = new Button
        {
            Width = Application.GetRealWidth(130),
            Height = Application.GetRealHeight(139),
        };
        /// <summary>
        /// 上一曲
        /// </summary>
@@ -191,6 +201,7 @@
            musicIfonFl.AddChidren(singerBtn);
            musicIfonFl.AddChidren(musicNameBtn);
            musicIfonFl.AddChidren(regionBtn);
            musicIfonFl.AddChidren(clickBtn);
            musicIfonFl.AddChidren(prevBtn);
            musicIfonFl.AddChidren(playBtn);
            musicIfonFl.AddChidren(nextBtn);