2020-06-08-1

陈嘉乐

2020-06-08 3597e2aa1281f0e517c5ed8a9fe7e8f72030c744

 HDL_ON/UI/Music/A31PlayMusicPage.cs

@@ -14,10 +14,23 @@
        public override void RemoveFromParent()
        {
            base.RemoveFromParent();
            timerThread?.Abort();
            Volume.VolumeChange = null;
            if (timerThread != null)
            {
                try
                {
                    if (timerThread.IsAlive)
                    {
                        timerThread.Abort();
                    }
                }
                catch { }
            }
           
        }
        View.PlayView playView = new View.PlayView();
    

        public void Show()
        {
            ///1秒定时更新状态
@@ -104,11 +117,6 @@

                }
                A31MusicModel.Save();

                ////保存
                //string saveRoomUIName = "A31_" + A31MusicModel.Current.IPAddress;
                //Shared.IO.FileUtils.WriteFileByBytes(saveRoomUIName,
                //Shared.SimpleControl.CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(A31MusicModel.Current)));
            };
            ///切换播放模式点击事件;
            playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>
@@ -234,11 +242,20 @@
                ///移除界面
                EventHandler<MouseEventArgs> removeFromParentView = (sen, e1) =>
                 {
                     if (updateSelectedMusicThread != null && updateSelectedMusicThread.IsAlive)
                   
                     if (updateSelectedMusicThread != null)
                     {
                         updateSelectedMusicThread.Abort();
                         ///关闭线程
                         try
                         {
                             if (updateSelectedMusicThread.IsAlive)
                             {
                                 updateSelectedMusicThread.Abort();
                                 ///关闭线程
                             }
                         }
                         catch { }
                     }

                     popFra.RemoveFromParent();
                 };
                backIextBtn.MouseUpEventHandler += removeFromParentView;
@@ -318,15 +335,25 @@
            {
                if (A31MusicModel.Current.ServerClientType == 1 && A31MusicModel.Current.Slave.slave_list.Count != 0)
                { ///主播放器
                    new View.DialogView { }.PlayerVolumeView(A31MusicModel.Current);
                   //new View.DialogView { }.PlayerVolumeView(A31MusicModel.Current);

                    var volumeView = new View.DialogView { };
                    volumeView.PlayerVolumeView(A31MusicModel.Current);
                    volumeView.UpdateVolume();

                }
            };
            ///音量进度条点击事件
            int startVolume =0;//之前的音量
            EventHandler<int> progressClick = (sender, e) =>
            {
                playView.volValueBtn.Text = playView.volSeekBar.Progress + "%";
                SendMethod.ControlVolume(playView.volSeekBar.Progress, A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();
                if (startVolume != e)
                {
                    startVolume = e;
                    SendMethod.ControlVolume(e, A31MusicModel.Current);
                    A31MusicModel.Current.A31PlayStatus.vol = e.ToString();
                }
            };
            playView.volSeekBar.OnProgressChangedEvent += progressClick;
            playView.volSeekBar.OnStopTrackingTouchEvent += progressClick;
@@ -374,8 +401,14 @@
                    return;
                }
                playView.volSeekBar.Progress = volume;
                SendMethod.ControlVolume(playView.volSeekBar.Progress, A31MusicModel.Current);
                A31MusicModel.Current.A31PlayStatus.vol = playView.volSeekBar.Progress.ToString();

                if (startVolume != volume)
                {
                    startVolume = volume;
                    SendMethod.ControlVolume(volume, A31MusicModel.Current);
                    A31MusicModel.Current.A31PlayStatus.vol = volume.ToString();
                }

            };

        }
@@ -389,6 +422,13 @@
            {
                while (true)
                {
                    //if (startVolume != endVolume)
                    //{
                    //    startVolume = endVolume;
                    //    SendMethod.ControlVolume(endVolume, A31MusicModel.Current);
                    //    A31MusicModel.Current.A31PlayStatus.vol = endVolume.ToString();
                    //}

                    Application.RunOnMainThread(() =>
                    {
                        try
@@ -771,10 +811,17 @@
                ///点击播放事件
                clickBtn.MouseUpEventHandler += (sender, e) =>
                {
                    if (updateSelectedMusicThread != null && updateSelectedMusicThread.IsAlive)
                    if (updateSelectedMusicThread != null)
                    {
                        updateSelectedMusicThread.Abort();
                        ///关闭线程
                        try
                        {
                            if (updateSelectedMusicThread.IsAlive)
                            {
                                updateSelectedMusicThread.Abort();
                                ///关闭线程
                            }
                        }
                        catch { }
                    }
                    System.Threading.Tasks.Task.Run(() =>
                    {