2020-06-03-1

陈嘉乐

2020-06-03 66c0db35365980f240d7cfe6dd59961812f20c97

 HDL_ON/UI/Music/MusicMain.cs

@@ -45,7 +45,7 @@
        /// <summary>
        ///  显示加载界面
        /// </summary>
        public static Loading Loading = new Loading();
        public static Loading loading = new Loading();
        VerticalRefreshLayout verticalRefresh;

        public void Show()
@@ -72,11 +72,10 @@

            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                SeachMusic();
                verticalRefresh.EndHeaderRefreshing();
                SeachMusic(false);

            };
            this.AddChidren(Loading);
            this.AddChidren(loading);

            if (A31MusicModel.A31MusicModelList.Count == 0)
            {
@@ -137,7 +136,7 @@
            if (Yes)
            {
                //为了第一次进来log一下;
                Loading.Start();
                loading.Start();
            }
            SendMethod.Seach((obj) =>
            {
@@ -145,12 +144,17 @@
                {
                    readServerOrClientMode();
                    A31MusicModel.Save();
                    if (!Yes)
                    {
                        ///等待跑完在关闭
                        verticalRefresh.EndHeaderRefreshing();
                    }
                    Application.RunOnMainThread(() =>
                    {
                        if (Yes)
                        {
                            //为了第一次进来log一下;
                            Loading.Hide();
                            loading.Hide();
                        }
                        verticalRefresh.RemoveAll();
                        for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
@@ -199,12 +203,20 @@
            musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
            musicView.musicNameBtn.Text = a31player.Name;
            musicView.regionBtn.TextID = StringId.region;
          



            EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
            {
                new View.DialogView { }.PlayMergence();
                if (a31player.ServerClientType == 0)
                {
                    new View.DialogView { }.PlayMergence();
                }
                else if (a31player.ServerClientType == 1)
                {
                    new View.DialogView { }.DetachPlayMergence(a31player);

                }
            };
            musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
            musicView.mergeBtn.MouseUpEventHandler += clickMergence;
@@ -312,11 +324,11 @@
                    {
                        a31player.ServerClientType = 0;
                        var result = SendMethod.OpenWeb("http://" + a31player.IPAddress + "/httpapi.asp?command=multiroom:getSlaveList");
                        if (result == null)
                        if (result == null && result == "Failed")
                        {
                            result = SendMethod.OpenWeb("http://" + a31player.IPAddress + "/httpapi.asp?command=multiroom:getSlaveList");
                        }
                        if (result != null)
                        if (result != null && result != "Failed")
                        {
                            a31player.Slave = Newtonsoft.Json.JsonConvert.DeserializeObject<Slaves>(result);
                        }
@@ -383,10 +395,7 @@
                }

            }
            catch (Exception e)
            {
                var ss = e.Message;
            }
            catch { }
        }

    }