~wjc/HomeApp.git

			@@ -12,7 +12,6 @@
			/// 列表控件
			/// </summary>
			private VerticalScrolViewLayout listview = null;

			/// <summary>
			/// 面板的回路
			/// </summary>
			@@ -33,6 +32,28 @@
			/// 按键的颜色数据
			/// </summary>
			private Panel.KeyColorData keyColorData = null;
			/// <summary>
			/// 选择睡眠时间的事件 value:索引(从0开始) 文本信息请用Text获取
			/// </summary>
			public Action<int> timeAction = null;
			/// <summary>
			/// 当前选择的功能类型索引
			/// </summary>
			private int nowSelectNo = 0;
			/// <summary>
			/// /// <summary>
			/// 睡眠时间的值
			/// </summary>
			/// </summary>
			public string sleepTimeText
			{
			get { return btnSleepTime.Text; }
			set { btnSleepTime.Text = value; }
			}
			/// <summary>
			///睡眠时间
			/// </summary>
			public NormalViewControl btnSleepTime = null;

			#endregion

			@@ -109,7 +130,7 @@
			/// <param name="frameLinght">各种背光灯的容器(控件伸缩使用)</param>
			private void AddEnergyConservationRow()
			{
			//缩小:170 扩大:429
			//缩小:170 扩大:614
			var frameBack = new FrameRowControl();
			frameBack.BackgroundColor = UserCenterColor.Current.White;
			frameBack.UseClickStatu = false;
			@@ -125,7 +146,7 @@
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			energyModeInfo.enable = btnSwitch.IsSelected;
			//展开或者缩小的高度
			var value = Application.GetRealHeight(443);
			var value = Application.GetRealHeight(614);
			if (btnSwitch.IsSelected == true)
			{
			frameBack.Height += value;
			@@ -191,12 +212,23 @@
			if (energyModeInfo.enable == true)
			{
			//展开或者缩小的高度
			var value = Application.GetRealHeight(443);
			var value = Application.GetRealHeight(614);
			frameBack.Height += value;
			}

			//添加接近感应
			this.AddProximitySensorsRow(frameBack);

			//底线
			var btnLine = new NormalViewControl(965, 5, true);
			btnLine.Height = 1;
			btnLine.X = Application.GetRealWidth(52);
			btnLine.Y = Application.GetRealHeight(484 + 127);
			btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
			frameBack.AddChidren(btnLine);

			//添加睡眠时间
			this.AddSleepTimeRow(frameBack);
			}

			#endregion
			@@ -230,6 +262,100 @@
			{
			btnSwitch.IsSelected = true;
			}
			}
			#endregion

			#region ■ 睡眠时间___________________________

			/// <summary>
			/// 睡眠时间行
			/// </summary>
			private void AddSleepTimeRow(FrameRowControl frameRowControl)
			{
			//睡眠时间行
			var frameBack = new FrameRowControl();
			frameBack.BackgroundColor = UserCenterColor.Current.White;
			frameBack.UseClickStatu = false;
			frameBack.Y = Application.GetRealHeight(784 - 170);
			frameBack.Height = Application.GetRealHeight(170);
			frameRowControl.AddChidren(frameBack);

			//睡眠时间
			frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SleepTime), 400);
			//右箭头
			frameBack.AddRightArrow();
			btnSleepTime = new NormalViewControl(700, true);
			switch (energyModeInfo.time)
			{
			case 15:
			btnSleepTime.Text = "15s";
			nowSelectNo = 0;
			break;
			case 60:
			btnSleepTime.Text = "1min";
			nowSelectNo = 1;
			break;
			case 300:
			btnSleepTime.Text = "5min";
			nowSelectNo = 2;
			break;
			}
			frameBack.AddMostRightView(this.sleepTimeText, 700);

			timeAction = null;
			timeAction += (nowSelectNo) =>
			{
			switch (nowSelectNo)
			{
			case 0:
			energyModeInfo.time = 15;
			break;
			case 1:
			energyModeInfo.time = 60;
			break;
			case 2:
			energyModeInfo.time = 300;
			break;
			}
			AddSleepTimeRow(frameRowControl);
			};
			frameBack.ButtonClickEvent += (sender, e) =>
			{
			this.ShowSelectDeviceSleepTimeListForm();
			};
			}
			#endregion

			#region ■ 显示选择设备睡眠时间_______________
			/// <summary>
			/// 显示选择设备睡眠时间的界面
			/// </summary>
			public void ShowSelectDeviceSleepTimeListForm()
			{
			//显示列表
			var listText = new List<string>();
			listText.Add("15s");
			listText.Add("1min");
			listText.Add("5min");
			//标题:选择功能类型
			var title = Language.StringByID(R.MyInternationalizationString.SleepTime);

			var form = new BottomItemSelectForm();
			form.CancelCallEvent = false;//允许取消
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += (selectNo) =>
			{
			if (selectNo == nowSelectNo)
			{
			//选择的是相同的
			return;
			}
			//-1:选择取消
			this.sleepTimeText = selectNo == -1 ? string.Empty : listText[selectNo];
			nowSelectNo = selectNo;
			//调用回调函数
			this.timeAction?.Invoke(nowSelectNo);
			};
			}
			#endregion

			@@ -512,23 +638,46 @@

			frameColor.ButtonClickEvent += (sender, e) =>
			{
			PanelColor(btnColor, seekBar1, R1, G1, B1);
			PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
			};
			btnColorView.ButtonClickEvent += (sender, e) =>
			{
			PanelColor(btnColor, seekBar1, R1, G1, B1);
			PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
			};
			btnColor.ButtonClickEvent += (sender, e) =>
			{
			PanelColor(btnColor, seekBar1, R1, G1, B1);
			PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
			};
			btnColorLine.ButtonClickEvent += (sender, e) =>
			{
			PanelColor(btnColor, seekBar1, R1, G1, B1);
			PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
			};
			btnRight.ButtonClickEvent += (sender, e) =>
			{
			PanelColor(btnColor, seekBar1, R1, G1, B1);
			PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
			};
			}

			/// <summary>
			/// PanelColorBefore
			/// </summary>
			private void PanelAfterColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
			{
			var form = new PanelColorSelectForm();
			form.AddForm(R1, G1, B1);
			form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
			{
			R1 = Rcolor;
			G1 = Gcolor;
			B1 = Bcolor;

			this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
			this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
			this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);

			btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
			//变更滑动条的颜色
			seekBar1.ProgressBarColor = btnColor.BackgroundColor;
			};
			}
			#endregion
			@@ -600,7 +749,6 @@

			//节能模式修改(他们说随便一个回路就行)
			//肖志豪给按键控制面板（四开八控）设备，说默认15秒时间，这样接近感应功能才合理
			energyModeInfo.time = 15;
			result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
			if (result == false)
			{