From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index f2c4b44..0a5c9a5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -10,16 +10,16 @@
{
public class MusicMain : FrameLayout
{
- private static MusicMain m_MusicMain = null;
- public static MusicMain mMusicMain
+ private static MusicMain s_Current = null;
+ public static MusicMain Current
{
get
{
- if (m_MusicMain == null)
+ if (s_Current == null)
{
- m_MusicMain = new MusicMain();
+ s_Current = new MusicMain();
}
- return m_MusicMain;
+ return s_Current;
}
}
@@ -36,7 +36,7 @@
public override void RemoveFromParent()
{
base.RemoveFromParent();
- clearA31Threads();
+ ClearA31Threads();
//杩涙潵娌℃湁闊充箰琚敹钘忚繃锛岄��鍑烘湁闊充箰琚敹钘忚繃
//A31MusicModel.ReadMusicStates();
}
@@ -47,7 +47,7 @@
/// <summary>
/// 绉婚櫎绾跨▼
/// </summary>
- static void clearA31Threads()
+ static void ClearA31Threads()
{
var threads = threadLists.FindAll((obj) => { return obj.Name == "A31"; });
@@ -79,6 +79,7 @@
public void Show()
{
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
@@ -119,13 +120,13 @@
{
verticalRefresh.RemoveAll();
A31MusicModel.A31MusicModelList.Clear();
- var musicListFunction = FunctionList.List.GetMusicList();
- for (int i = 0; i < musicListFunction.Count; i++)
+ var musicDeviceList= FunctionList.List.GetMusicList();
+ for (int i = 0; i < musicDeviceList.Count; i++)
{
- var function = musicListFunction[i];
+ var function = musicDeviceList[i];
var music = A31MusicModel.A31MusicModelList.Find((obj) =>
- (obj.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
- obj.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+ (obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.MusicStandard) || (
+ obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.AvMusic)
);
if (music == null)
{
@@ -168,7 +169,7 @@
try
{
- SendMethod.mMethod.RefreshDeviceStatus(new List<string> { a31player.functionMusic.deviceId });
+ SendMethod.Current.RefreshDeviceStatus(new List<string> { a31player.functionMusic.deviceId });
System.Threading.Thread.Sleep(500);
}
catch { }
@@ -233,7 +234,7 @@
player.functionMusic.SetAttrState(KeyProperty.song_step, ValueProperty.up);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.song_step, ValueProperty.up);
- SendMethod.mMethod.SendControlCommand(player.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(player.functionMusic, dic);
};
musicView.prevBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -256,7 +257,7 @@
player.functionMusic.SetAttrState(KeyProperty.on_off, status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.on_off, status);
- SendMethod.mMethod.SendControlCommand(player.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(player.functionMusic, dic);
};
///涓嬩竴鏇茬偣鍑讳簨浠�
musicView.nextBtn.MouseDownEventHandler += (sender, e) =>
@@ -265,7 +266,7 @@
player.functionMusic.SetAttrState(KeyProperty.song_step, ValueProperty.down);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add(KeyProperty.song_step, ValueProperty.down);
- SendMethod.mMethod.SendControlCommand(player.functionMusic, dic);
+ SendMethod.Current.SendControlCommand(player.functionMusic, dic);
};
musicView.nextBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -282,7 +283,7 @@
continue;
}
//SendMethod.ReadStatus(player);
- SendMethod.mMethod.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
+ SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
System.Threading.Thread.Sleep(1000);
Application.RunOnMainThread(() =>
{
@@ -429,6 +430,8 @@
catch { }
});
}
+
+
}
}
--
Gitblit v1.8.0