From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e41d821..8245ac4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -283,40 +283,54 @@
//鏇存柊鐘舵�佺嚎绋�
var musicThread = new System.Threading.Thread(() =>
{
- while (true)
+ try
{
- if (!player.functionMusic.isOnline())
+ while (true)
{
- ///涓嶅湪绾夸笉璇荤姸鎬�
- 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(() =>
- {
- 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)
+ if (!player.functionMusic.isOnline())
{
- musicView.playBtn.IsSelected = true;
+ ///涓嶅湪绾夸笉璇荤姸鎬�
+ continue;
}
- else
+ //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.playBtn.IsSelected = false;
- }
- musicView.regionBtn.Text = player.functionMusic.GetRoomListName();
+ 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;
- }
- });
+ if (player.functionMusic.collect)
+ {
+ musicView.collectIconBtn.IsSelected = true;
+ }
+ else
+ {
+ musicView.collectIconBtn.IsSelected = false;
+ }
+ }
+ catch (Exception e)
+ {
+ string ee = e.Message;
+ }
+ });
+ }
+ }
+ catch (Exception e)
+ {
+ string ee = e.Message;
}
})
{ IsBackground = true, Name = "A31" };
--
Gitblit v1.8.0