~wxr/OnPro.git - Gitblit

			@@ -55,12 +55,35 @@
			#region 编辑设备状态
			switch (device.spk)
			{

			//插座(有USB)
			case SPK.PanelSocket:
			{
			#region 界面
			///总控开关
			LogicView.FunTypeView view1 = new LogicView.FunTypeView();
			view1.btnText.TextID = StringId.zongkogkaiguan;
			view1.btnState.Name = "总控开关";
			fLayout.AddChidren(view1.FLayoutView());
			///设备延时iewv
			DelayView(fLayout, view1.frameLayout.Bottom);
			#endregion
			#region 点击事件
			///总控开关点击事件
			view1.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, view1.btnState, 2);
			};
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditDeviceState(device, index, view1.btnState, null, null, null);
			}
			#endregion
			}
			break;
			//开关灯光
			case SPK.AirSwitch:
			case SPK.LightSwitch:
			//插座
			case SPK.PanelSocket:
			case SPK.ElectricSocket:
			//机械手
			case SPK.MechanicalArm:
			@@ -206,10 +229,10 @@
			///开关
			LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
			curtainSwitchView.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(curtainSwitchView.FLayoutView());
			//fLayout.AddChidren(curtainSwitchView.FLayoutView());//2023年04月17日16:27:10 产品要求的去掉
			///百分比
			LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
			crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
			//crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
			crtainPercentumView.btnText.TextID = StringId.percentum;
			fLayout.AddChidren(crtainPercentumView.FLayoutView());
			crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
			@@ -274,6 +297,7 @@
			break;
			case SPK.AcStandard:
			case SPK.HvacAC:
			case SPK.AcIr:
			{
			#region 界面
			///开关
			@@ -576,25 +600,30 @@
			{
			//HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
			//var palyListName = Music.SendMethod.mMethod.GetListName(device);
			var palyList= Music.SendMethod.Current.GetListMusic(device, "hdl_special");
			List<string> musicNameList = new List<string>();
			var palyList= Music.SendMethod.Current.GetSingleSongList(device, "hdl_special","");
			List<string> songNameList = new List<string>();
			for (int i = 0; i < palyList.songs.Count; i++)
			{
			var music = palyList.songs[i];
			musicNameList.Add(music.name);
			var song = palyList.songs[i];
			songNameList.Add(song.name);
			}
			Application.RunOnMainThread(() =>
			{
			loading.Hide();
			PublicInterface publicInterface = new PublicInterface();
			publicInterface.FrameOrVv(this, musicNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
			publicInterface.FrameOrVv(this, songNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
			{
			var musicSelecetd = palyList.songs[index2];
			var songSelecetd = palyList.songs[index2];
			//界面显示选中值
			funTypeView.btnState.Text = musicSelecetd.name;
			funTypeView.btnState.Text = songSelecetd.name;
			//数据封装
			AddDictionary("playlist_name", palyList.group);//列表名
			AddDictionary("song_name", musicSelecetd.name);//歌曲名
			AddDictionary("song_name", songSelecetd.name);//歌曲名
			if (!string.IsNullOrEmpty(songSelecetd.url))
			{
			//存在url就一起发送过去
			AddDictionary("url", songSelecetd.url);
			}

			},false);

			@@ -671,6 +700,7 @@
			break;
			}
			case SPK.HvacAC:
			case SPK.AcIr:
			case SPK.AcStandard:
			case SPK.FloorHeatStandard:
			case SPK.HvacFloorHeat:
			@@ -718,7 +748,7 @@
			break;

			}
			outputDevice.status = dicSateteList;
			outputDevice.status.AddRange(dicSateteList);

			if (edit)
			{
			@@ -820,6 +850,17 @@
			selectedState = device.spk + "_" + strValue;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "on_off";
			switch (device.spk)
			{
			case SPK.PanelSocket:
			{
			if (button.Name == "总控开关")
			{
			keyVlaue = "on_off_master";
			}
			}
			break;
			}
			//数据封装
			AddDictionary(keyVlaue, strValue);
			});
			@@ -923,7 +964,7 @@
			if (dicList.Count != 0)
			{
			//有数据重新赋值
			dicSateteList = dicList;
			dicSateteList.AddRange(dicList);
			}
			if (this.btnDelay != null)
			{