~wxr/OnPro.git - Gitblit

			@@ -856,29 +856,29 @@
			if (SPK.MusicSpkList().Contains( function.spk))
			{
			//var music = function as Music.A31MusicModel;
			var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
			if (music == null)
			{
			continue;
			}
			if (music.ServerClientType == -1)
			{
			continue;
			}
			else if (music.ServerClientType == 1)
			{
			if (!music.MainPlayCollection)
			{
			continue;
			}
			}
			else
			{
			if (!music.collect)
			{
			continue;
			}
			}
			//var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
			//if (music == null)
			//{
			// continue;
			//}
			//if (music.ServerClientType == -1)
			//{
			// continue;
			//}
			//else if (music.ServerClientType == 1)
			//{
			// if (!music.MainPlayCollection)
			// {
			// continue;
			// }
			//}
			//else
			//{
			// if (!music.collect)
			// {
			// continue;
			// }
			//}
			}
			else
			{
			@@ -1197,8 +1197,8 @@
			SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
			};
			view.AddChidren(btnPower);
			var a31player = (function as UI.Music.A31MusicModel);
			btnState.Text = a31player.A31PlayStatus.Title;

			btnState.Text = function.GetAttrState("song_name");

			btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
			btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
			@@ -1207,21 +1207,22 @@

			btnPower.MouseUpEventHandler = (sender, e) =>
			{

			string status = "off";
			if (btnPower.IsSelected)
			{
			btnPower.IsSelected = false;
			Music.SendMethod.Pause(a31player);
			a31player.A31PlayStatus.status = "pause";
			a31player.trait_on_off.curValue = "off";
			status = "off";
			}
			else
			{
			btnPower.IsSelected = true;
			Music.SendMethod.Play(a31player);
			a31player.A31PlayStatus.status = "play";
			a31player.trait_on_off.curValue = "on";
			status = "on";
			}
			UpdataFunctionStates(a31player);
			function.SetAttrState("on_off", status);
			Dictionary<string, string> dic = new Dictionary<string, string>();
			dic.Add("on_off", status);
			Music.SendMethod.mMethod.SendControlCommand(function, dic);
			};
			}

			@@ -1279,14 +1280,14 @@
			//取消收藏事件
			Action cannelCollect = () => {
			function.collect = false;
			if (SPK.MusicSpkList().Contains(function.spk))//处理音乐主从关系
			{
			if ((function as Music.A31MusicModel).ServerClientType == 1)
			{
			(function as Music.A31MusicModel).MainPlayCollection = false;
			Music.A31MusicModel.Save();
			}
			}
			//if (SPK.MusicSpkList().Contains(function.spk))//处理音乐主从关系
			//{
			// if ((function as Music.A31MusicModel).ServerClientType == 1)
			// {
			// (function as Music.A31MusicModel).MainPlayCollection = false;
			// Music.A31MusicModel.Save();
			// }
			//}
			string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
			LoadDeviceFunctionControlZone();
			function.CollectFunction();