From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40

---
 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs |   81 +++++++++++++++++++++++-----------------
 1 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 44bf12c..9282ad4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -79,6 +79,7 @@
        
         public void Show()
         {
+          
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
@@ -141,7 +142,7 @@
                 {
 
                     var a31player = A31MusicModel.A31MusicModelList[i];
-                    //if (a31player.functionMusic.online == false)
+                    //if (a31player.functionMusic.isOnline() == false)
                     //{
                     //    //涓嶅湪绾夸笉鏄剧ず
                     //    continue;
@@ -157,7 +158,7 @@
                 {
 
                     var a31player = A31MusicModel.A31MusicModelList[i];
-                    if (a31player.functionMusic.online == false)
+                    if (a31player.functionMusic.isOnline() == false)
                     {
                         //涓嶅湪绾夸笉璇诲彇
                         continue;
@@ -193,7 +194,7 @@
             musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
             musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
             musicView.musicNameBtn.Text = player.functionMusic.name;
-            musicView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
+            //musicView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
             ///鏀惰棌浜嬩欢
             musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -206,6 +207,7 @@
                 {
                     player.functionMusic.collect = false;
                 }
+                player.functionMusic.CollectFunction();
             };
 
 
@@ -274,42 +276,49 @@
             //鏇存柊鐘舵�佺嚎绋�
             var musicThread = new System.Threading.Thread(() =>
             {
-                while (true)
+                try
                 {
-                    if (!player.functionMusic.online)
+                    while (true)
                     {
-                        ///涓嶅湪绾夸笉璇荤姸鎬�
-                        continue;
+                        if (!player.functionMusic.isOnline())
+                        {
+                            ///涓嶅湪绾夸笉璇荤姸鎬�
+                            continue;
+                        }
+                        //SendMethod.ReadStatus(player);
+                        SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
+                        System.Threading.Thread.Sleep(1000);
+                        Application.RunOnMainThread(() =>
+                        {
+                            try
+                            {
+                                musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
+                                musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
+                                musicView.musicNameBtn.Text = player.functionMusic.name;
+                                if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
+                                {
+                                    musicView.playBtn.IsSelected = true;
+                                }
+                                else
+                                {
+                                    musicView.playBtn.IsSelected = false;
+                                }
+                                musicView.regionBtn.Text = player.functionMusic.GetRoomListName();
+
+                                if (player.functionMusic.collect)
+                                {
+                                    musicView.collectIconBtn.IsSelected = true;
+                                }
+                                else
+                                {
+                                    musicView.collectIconBtn.IsSelected = false;
+                                }
+                            }
+                            catch (Exception e) { }
+                        });
                     }
-                    //SendMethod.ReadStatus(player);
-                    SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
-                    System.Threading.Thread.Sleep(1000);
-                    Application.RunOnMainThread(() =>
-                    {
-                        musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
-                        musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
-                        musicView.musicNameBtn.Text = player.functionMusic.name;
-                        if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
-                        {
-
-                            musicView.playBtn.IsSelected = true;
-                        }
-                        else
-                        {
-                            musicView.playBtn.IsSelected = false;
-                        }
-                        musicView.regionBtn.Text = player.functionMusic.GetRoomListName();
-
-                        if (player.functionMusic.collect)
-                        {
-                            musicView.collectIconBtn.IsSelected = true;
-                        }
-                        else
-                        {
-                            musicView.collectIconBtn.IsSelected = false;
-                        }
-                    });
                 }
+                catch (Exception e) { }
             })
             { IsBackground = true, Name = "A31" };
             musicThread.Start();
@@ -430,6 +439,8 @@
                 catch { }
             });
         }
+
+       
     }
 
 }

--
Gitblit v1.8.0