From a40848272e33822f72a7fe0310f079717bf73f23 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期五, 18 十月 2024 16:21:39 +0800 Subject: [PATCH] 修复金茂科技系统,金茂光伏问题 --- HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 96 ++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 36 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs index 44bf12c..8245ac4 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; @@ -149,7 +150,14 @@ Application.RunOnMainThread(() => { - MusicListView(a31player); + try + { + MusicListView(a31player); + } + catch (Exception ex) + { + MainPage.Log("Error", $"MusicListView 鏂规硶寮傚父锛歿ex.StackTrace}"); + } }); } ///杩涙潵璇讳竴娆¢煶涔愭挱鏀惧櫒鐘舵�� @@ -157,7 +165,7 @@ { var a31player = A31MusicModel.A31MusicModelList[i]; - if (a31player.functionMusic.online == false) + if (a31player.functionMusic.isOnline() == false) { //涓嶅湪绾夸笉璇诲彇 continue; @@ -193,7 +201,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 +214,7 @@ { player.functionMusic.collect = false; } + player.functionMusic.CollectFunction(); }; @@ -274,41 +283,54 @@ //鏇存柊鐘舵�佺嚎绋� 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) + { + string ee = e.Message; + } + }); } - //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) + { + string ee = e.Message; } }) { IsBackground = true, Name = "A31" }; @@ -430,6 +452,8 @@ catch { } }); } + + } } -- Gitblit v1.8.0