From e322d91c7325019710bfdb046c5fea673031455a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 29 七月 2020 11:53:01 +0800
Subject: [PATCH] 20200729

---
 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs |   70 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 571bc9e..cc5652d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -26,9 +26,10 @@
                 }
                 catch { }
             }
+
         }
         View.PlayView playView = new View.PlayView();
-
+      
         public void Show()
         {
             ///1绉掑畾鏃舵洿鏂扮姸鎬�
@@ -60,9 +61,36 @@
             this.AddChidren(middLayout);
             ///鍔犺浇鎾斁闊充箰鐣岄潰鐨勬帶浠舵柟娉�
             playView.viewFrameLayout(middLayout);
+            //鏀惰棌鍥炬爣浜嬩欢
+            playView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                playView.collectIconBtn.IsSelected = !playView.collectIconBtn.IsSelected;
+                if (playView.collectIconBtn.IsSelected)
+                {
+                    A31MusicModel.Current.collection = true;
+                }
+                else
+                {
+                    A31MusicModel.Current.collection = false;
+                }
+
+            };
             #endregion
-
-
+            //蹇繘婊戝姩浜嬩欢;
+            EventHandler<int> seekClick = (sender, e) =>
+            {
+                int totalSecond = (int)(playView.diyArcSeekBar.Progress * 1.0f / 100 * int.Parse(A31MusicModel.Current.A31PlayStatus.totlen) / 1000);
+                //鍒嗛挓
+                int Minute = totalSecond / 60;
+                //绉掗挓
+                int Second = totalSecond % 60;
+                string time = "00" + ":" + (Minute.ToString().Length < 2 ? "0" + Minute.ToString() : Minute.ToString()) + ":" + (Second.ToString().Length < 2 ? "0" + Second.ToString() : Second.ToString());
+                SendMethod.Seek(time, A31MusicModel.Current);
+                A31MusicModel.Current.A31PlayStatus.curpos = (DateTime.Parse(time) - DateTime.Parse("00:00:00")).TotalMilliseconds.ToString();
+            };
+            //playView.diyArcSeekBar.OnProgressChangedEvent += seekClick;
+            playView.diyArcSeekBar.OnStopTrackingTouchEvent += seekClick;//蹇繘婊戝姩涓嶅彂鍛戒护锛�
+            
             ///鍒囨崲鎾斁妯″紡鐐瑰嚮浜嬩欢;
             playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>
              {
@@ -87,7 +115,7 @@
                          msg += Language.StringByID(StringId.listMode);
                          break;
                  }
-                 new PublicAssmebly().TipMsgAutoClose(msg, false, 1000);
+                 new PublicAssmebly().TipMsgAutoClose(msg, false,1000);
                  string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:" + "loopmode:" + A31MusicModel.Current.A31PlayStatus.loop;
                  SendMethod.SendCommand(url);
              };
@@ -241,7 +269,7 @@
                 ///绉婚櫎鐣岄潰
                 EventHandler<MouseEventArgs> removeFromParentView = (sen, e1) =>
                  {
-
+                   
                      if (updateSelectedMusicThread != null)
                      {
                          try
@@ -343,7 +371,7 @@
                 }
             };
             ///闊抽噺杩涘害鏉$偣鍑讳簨浠�
-            int startVolume = 0;//涔嬪墠鐨勯煶閲�
+            int startVolume =0;//涔嬪墠鐨勯煶閲�
             //int endVolume = 0;//鐜板湪鐨勯煶閲�
             EventHandler<int> progressClick = (sender, e) =>
             {
@@ -366,7 +394,7 @@
             playView.prevBtn.MouseUpEventHandler += (sender, e) =>
             {
                 playView.prevBtn.IsSelected = false;
-            };
+            }; 
             ///鏆傚仠/鎾斁鐐瑰嚮浜嬩欢
             playView.playBtn.MouseDownEventHandler += (sender, e) =>
             {
@@ -412,7 +440,7 @@
             };
 
         }
-
+      
         System.Threading.Thread timerThread;
         /// <summary>
         /// 瀹氭椂鏇存柊鐘舵��
@@ -485,16 +513,23 @@
                                     playView.loveBtn.IsSelected = false;
                                 }
                             }
-
-
+                            playView.regionBtn.Text = A31MusicModel.Current.GetRoomListName();
+                            if (A31MusicModel.Current.collection)
+                            {
+                                playView.collectIconBtn.IsSelected = true;
+                            }
+                            else
+                            {
+                                playView.collectIconBtn.IsSelected = false;
+                            }
                             //if (A31MusicModel.Current.A31PlayStatus.IsMute)
                             //{
-                            //    btnMute.IsSelected = true;//闈欓煶鍥炬爣
+                            //   // btnMute.IsSelected = true;//闈欓煶鍥炬爣
                             //    playView.volSeekBar.Progress = 0;
                             //}
                             //else
                             //{
-                            //    btnMute.IsSelected = false;//闈欓煶鍥炬爣
+                            //   // btnMute.IsSelected = false;//闈欓煶鍥炬爣
                             //    if (1000 < (DateTime.Now - A31MusicModel.ProgressDateTime).TotalMilliseconds)
                             //    {
                             //        //澹伴煶杩涘害鏉�;
@@ -530,12 +565,12 @@
                                 if (totalSecond == 0)
                                 {
                                     //姝屾洸杩涘害鏉�
-                                    //playView.volSeekBar.Progress = 0;
+                                    playView.diyArcSeekBar.Progress = 0;
                                 }
                                 else
                                 {
                                     //姝屾洸杩涘害鏉�
-                                    //playView.volSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
+                                    playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
                                 }
 
                             }
@@ -635,7 +670,7 @@
                     break;
 
                 case "BLUETOOTH"://钃濈墮
-                                 // currentsource.UnSelectedImagePath = "MusicIcon/bluetooth1.png";
+                   // currentsource.UnSelectedImagePath = "MusicIcon/bluetooth1.png";
                     playView.loveBtn.Alpha = 0.5f;
                     playView.loveBtn.Enable = false;
 
@@ -873,9 +908,12 @@
                                     artistNameBtn.X = songNameBtn.Right;
                                     artistNameBtn.TextColor = Color.MusicNoTxetColor;
                                 }
+
+
                             }
                         }
                         catch { }
+
                     });
                 }
             })
@@ -883,4 +921,4 @@
             updateSelectedMusicThread.Start();
         }
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0