陈嘉乐
2020-06-23 8dd022404b670ccb54f1741cb02b292b87b1a201
2020-06-23-1

隐藏在线电台,音乐房间扩大点击热键
14个文件已修改
74 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 16 ●●●● 补丁 | 查看 | 原始文档 | 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 | 历史
DLL/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
DLL/DLL/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
DLL/DLL/Android/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
DLL/DLL/Android/Shared.Droid.HDLWidget.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,10 +1,8 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="410" Column="46" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs" Line="881" Column="13" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="362" Column="86" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs" Line="106" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -16,16 +14,10 @@
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Music" expanded="True">
                      <Node name="View" expanded="True" />
                      <Node name="A31PlayMusicPage.cs" selected="True" />
                      <Node name="A31MusicSourcePage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="References" expanded="True" />
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True" />
              </Node>
            </Node>
          </Node>
@@ -35,7 +27,7 @@
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
.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
DLL/.DS_Store
Binary files differ
DLL/DLL/.DS_Store
Binary files differ
DLL/DLL/Android/.DS_Store
Binary files differ
DLL/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
HDL-ON_Android/Assets/Phone/.DS_Store
Binary files differ
HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs
@@ -24,7 +24,7 @@
            this.BackgroundColor = Color.ViewColor;
            var topView = new TopView();
            this.AddChidren(topView.TopFLayoutView());
            topView.topNameBtn.TextID = StringId.a31Music;
            topView.topNameBtn.TextID = StringId.myLove;//a31Music;
            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -54,7 +54,7 @@
                middViewLayout.EndHeaderRefreshing();
            };
            #endregion
            MusicView(Language.StringByID(StringId.a31Music));
            MusicView(Language.StringByID(StringId.myLove));
        }
        /// <summary> 
        /// 加载数据的方法
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -139,10 +139,10 @@
            radioSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
            radioSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/radio.png";
            radioSourceView.textBtn.TextID = StringId.radio;
            radioSourceView.FrameLayoutView(fL3);
            //radioSourceView.FrameLayoutView(fL3);暂时隐藏在线电台
            View.MusicSourceView qqMusicSourceView = new View.MusicSourceView();
            qqMusicSourceView.fLayout.Y = radioSourceView.fLayout.Bottom;
            qqMusicSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
            qqMusicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/qqMusic.png";
            qqMusicSourceView.textBtn.TextID = StringId.qqMusic;
            qqMusicSourceView.FrameLayoutView(fL3);
@@ -191,11 +191,18 @@
            ///我的喜爱事件
            myLoveView.clickBtn.MouseUpEventHandler += (sender, e) =>
            {
                A31LoveList a31LoveList = new A31LoveList();
                MainPage.BasePageView.AddChidren(a31LoveList);
                //A31LoveList a31LoveList = new A31LoveList();
                //MainPage.BasePageView.AddChidren(a31LoveList);
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //a31LoveList.Show();
                //a31LoveList.UpdateSelectedFile();
                A31LoveMusicList a31LoveMusicList = new A31LoveMusicList();
                MainPage.BasePageView.AddChidren(a31LoveMusicList);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                a31LoveList.Show();
                a31LoveList.UpdateSelectedFile();
                a31LoveMusicList.Show();
                a31LoveMusicList.UpdateSelectedMusic();
            };
            ///我的列表事件
            myListView.clickBtn.MouseUpEventHandler += (sender, e) =>
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -212,7 +212,6 @@
        /// </summary>
        void MusicListView(A31MusicModel a31player)
        {
            
            MusicView musicView = new MusicView();
            musicView.View(verticalRefresh);
@@ -239,15 +238,17 @@
            musicView.mergeBtn.MouseUpEventHandler += clickMergence;
            musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;
            musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
                 A31MusicModel.Current = a31player;//当前播放器
            EventHandler<MouseEventArgs> clickPlayView = (sender, e) =>
            {
                A31MusicModel.Current = a31player;//当前播放器
                var a31PlayMusicPage = new A31PlayMusicPage();
                 MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                 a31PlayMusicPage.Show();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
                MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                a31PlayMusicPage.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            musicView.musicIfonFl.MouseUpEventHandler += clickPlayView;
            musicView.clickBtn.MouseUpEventHandler += clickPlayView;//
            ///上一曲点击事件
            musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
            {
@@ -313,8 +314,9 @@
                    });
                }
            });
        }
            }
        /// <summary>
        /// 读取主从关系
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -12,7 +12,6 @@
        {
            Height = Application.GetRealHeight(12 + 139),
            Width = Application.GetRealWidth(375),
        };
        /// <summary>
        ///白色背景的控件
@@ -119,10 +118,10 @@
        public Button musicNameBtn = new Button
        {
            X = Application.GetRealWidth(54),
            Y = Application.GetRealHeight(58),
            Y = Application.GetRealHeight(40),//58
            Width = Application.GetRealWidth(140),
            Height = Application.GetRealHeight(17),
            TextColor = Color.MusicTxet14Color,
            TextColor = Color.TextCancelColor,
            TextSize = TextSize.Text12,
            TextAlignment = TextAlignment.CenterLeft,
        };
@@ -133,7 +132,7 @@
        {
            //Text = i.ToString(),
            X = Application.GetRealWidth(54),
            Y = Application.GetRealHeight(79),
            Y = Application.GetRealHeight(61),//79
            Width = Application.GetRealWidth(120),
            Height = Application.GetRealHeight(14),
            TextColor = Color.MusicNoTxetColor,
@@ -201,7 +200,7 @@
            musicIfonFl.AddChidren(mergeBtn);
            musicIfonFl.AddChidren(collectIconBtn);
            musicIfonFl.AddChidren(songNameBtn);
            musicIfonFl.AddChidren(singerBtn);
            //musicIfonFl.AddChidren(singerBtn);
            musicIfonFl.AddChidren(musicNameBtn);
            musicIfonFl.AddChidren(regionBtn);
            musicIfonFl.AddChidren(clickBtn);
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -4,8 +4,6 @@
{
    public class PlayView
    {
        /// <summary>
        ///白色图片父控件
        /// </summary>