~wxr/HDL_APP_Project.git

			@@ -175,8 +175,7 @@
			temperatureView.btnState.Text = stateStr;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "set_temp";
			selectedState = device.spk + "_"+ keyVlaue;

			selectedState = device.spk + "_" + keyVlaue;
			string set_temp_value = stateStr.Replace("℃", "");
			//数据封装
			AddDictionary(keyVlaue, set_temp_value);
			@@ -191,7 +190,7 @@
			string currText = acModehView.btnState.Text;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "mode";
			selectedState = device.spk + "_"+keyVlaue;
			selectedState = device.spk + "_" + keyVlaue;
			PublicInterface modeView = new PublicInterface();
			var modeListStr = modeView.GetViewList(keyVlaue);
			modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
			@@ -274,7 +273,7 @@
			temperatureView.btnState.Text = stateStr;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "set_temp";
			selectedState = device.spk + "_"+ keyVlaue;
			selectedState = device.spk + "_" + keyVlaue;
			string set_temp_value = stateStr.Replace("℃", "");
			//数据封装
			AddDictionary(keyVlaue, set_temp_value);
			@@ -291,7 +290,7 @@
			string currText = floorHeatingModehView.btnState.Text;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "mode";
			selectedState = device.spk + "_"+ keyVlaue;
			selectedState = device.spk + "_" + keyVlaue;
			PublicInterface modeView = new PublicInterface();
			var modeListStr = modeView.GetViewList("floorheatingmode");
			modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
			@@ -308,6 +307,88 @@
			{
			//显示编辑之前的设备状态
			GetEditState(device, index, floorHeatingSwitchVie.btnState, temperatureView.btnState, floorHeatingModehView.btnState, null);
			}

			#endregion
			}
			break;
			case SPK.AirFreshStandard:
			{
			#region 界面
			///开关
			LogicView.FunTypeView AirFreshSwitchVie = new LogicView.FunTypeView();
			AirFreshSwitchVie.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(AirFreshSwitchVie.FLayoutView());

			///风速
			LogicView.FunTypeView AirFreshSpeedView = new LogicView.FunTypeView();
			AirFreshSpeedView.frameLayout.Y = AirFreshSwitchVie.frameLayout.Bottom;
			AirFreshSpeedView.btnText.TextID = StringId.speedLogic;
			fLayout.AddChidren(AirFreshSpeedView.FLayoutView());
			#endregion
			#region 点击事件
			///开关点击事件
			AirFreshSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
			{

			SwitchViewMethod(device, AirFreshSwitchVie.btnState, 2);
			};
			///风速点击事件
			AirFreshSpeedView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			//定义一个临时列表
			List<string> fanAttrList = new List<string>();
			//动态读取新风风速列表
			var fanAttr = device.GetAttribute(FunctionAttributeKey.FanSpeed);
			foreach (var fanAttrValue in fanAttr.value)
			{
			switch (fanAttrValue)
			{
			case "high":
			{
			fanAttrList.Add(Language.StringByID(StringId.HighWindSpeed));
			}
			break;
			case "medium":
			{
			fanAttrList.Add(Language.StringByID(StringId.MiddleWindSpeed));
			}
			break;
			case "low":
			{

			fanAttrList.Add(Language.StringByID(StringId.LowWindSpeed));
			}
			break;
			case "auto":
			{
			fanAttrList.Add(Language.StringByID(StringId.Auto));
			break;
			}

			}
			}
			///之前的状态文本
			string currText = AirFreshSpeedView.btnState.Text;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "fan";
			selectedState = device.spk + "_" + keyVlaue;
			PublicInterface speedView = new PublicInterface();
			var speedListStr = fanAttrList;// speedView.GetViewList(keyVlaue);
			speedView.SingleSelectionShow(this, speedListStr, Language.StringByID(StringId.speedLogic), currText
			, (stateValue) =>
			{
			//界面显示选中值
			AirFreshSpeedView.btnState.Text = stateValue;
			//数据封装
			AddDictionary(keyVlaue, speedView.GetModeValueString(stateValue, keyVlaue));

			});
			};
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditState(device, index, AirFreshSwitchVie.btnState, AirFreshSpeedView.btnState, null, null);
			}

			#endregion
			@@ -357,9 +438,9 @@
			}
			case SPK.AcStandard:
			case SPK.FloorHeatStandard:
			case SPK.AirFreshStandard:
			{

			//(空调/地热)做了一个特殊处理；
			//做了一个特殊处理；
			bool _bool = false;
			for (int i = 0; i < dicSateteList.Count; i++)
			{
			@@ -379,8 +460,6 @@
			diction.Add("value", "on");
			dicSateteList.Add(diction);
			}


			}
			break;
			}
			@@ -388,6 +467,8 @@

			if (edit)
			{
			//更新延时时间
			outputDevice.delay = Logic.currlogic.output[index].delay;
			//移除旧数据
			Logic.currlogic.output.RemoveAt(index);
			//新数据插入旧数据的位置;
			@@ -409,91 +490,12 @@
			this.RemoveFromParent();
			return;
			}
			LogicMethod.RemoveAllView();
			LogicMethod.CurrLogicMethod.RemoveAllView();
			AddLogic addLogic = new AddLogic();
			MainPage.BasePageView.AddChidren(addLogic);
			addLogic.Show();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			#endregion

			}

			/// <summary>
			///开关=界面
			/// </summary>
			/// <param name="fLayout"></param>
			/// <param name="device"></param>
			/// <param name="index"></param>
			/// <param name="edit"></param>
			/// <param name="intView">选中View的数量</param>
			private void SwitchView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
			{
			#region 界面
			///开关
			LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
			curtainSwitchView.btnText.TextID = StringId.switchLogic;
			fLayout.AddChidren(curtainSwitchView.FLayoutView());
			#endregion
			#region 点击事件
			///开关点击事件
			curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, curtainSwitchView.btnState, intView);
			};
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
			}
			#endregion

			}
			/// <summary>
			///（开关+亮度/百分比)界面
			/// </summary>
			/// <param name="fLayout"></param>
			/// <param name="device"></param>
			/// <param name="index"></param>
			/// <param name="edit"></param>
			/// <param name="intView">选中View的数量</param>
			private void SwitchBrightnessView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
			{
			#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;
			if (device.spk == SPK.CurtainTrietex \|\| device.spk == SPK.CurtainRoller)
			{

			brightnessView.btnText.TextID = StringId.percentum;
			}
			else
			{
			brightnessView.btnText.TextID = StringId.brightnesLogic;
			}
			fLayout.AddChidren(brightnessView.FLayoutView());
			#endregion
			#region 点击事件
			///开关点击事件
			lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			SwitchViewMethod(device, lightSwitchView.btnState, intView);
			};
			///亮度点击事件
			brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
			};
			if (edit)
			{
			//显示编辑之前的设备状态
			GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
			}
			#endregion

			}
			@@ -506,13 +508,10 @@
			private void SwitchViewMethod(Entity.Function device, Button button, int len)
			{
			#region 界面
			FrameLayout frame = new FrameLayout
			{
			BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
			};
			FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
			this.AddChidren(frame);
			LogicView.SwitchView switchView = new LogicView.SwitchView();
			switchView.FLayoutView(frame, len, button.Text, (Action<string>)((strValue) =>
			switchView.FLayoutView(frame, len, button.Text, (strValue) =>
			{
			int id = 0;
			switch (strValue)
			@@ -536,14 +535,11 @@
			//界面显示选中值
			button.TextID = id;
			selectedState = device.spk + "_" + strValue;
			//设备属性值，云雀上定义好的;
			string keyVlaue = "on_off";
			//数据封装
			Dictionary<string, string> dic = new Dictionary<string, string>();
			LogicMethod.dictionary(dic, "key", "on_off");
			LogicMethod.dictionary(dic, "value", strValue);
			AddDictionaryData(dicSateteList, keyVlaue, dic);

			}));
			AddDictionary(keyVlaue, strValue);
			});
			#endregion
			}
			/// <summary>
			@@ -557,14 +553,13 @@
			//之前的状态值
			string stateVlaue = button.Text;
			LogicView.BrightnessView brightness = new LogicView.BrightnessView();
			brightness.FLayoutView(this, titleName, stateVlaue, (Action<string>)((brightnesValue) =>
			brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue) =>
			{
			//界面显示选中值
			button.Text = brightnesValue+"%";
			string keyVlaue = "";
			button.Text = brightnesValue + "%";
			selectedState = device.spk + brightnesValue.ToString();
			//数据封装
			Dictionary<string, string> dic = new Dictionary<string, string>();
			//设备属性值，云雀上定义好的;
			string keyVlaue = "";
			switch (device.spk)
			{
			//开关灯光 light.Switch
			@@ -576,16 +571,16 @@
			keyVlaue = "brightness";
			}
			break;
			case SPK.CurtainTrietex:
			case SPK.CurtainRoller:
			case SPK.CurtainTrietex:
			{
			keyVlaue = "percent";
			}
			break;
			}
			LogicMethod.dictionary(dic, "value", brightnesValue.ToString());
			AddDictionaryData(dicSateteList, keyVlaue, dic);
			}));
			//数据封装
			AddDictionary(keyVlaue, brightnesValue);
			});
			#endregion

			}
			@@ -601,7 +596,7 @@
			private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
			{
			Output outputs = Logic.currlogic.output[index];
			var dicList = outputs.status as List<Dictionary<string, string>>;
			var dicList = outputs.status;
			//清除之前旧数据
			dicSateteList.Clear();
			if (dicList.Count != 0)
			@@ -620,23 +615,22 @@
			{
			//数据封装
			Dictionary<string, string> dic = new Dictionary<string, string>();
			LogicMethod.dictionary(dic, "key", KeyValue);
			LogicMethod.dictionary(dic, "value", selectedValue);
			AddDictionaryList(KeyValue, dic, dicSateteList);
			LogicMethod.CurrLogicMethod.dictionary(dic, "key", KeyValue);
			LogicMethod.CurrLogicMethod.dictionary(dic, "value", selectedValue);
			AddDictionaryList(KeyValue, dic);
			}
			/// <summary>
			/// 更新数据列表
			/// </summary>
			/// <param name="keyValue">设备属性值，云雀上定义好的</param>
			/// <param name="dictionary">选中数据</param>
			/// <param name="dicList">存储数据列表</param>
			/// <param name="dictionary">添加选中数据</param>
			/// <returns></returns>
			private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary, List<Dictionary<string, string>> dicList)
			private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary)
			{
			int indexValue = -1;
			for (int i = 0; i < dicList.Count; i++)
			for (int i = 0; i < dicSateteList.Count; i++)
			{
			var dic = dicList[i];
			var dic = dicSateteList[i];
			if (dic.ContainsValue(keyValue))
			{
			//判断是否存在
			@@ -648,14 +642,14 @@
			if (indexValue != -1)
			{
			//存在移除
			dicList.RemoveAt(indexValue);
			dicSateteList.RemoveAt(indexValue);
			//重新添加
			dicList.Insert(indexValue, dictionary);
			dicSateteList.Insert(indexValue, dictionary);
			}
			else
			{
			//新添加
			dicList.Add(dictionary);
			dicSateteList.Add(dictionary);
			}

			}
			@@ -686,8 +680,6 @@
			}

			}



			}
			}