Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 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);

       

@@ -158,7 +158,7 @@
                    {
                        if (A31MusicModel.Current.palyLists.Count == 0)
                        {
                           SendMethod.mMethod.GetPalyList(A31MusicModel.Current.functionMusic);
                           SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
                           
                        }
                    }
@@ -189,7 +189,7 @@
                    {
                        try
                        {
                            SendMethod.mMethod.EditDeviceName(A31MusicModel.Current.functionMusic.deviceId,playerName);
                            SendMethod.Current.EditDeviceName(A31MusicModel.Current.functionMusic.deviceId,playerName);
                        }
                        catch { }

@@ -230,11 +230,40 @@
            ///我的列表事件
            myListView.clickBtn.MouseUpEventHandler += (sender, e) =>
            {
                A31MyList a31MyList = new A31MyList();
                MainPage.BasePageView.AddChidren(a31MyList);
                a31MyList.Show();
                a31MyList.UpdateSelectedFile();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //A31MyList a31MyList = new A31MyList();
                //MainPage.BasePageView.AddChidren(a31MyList);
                //a31MyList.Show();
                //a31MyList.UpdateSelectedFile();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                
                System.Threading.Tasks.Task.Run(() =>
                {
                    try
                    {

                        //HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
                        var palyListName = Music.SendMethod.Current.GetListName(A31MusicModel.Current.functionMusic);
                        var palyList = Music.SendMethod.Current.GetListMusic(A31MusicModel.Current.functionMusic, "hdl_special");
                        List<string> musicNameList = new List<string>();
                        for (int i = 0; i < palyList.songs.Count; i++)
                        {
                            var music = palyList.songs[i];
                            musicNameList.Add(music.name);
                        }
                        Application.RunOnMainThread(() =>
                        {
                            UI2.Intelligence.Automation.PublicInterface publicInterface = new UI2.Intelligence.Automation.PublicInterface();
                            publicInterface.FrameOrVv(this, musicNameList, new List<string> { "123" }, palyList.group, (index) =>
                            {
                               
                                
                            }, false);

                        });
                    }
                    catch { }

                });
            };