~wxr/OnPro.git - Gitblit

			@@ -736,8 +736,13 @@
			case SPK.AvMusic:
			{
			#region 界面
			///开关
			LogicView.FunTypeView switchVie = new LogicView.FunTypeView();
			switchVie.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(switchVie.FLayoutView());
			//提示语音
			LogicView.FunTypeView funTypeView = new LogicView.FunTypeView();
			funTypeView.frameLayout.Y = switchVie.frameLayout.Bottom;
			funTypeView.btnText.TextID = StringId.tishiyin;
			fLayout.AddChidren(funTypeView.FLayoutView());
			///音量
			@@ -754,9 +759,41 @@


			///设备延时iewv
			DelayView(fLayout, volView.frameLayout.Bottom);
			var delayView = DelayView(fLayout, volView.frameLayout.Bottom);
			if (edit )
			{
			Output outputs = Logic.currlogic.output[index];
			var dicList = outputs.status.Find((obj) => obj.ContainsValue(FunctionAttributeKey.OnOff));
			if (dicList != null)
			{
			if (dicList.ContainsValue( "off") \|\| dicList.ContainsValue("pause"))
			{
			funTypeView.frameLayout.Visible = false;
			volView.frameLayout.Visible = false;
			delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
			}
			}
			}
			#endregion
			#region 点击事件
			///开关点击事件
			switchVie.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, switchVie.btnState, 2, (v) => {
			if (v == "on")
			{
			funTypeView.frameLayout.Visible = true;
			volView.frameLayout.Visible = true;
			delayView.frameLayout.Y = volView.frameLayout.Bottom;
			}
			else
			{
			funTypeView.frameLayout.Visible = false;
			volView.frameLayout.Visible = false;
			delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
			}
			});
			};
			///提示语音点击事件
			funTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			@@ -820,84 +857,7 @@
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
			}

			#endregion
			}
			break;
			//海信电视
			case SPK.ElectricalTvHisense:
			{
			#region 界面
			///开关
			LogicView.FunTypeView switchView = new LogicView.FunTypeView();
			switchView.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(switchView.FLayoutView());
			///音量
			LogicView.FunTypeView volView = new LogicView.FunTypeView();
			volView.frameLayout.Y = switchView.frameLayout.Bottom;
			volView.btnText.TextID = StringId.yinliang;
			fLayout.AddChidren(volView.FLayoutView());

			///信号源
			LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
			sourceView.frameLayout.Y = volView.frameLayout.Bottom;
			sourceView.btnText.TextID = StringId.xinhaoyuan;
			fLayout.AddChidren(sourceView.FLayoutView());

			///设备延时iewv
			DelayView(fLayout, sourceView.frameLayout.Bottom);
			#endregion
			#region 点击事件
			///开关点击事件
			switchView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, switchView.btnState, 2);
			};
			///音量点击事件
			volView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			//selectedState = device.spk + "_volume";
			//new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
			//{

			// //界面显示选中值
			// volView.btnState.Text = value;
			// //数据封装
			// AddDictionary("setvolume", value);//音量
			//}, 0, 100);

			BrightnessMethod(device, volView.btnState, volView.btnText.Text);

			};

			///信号源点击事件
			sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			///之前的状态文本
			string currText = sourceView.btnState.Text;
			//设备属性值，云雀上定义好的;
			string key = "signal";
			selectedState = device.spk + "_" + key;
			PublicInterface pif = new PublicInterface();
			var dic = pif.GetHisenseSignalSourceDic();
			pif.SingleSelectionShow(this, dic.Keys.ToList(), Language.StringByID(StringId.xinhaoyuan), currText
			, (valueStr) =>
			{
			//界面显示选中值
			sourceView.btnState.Text = valueStr;
			string value = pif.GetValue(dic, valueStr);
			//数据封装
			AddDictionary(key, value);

			});
			};

			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
			GetEditDeviceState(device, index, switchVie.btnState, funTypeView.btnState, volView.btnState, null);
			}

			#endregion
			@@ -991,6 +951,23 @@
			dicList.AddRange(diclist);//再添加其它属性
			dicSateteList = dicList;//重新赋值
			}
			var onoffDic = dicSateteList.Find((obj) => obj.ContainsValue("on_off"));
			if (onoffDic != null)
			{
			if (onoffDic.ContainsValue("off"))
			{
			for(int i =0;i<dicSateteList.Count;)
			{
			var d = dicSateteList[i];
			if(!d.ContainsValue("on_off") \|\| d.ContainsValue("delay"))
			{
			dicSateteList.Remove(d);
			continue;
			}
			i++;
			}
			}
			}
			}
			break;
			case SPK.GroupControl:
			@@ -1041,7 +1018,7 @@
			/// </summary>
			/// <param name="fLayout">父控件</param>
			/// <param name="bottomY">在哪个控件下面</param>
			private void DelayView(FrameLayout fLayout, int bottomY)
			private LogicView.FunTypeView DelayView(FrameLayout fLayout, int bottomY)
			{
			LogicView.FunTypeView delayView = new LogicView.FunTypeView();
			delayView.frameLayout.Y = bottomY;
			@@ -1061,6 +1038,7 @@
			selectedState = "delay_" + strdelay;
			});
			};
			return delayView;

			}

			@@ -1070,7 +1048,8 @@
			/// <param name="device"></param>
			/// <param name="button"></param>
			/// <param name="len">显示选择View数量</param>
			private void SwitchViewMethod(Entity.Function device, Button button, int len)
			/// <param name="action">点击回调事件，用来给音乐刷新界面使用，wxr 2024-01-04 16:03:47</param>
			private void SwitchViewMethod(Entity.Function device, Button button, int len,Action<string> action = null)
			{
			#region 界面
			FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
			@@ -1122,20 +1101,11 @@

			}
			break;
			case SPK.ElectricalTvHisense:
			{
			if ("on" == value)
			{
			key = "wol";
			}

			}
			break;

			}

			//数据封装
			AddDictionary(key, value);
			action?.Invoke(value);
			});
			#endregion
			}
			@@ -1179,11 +1149,6 @@
			//角度
			keyVlaue = "angle";
			}
			}
			break;
			case SPK.ElectricalTvHisense:
			{
			keyVlaue = "set_volume";
			}
			break;

			@@ -1317,20 +1282,6 @@
			/// <returns></returns>
			private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
			{

			if (this.device.spk == SPK.ElectricalTvHisense)
			{
			//特殊处理
			if (key == "on_off")
			{
			key = "wol";
			}
			else if (key == "wol")
			{
			key = "on_off";
			}

			}


			int indexValue = -1;