陈嘉乐
2020-06-09 a09b0a281e9038cb137a40aec37c868654704dec
2020-06-09-3

优化播放界面音量
7个文件已修改
113 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31MusicModel.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31PlayMusicPage.cs 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/MusicMain.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/View/PlayView.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,15 @@
<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/PlayView.cs">
    <Files>
      <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="998" Column="45" />
      <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="133" Column="45" />
      <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="988" Column="26" />
      <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="84" Column="17" />
      <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="358" Column="15" />
      <File FileName="HDL_ON/UI/Music/A31USBMusicList.cs" Line="217" Column="63" />
      <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="17" Column="33" />
      <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="163" Column="23" />
      <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="70" Column="33" />
      <File FileName="HDL_ON/UI/Music/View/MusicView.cs" Line="18" Column="19" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="31" Column="48" />
      <File FileName="HDL_ON/UI/Music/View/PlayView.cs" Line="185" Column="51" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -15,11 +18,13 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="UI" expanded="True">
                <Node name="Music" expanded="True">
                  <Node name="View" expanded="True" />
                  <Node name="A31MusicSourcePage.cs" selected="True" />
                  <Node name="View" expanded="True">
                    <Node name="PlayView.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True" />
          </Node>
        </State>
      </Pad>
.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
HDL_ON/UI/Music/A31MusicModel.cs
@@ -64,8 +64,10 @@
        /// </summary>
        public int Port = 49153;
        public bool IsEnd;
        /// <summary>
        /// 是否是播放器列表最后一个(true)
        /// </summary>
        public bool IsEnd=false;
        public int A31DeviceType;
HDL_ON/UI/Music/A31PlayMusicPage.cs
@@ -26,15 +26,29 @@
                }
                catch { }
            }
            if (VolumeThread != null)
            {
                try
                {
                    if (VolumeThread.IsAlive)
                    {
                        VolumeThread.Abort();
                    }
                }
                catch { }
            }
        }
        View.PlayView playView = new View.PlayView();
        int startVolume = 0;//之前的音量
        int endVolume = 0;//现在的音量
        public void Show()
        {
            ///1秒定时更新状态
            timerUpdateStatus();
            ///0.5秒监听音量状态
            VolumeUpdateSend();
            #region   ---界面布局---
            this.BackgroundColor = Color.ViewColor;
            var topView = new TopView();
@@ -345,16 +359,18 @@
                }
            };
            ///音量进度条点击事件
            int startVolume =0;//之前的音量
            //int startVolume =0;//之前的音量
            //int endVolume = 0;
            EventHandler<int> progressClick = (sender, e) =>
            {
                playView.volValueBtn.Text = playView.volSeekBar.Progress + "%";
                if (startVolume != e)
                {
                    startVolume = e;
                    SendMethod.ControlVolume(e, A31MusicModel.Current);
                    A31MusicModel.Current.A31PlayStatus.vol = e.ToString();
                }
                endVolume = e;
                //if (startVolume != e)
                //{
                //    startVolume = e;
                //    SendMethod.ControlVolume(e, A31MusicModel.Current);
                //    A31MusicModel.Current.A31PlayStatus.vol = e.ToString();
                //}
            };
            playView.volSeekBar.OnProgressChangedEvent += progressClick;
            playView.volSeekBar.OnStopTrackingTouchEvent += progressClick;
@@ -413,6 +429,28 @@
            };
        }
        System.Threading.Thread VolumeThread;
        /// <summary>
        /// 音量发送
        /// </summary>
        void VolumeUpdateSend()
        {
            VolumeThread = new System.Threading.Thread((obj) =>
            {
                while (true)
                {
                    if (startVolume != endVolume)
                    {
                        startVolume = endVolume;
                        SendMethod.ControlVolume(endVolume, A31MusicModel.Current);
                        A31MusicModel.Current.A31PlayStatus.vol = endVolume.ToString();
                    }
                    System.Threading.Thread.Sleep(300);
                }
            })
            { IsBackground = true };
            VolumeThread.Start();
        }
        System.Threading.Thread timerThread;
        /// <summary>
        /// 定时更新状态
@@ -423,13 +461,6 @@
            {
                while (true)
                {
                    //if (startVolume != endVolume)
                    //{
                    //    startVolume = endVolume;
                    //    SendMethod.ControlVolume(endVolume, A31MusicModel.Current);
                    //    A31MusicModel.Current.A31PlayStatus.vol = endVolume.ToString();
                    //}
                    Application.RunOnMainThread(() =>
                    {
                        try
@@ -521,8 +552,8 @@
                            //更新播放器音量给系统音量
                            Volume.MusicVolume = playView.volSeekBar.Progress;
                            //当前播放音乐时间        
                            int playSecond = int.Parse(A31MusicModel.Current.A31PlayStatus.curpos) / 1000+(int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
                            int playSecond = int.Parse(A31MusicModel.Current.A31PlayStatus.curpos) / 1000 + (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
                            int playMusicMinute = playSecond / 60;
                            //秒钟
                            int playMusicSecond = playSecond % 60;
HDL_ON/UI/Music/MusicMain.cs
@@ -93,6 +93,14 @@
                    {
                        continue;
                    }
                    if (A31MusicModel.A31MusicModelList.Count - 1 == i)
                    {
                        a31player.IsEnd = true;
                    }
                    else
                    {
                        a31player.IsEnd = false;
                    }
                    ///加载界面时默认不在线
                    ///这里标记是为了不读取不在线播放器状态
                    a31player.IsOnLine = false;
@@ -165,6 +173,14 @@
                            {
                                continue;
                            }
                            if (A31MusicModel.A31MusicModelList.Count - 1 == i)
                            {
                                a31player.IsEnd = true;
                            }
                            else
                            {
                                a31player.IsEnd = false;
                            }
                            MusicListView(a31player);
                        }
@@ -204,7 +220,9 @@
            musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
            musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
            musicView.regionBtn.TextID = StringId.region;
            if (a31player.IsEnd) {
                musicView.muiscFl.Height =Application.GetRealHeight(12 + 139 + 12);
            }
            EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
            {
                if (a31player.ServerClientType == 0)
HDL_ON/UI/Music/View/PlayView.cs
@@ -182,6 +182,7 @@
            ThumbImagePath = "MusicIcon/progressIcon.png",//进度条按钮图标
            ThumbImageHeight = Application.GetMinRealAverage(54),//进度条按钮图标的高度(默认正方形:宽和高一样)
            SeekBarViewHeight = Application.GetMinRealAverage(8),//进度条的高度
            //ProgressChangeDelayTime=1000,//一秒发送一次
        };
        /// <summary>