~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:
			@@ -92,7 +115,6 @@
			case SPK.LightDimming:
			case SPK.LightRGB:
			case SPK.LightRGBW:
			case SPK.LightCCT:
			{
			#region 界面
			///开关
			@@ -124,6 +146,54 @@
			{
			//显示编辑之前的设备状态
			GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
			}
			#endregion
			}
			break;
			case SPK.LightCCT:
			{
			#region 界面
			///开关
			LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
			lightSwitchView.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(lightSwitchView.FLayoutView());
			///亮度
			LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
			brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
			brightnessView.btnText.TextID = StringId.brightnesLogic;
			fLayout.AddChidren(brightnessView.FLayoutView());
			brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
			///色温
			LogicView.FunTypeView colorTemperatureView = new LogicView.FunTypeView();
			colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
			colorTemperatureView.btnText.TextID = StringId.ColorTemperature;
			fLayout.AddChidren(colorTemperatureView.FLayoutView());
			colorTemperatureView.btnState.Text = "2700k";
			///设备延时iewv
			DelayView(fLayout, colorTemperatureView.frameLayout.Bottom);
			#endregion
			#region 点击事件
			///开关点击事件
			lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, lightSwitchView.btnState, 2);
			};
			///亮度点击事件
			brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);

			};
			///色温点击事件
			colorTemperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			ColorTemperatureMethod(device, colorTemperatureView.btnState, colorTemperatureView.btnText.Text);

			};
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, colorTemperatureView.btnState, null);
			}
			#endregion
			}
			@@ -529,25 +599,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,7 +746,7 @@
			break;

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

			if (edit)
			{
			@@ -773,6 +848,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);
			});
			@@ -827,6 +913,38 @@

			}
			/// <summary>
			/// 色温(cct)=功能下一级界面
			/// </summary>
			/// <param name="device"></param>
			/// <param name="button"></param>
			private void ColorTemperatureMethod(Entity.Function device, Button button, string titleName)
			{
			#region 界面
			//之前的状态值
			string stateVlaue = button.Text;
			LogicView.ColorTemperature brightness = new LogicView.ColorTemperature();
			brightness.FLayoutView(this, titleName, stateVlaue, (colorTemperatureValue, unitStr) =>
			{
			//界面显示选中值
			button.Text = colorTemperatureValue + unitStr;
			selectedState = device.spk + colorTemperatureValue.ToString();
			//设备属性值，云雀上定义好的;
			string keyVlaue = "";
			switch (device.spk)
			{
			case SPK.LightCCT:
			{
			keyVlaue = "cct";
			}
			break;
			}
			//数据封装
			AddDictionary(keyVlaue, colorTemperatureValue);
			});
			#endregion

			}
			/// <summary>
			/// 显示编辑之前的设备状态
			/// </summary>
			/// <param name="device">编辑设备</param>
			@@ -844,7 +962,7 @@
			if (dicList.Count != 0)
			{
			//有数据重新赋值
			dicSateteList = dicList;
			dicSateteList.AddRange(dicList);
			}
			if (this.btnDelay != null)
			{