wxr
2022-02-23 b88f0d4dd35615302186c0c238d1b61825a74892
Merge remote-tracking branch 'origin/wjc' into release0123
3个文件已修改
30 ■■■■ 已修改文件
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -105,7 +105,7 @@
                Height = Application.GetRealHeight(352),
                Width = Application.GetRealWidth(375),
            };
            middViewLayout.AddChidren(fL3);
            //middViewLayout.AddChidren(fL3);
            View.MusicSourceView selectedSourceView = new View.MusicSourceView();
            selectedSourceView.fLayout.Height = Application.GetRealHeight(44);
@@ -114,13 +114,13 @@
            selectedSourceView.textBtn.TextSize = TextSize.Text16;
            selectedSourceView.inputTextBtn.Visible = false;
            selectedSourceView.nextLevelBtn.Visible = false;
            selectedSourceView.FrameLayoutView(fL3, false);
            //selectedSourceView.FrameLayoutView(fL3, false);
            View.MusicSourceView musicSourceView = new View.MusicSourceView();
            musicSourceView.fLayout.Y = selectedSourceView.fLayout.Bottom;
            musicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/localMusic.png";
            musicSourceView.textBtn.TextID = StringId.localMusic;
            musicSourceView.FrameLayoutView(fL3);
            //musicSourceView.FrameLayoutView(fL3);
       
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -229,7 +229,7 @@
                A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.song_step,ValueProperty.down);
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add(KeyProperty.song_step, ValueProperty.down);
                dic.Add(KeyProperty.song_step, ValueProperty.up);
                SendMethod.mMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
            };
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -75,10 +75,7 @@
        /// 定义全局对象
        /// </summary>
        VerticalRefreshLayout verticalRefresh;
        /// <summary>
        /// 为了音乐刷新状态定义全局对象
        /// </summary>
        MusicView musicView = new MusicView();
        public void Show()
        {
            #region 界面布局
@@ -120,6 +117,7 @@
            Application.RunOnMainThread(() =>
            {
                verticalRefresh.RemoveAll();
                A31MusicModel.A31MusicModelList.Clear();
                var musicListFunction = FunctionList.List.GetMusicList();
                for (int i = 0; i < musicListFunction.Count; i++)
                {
@@ -142,12 +140,12 @@
                {
                    var a31player = A31MusicModel.A31MusicModelList[i];
                    if (a31player.functionMusic.online == false)
                    {
                        //不在线不显示
                        continue;
                    }
                    //if (a31player.functionMusic.online == false)
                    //{
                    //    //不在线不显示
                    //    continue;
                    //}
                    Application.RunOnMainThread(() =>
                    {
                        MusicListView(a31player);
@@ -184,6 +182,10 @@
        /// </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);