2020-06-16-1

陈嘉乐

2020-06-16 7167334c0e89dd84827d59e726123d14776e3a09

 HDL_ON/UI/Music/View/DialogView.cs

@@ -402,7 +402,7 @@

                if (playList1.Count <= 1)
                {
                    new PublicAssmebly().TipMsgAutoClose("至少选中两个以上播放器", false);
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.selectAtLeastTwoPlayers), false);
                    return;
                }
                int number = 0;
@@ -415,7 +415,7 @@
                }
                if (number >= 2)
                {
                    new PublicAssmebly().TipMsgAutoClose("不能选中两个或两个以上主播放器进行组合", false);
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.cannotSelectTwoOrMoreMainPlayersToCombine), false);
                    //如果都是主播放我就不能组合;
                    return;
                }
@@ -663,7 +663,7 @@
            {
                if (selectedBtn.Name.ToString() == "No")
                {
                    new PublicAssmebly().TipMsgAutoClose("还没选中播放器", false);
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.noSelectedPlay), false);
                    return;
                }
                dialogF.Close();
@@ -739,8 +739,8 @@
                TextColor = Color.TextColor,
                TextSize = TextSize.Text16,
                TextAlignment = TextAlignment.Center,
                //TextID = StringId.selectedMergence,
                Text = "选中解除播放器",
                TextID = StringId.checkTheReleasePlayer,
                //Text = "选中解除播放器",
                IsBold = true,
            };
            topFra.AddChidren(txetBtn);
@@ -864,7 +864,7 @@
            {
                if (playList1.Count == 0)
                {
                    new PublicAssmebly().TipMsgAutoClose("还没有选择解除组播放器", false);
                    new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.noCheckTheReleasePlayer), false);
                    return;
                }
                dialog.Close();
@@ -878,7 +878,7 @@
        /// <param name="musicList1"></param>
        void MergeThreading(A31MusicModel serverMusic, List<A31MusicModel> musicList1)
        {
            MusicMain.loading.Start("配置中...");
            MusicMain.loading.Start(Language.StringByID(StringId.inConfiguration));
            bool _if = false;
            System.Threading.Tasks.Task.Run(() =>
            {
@@ -998,7 +998,7 @@
        /// <param name="playList1"></param>
        void RemoveThreading(A31MusicModel a31player, List<A31MusicModel> playList1)
        {
            MusicMain.loading.Start("解除中...");
            MusicMain.loading.Start(Language.StringByID(StringId.lifting));
            var slaveList = new List<Slave>();
            slaveList.AddRange(a31player.Slave.slave_list);
           // bool host_If = false; //表示是否显示解除的播放
@@ -1224,8 +1224,7 @@
                TextColor = Color.TextColor,
                TextSize = TextSize.Text16,
                TextAlignment = TextAlignment.Center,
                //TextID = StringId.readyPlay,
                Text="调节音量",
                TextID = StringId.volumeAdjustment,
                IsBold = true,
            };
            topFra.AddChidren(txetBtn);
@@ -1301,11 +1300,11 @@
                volumeFra.AddChidren(volumeTextBtn);
                if (player.ServerClientType == -1)
                {
                    volumeTextBtn.Text = player.Name + "音量";
                    volumeTextBtn.Text = player.Name + Language.StringByID(StringId.volumeMusic);
                }
                else if (player.ServerClientType == 1)
                {
                    volumeTextBtn.Text = "总音量";
                    volumeTextBtn.Text = Language.StringByID(StringId.totalVolume);
                }

                DiyImageSeekBar volSeekBar = new DiyImageSeekBar