~wjc/HomeApp.git

			@@ -46,6 +46,7 @@
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.devicestate,
			IsBold = true,
			};
			topRowLayout.AddChidren(titleName);

			@@ -696,6 +697,7 @@
			};
			flMain.AddChidren(devicefra);
			devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout
			{
			@@ -745,7 +747,6 @@
			};
			timetype.AddChidren(Btncomplete);
			#endregion


			string SelectedDeviceStatusaction = "no";
			actionsInfo.Add("LinkType", 0);
			@@ -1054,20 +1055,22 @@
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			};
			openframelayout.AddChidren(horizontalSeekBarRow);
			var horizontalSeekBarVol = new HorizontalSeekBar
			var horizontalSeekBarVol = new DiyImageSeekBar
			{
			Y = openrowlayout.Bottom,
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(80),
			Radius = (uint)Application.GetRealHeight(25),
			Y = Application.GetRealHeight(25),
			//Gravity = Gravity.CenterVertical,
			ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
			Max = 100,
			SleepTime = 1000,
			ThumbRadius = 9,
			IsCanMove = false
			Height = Application.GetRealHeight(160),
			X = Application.GetRealWidth(80),
			IsProgressTextShow = true,//显示百分比
			IsClickable = false,//进度条是否滑动
			ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
			ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
			ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
			ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			ProgressTextSize = 13,//显示百分比字体大小
			SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
			};
			horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
			openframelayout.AddChidren(horizontalSeekBarVol);

			#endregion

			@@ -1140,7 +1143,7 @@
			#endregion

			int Progressvalue = 100;
			horizontalSeekBarVol.ProgressChanged += (sender, e) =>
			EventHandler<int> progressclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			Progressvalue = horizontalSeekBarVol.Progress;
			@@ -1158,12 +1161,14 @@
			switchdictionary.Add("Data1", lightbrightnessvalue.ToString());

			};
			horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
			horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
			///确认事件
			EventHandler<MouseEventArgs> openclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			horizontalSeekBarVol.IsCanMove = true;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
			horizontalSeekBarVol.IsClickable = true;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			takebackBtnSelected.Visible = false;
			@@ -1190,8 +1195,8 @@
			EventHandler<MouseEventArgs> closeclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			takebackBtnSelected.Visible = false;
			@@ -1215,8 +1220,8 @@
			EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = false;
			takebackBtnSelected.Visible = true;
			@@ -1258,8 +1263,8 @@
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			takebackBtnSelected.Visible = false;
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			}
			else if (value["Data1"] == "2")
			{
			@@ -1267,8 +1272,8 @@
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = false;
			takebackBtnSelected.Visible = true;
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			}

			}
			@@ -1279,8 +1284,8 @@
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			takebackBtnSelected.Visible = false;
			horizontalSeekBarVol.IsCanMove = true;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
			horizontalSeekBarVol.IsClickable = true;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
			horizontalSeekBarVol.Progress = int.Parse(value["Data1"]) * 100 / 254;
			Progressvalue = horizontalSeekBarVol.Progress;

			@@ -1352,20 +1357,22 @@
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			};
			openframelayout.AddChidren(horizontalSeekBarRow);
			var horizontalSeekBarVol = new HorizontalSeekBar
			{
			var horizontalSeekBarVol = new DiyImageSeekBar
			{
			Y = openrowlayout.Bottom,
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(80),
			Radius = (uint)Application.GetRealHeight(25),
			Y = Application.GetRealHeight(25),
			//Gravity = Gravity.CenterVertical,
			ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
			Max = 100,
			SleepTime = 1000,
			ThumbRadius = 9,
			IsCanMove = false
			Height = Application.GetRealHeight(160),
			X = Application.GetRealWidth(80),
			IsProgressTextShow = true,//显示百分比
			IsClickable = false,//进度条是否滑动
			ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
			ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
			ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
			ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			ProgressTextSize = 13,//显示百分比字体大小
			SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
			};
			horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
			openframelayout.AddChidren(horizontalSeekBarVol);

			#endregion

			@@ -1405,7 +1412,7 @@

			#endregion
			int Progressvalue = 100;
			horizontalSeekBarVol.ProgressChanged += (sender, e) =>
			EventHandler<int> progressclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			Progressvalue = horizontalSeekBarVol.Progress;
			@@ -1421,12 +1428,14 @@
			switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());

			};
			horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
			horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
			///确认事件
			EventHandler<MouseEventArgs> openclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			horizontalSeekBarVol.IsCanMove = true;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
			horizontalSeekBarVol.IsClickable = true;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			horizontalSeekBarVol.Progress = Progressvalue;
			@@ -1450,8 +1459,8 @@
			EventHandler<MouseEventArgs> closeclick = (sender, e) =>
			{
			SelectedDeviceStatusaction = "yes";
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;

			@@ -1492,8 +1501,8 @@
			}
			switchdictionary.Add("Data1", "5");
			switchdictionary.Add("Data2", value["Data2"]);
			horizontalSeekBarVol.IsCanMove = true;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
			horizontalSeekBarVol.IsClickable = true;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
			openBtnSelected.Visible = true;
			closeBtnSelected.Visible = false;
			horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
			@@ -1508,8 +1517,8 @@
			switchdictionary.Add("Data1", "1");
			openBtnSelected.Visible = false;
			closeBtnSelected.Visible = true;
			horizontalSeekBarVol.IsCanMove = false;
			horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
			horizontalSeekBarVol.IsClickable = false;
			horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
			}

			}
			@@ -1740,7 +1749,6 @@
			}
			}
			break;

			case DeviceType.Thermostat:
			{

			@@ -2065,7 +2073,6 @@


			}

			Btncomplete.MouseUpEventHandler += (sender, e) =>
			{

			@@ -2079,7 +2086,7 @@
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
			Language.StringByID(MyInternationalizationString.complete));
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}