wjc
2022-06-13 32ad85a377b00bc54ad7f15a45d7631d3e2b10d5
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -49,6 +49,7 @@
        /// </summary>
        static void clearA31Threads()
        {
            var threads = threadLists.FindAll((obj) => { return obj.Name == "A31"; });
            foreach (var thread in threads)
            {
@@ -75,10 +76,7 @@
        /// 定义全局对象
        /// </summary>
        VerticalRefreshLayout verticalRefresh;
        /// <summary>
        /// 为了音乐刷新状态定义全局对象
        /// </summary>
        MusicView musicView = new MusicView();
        public void Show()
        {
            #region 界面布局
@@ -102,10 +100,10 @@
            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                ////发送读取音乐播放器状态线程
                SeachMusic();
                verticalRefresh.EndHeaderRefreshing();
            };
            this.AddChidren(loading);
            SeachMusic();
@@ -116,15 +114,19 @@
        /// </summary>
        void SeachMusic()
        {
            Application.RunOnMainThread(() =>
            {
                verticalRefresh.RemoveAll();
                var musicListFunction = SendMethod.mMethod.GetMusicList;
                A31MusicModel.A31MusicModelList.Clear();
                var musicListFunction = FunctionList.List.GetMusicList();
                for (int i = 0; i < musicListFunction.Count; i++)
                {
                    var function = musicListFunction[i];
                    var music = A31MusicModel.A31MusicModelList.Find((music) => music.functionMusic.deviceId == function.deviceId);
                    var function = musicListFunction[i];
                    var music = A31MusicModel.A31MusicModelList.Find((obj) =>
                   (obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.MusicStandard) || (
                     obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.AvMusic)
                    );
                    if (music == null)
                    {
                        A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -139,11 +141,12 @@
                {
                    var a31player = A31MusicModel.A31MusicModelList[i];
                    if (a31player.functionMusic.online == false)
                    {
                        //不在线不显示
                        continue;
                    }
                    //if (a31player.functionMusic.online == false)
                    //{
                    //    //不在线不显示
                    //    continue;
                    //}
                    Application.RunOnMainThread(() =>
                    {
                        MusicListView(a31player);
@@ -164,6 +167,7 @@
                    {
                        try
                        {
                            SendMethod.mMethod.RefreshDeviceStatus(new List<string> { a31player.functionMusic.deviceId });
                            System.Threading.Thread.Sleep(500);
                        }
@@ -180,12 +184,16 @@
        /// </summary>
        void MusicListView(A31MusicModel player)
        {
            /// <summary>
            /// 为了音乐刷新状态定义全局对象
            /// </summary>
            MusicView musicView = new MusicView();
            musicView.ViewAddChidren(verticalRefresh);
            musicView.muiscFl.Tag = player.functionMusic;//多个音乐播放器更新状态要用到
            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.MouseUpEventHandler += (sender, e) =>
            {
@@ -283,6 +291,7 @@
                        musicView.musicNameBtn.Text = player.functionMusic.name;
                        if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
                        {
                            musicView.playBtn.IsSelected = true;
                        }
                        else