~wjc/HomeApp.git

			@@ -14,10 +14,6 @@
			#region ■ 变量声明___________________________

			/// <summary>
			/// 设备Mac地址
			/// </summary>
			private string deviceMac = string.Empty;
			/// <summary>
			/// 亮度调节的信息
			/// </summary>
			private Panel.PanelSwitchLevelInfo linghtLevelInfo = null;
			@@ -45,8 +41,7 @@
			{
			this.ScrollEnabled = false;

			this.deviceMac = i_deviceMac;
			this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
			this.listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(i_deviceMac);

			//设置头部信息
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
			@@ -58,10 +53,10 @@
			/// <summary>
			/// 初始化中部信息
			/// </summary>
			private async void InitMiddleFrame()
			private void InitMiddleFrame()
			{
			//获取设备初始数据
			var result = await this.GetDeviceDefultData();
			var result = this.GetDeviceDefultData();
			if (result == false)
			{
			return;
			@@ -71,7 +66,7 @@

			//点击状态
			var btnClickStatu = new NormalViewControl(600, 49, true);
			btnClickStatu.X = ControlCommonResourse.XXLeft;
			btnClickStatu.X = HdlControlResourse.XXLeft;
			btnClickStatu.Y = Application.GetRealHeight(207);
			btnClickStatu.TextSize = 12;
			btnClickStatu.TextColor = UserCenterColor.Current.TextGrayColor3;
			@@ -96,20 +91,20 @@
			var btnSave = new BottomClickButton();
			btnSave.TextID = R.MyInternationalizationString.uSave;
			bodyFrameLayout.AddChidren(btnSave);
			btnSave.ButtonClickEvent += async (sender, e) =>
			btnSave.ButtonClickEvent += (sender, e) =>
			{
			if (valueChanged == true)
			{
			this.ShowProgressBar();
			//亮度调节更改(他们说随便一个回路就行)
			result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
			result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
			if (result == false)
			{
			this.CloseProgressBar();
			return;
			}
			//节能模式修改(他们说随便一个回路就行)
			result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
			result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
			this.CloseProgressBar();
			if (result == false)
			{
			@@ -178,7 +173,7 @@
			}

			//当前亮度
			btnProgressView1.X = ControlCommonResourse.XXLeft;
			btnProgressView1.X = HdlControlResourse.XXLeft;
			btnProgressView1.Y = Application.GetRealHeight(161);
			btnProgressView1.TextSize = 12;
			btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
			@@ -208,7 +203,7 @@
			seekBar1.Progress = energyModeInfo.level;

			var btnTemp1 = new NormalViewControl(200, 49, true);
			btnTemp1.X = ControlCommonResourse.XXLeft;
			btnTemp1.X = HdlControlResourse.XXLeft;
			btnTemp1.Y = Application.GetRealHeight(325);
			btnTemp1.TextSize = 12;
			btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
			@@ -235,6 +230,12 @@
			btnProgressView1.Visible = true;
			btnProgress1.Visible = true;
			}
			//如果当前是展示模板
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			seekBar1.Enable = false;
			btnSwitch.CanClick = false;
			}
			}

			#endregion
			@@ -248,7 +249,7 @@
			private void AddSixDryContactProgress(FrameLayout frameLinght)
			{
			var btnProgressView1 = new NormalViewControl(200, 49, true);
			btnProgressView1.X = ControlCommonResourse.XXLeft;
			btnProgressView1.X = HdlControlResourse.XXLeft;
			btnProgressView1.Y = Application.GetRealHeight(29);
			btnProgressView1.TextSize = 12;
			btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
			@@ -259,7 +260,7 @@
			btnProgress1.Y = Application.GetRealHeight(29);
			btnProgress1.TextSize = 12;
			btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
			btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
			btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
			frameLinght.AddChidren(btnProgress1);

			//进度条
			@@ -271,13 +272,13 @@
			{
			btnProgress1.Text = value + "%";
			//数据变更
			linghtLevelInfo.panelBacklightLevel = value;
			linghtLevelInfo.panelDirectionsLevel = value;
			valueChanged = true;
			};
			seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
			seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;

			var btnTemp1 = new NormalViewControl(200, 49, true);
			btnTemp1.X = ControlCommonResourse.XXLeft;
			btnTemp1.X = HdlControlResourse.XXLeft;
			btnTemp1.Y = Application.GetRealHeight(193);
			btnTemp1.TextSize = 12;
			btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
			@@ -294,11 +295,17 @@
			frameLinght.AddChidren(btnTemp2);

			//线
			var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
			var btnLine = new NormalViewControl(Application.GetRealWidth(965), HdlControlResourse.BottomLineHeight, false);
			btnLine.Y = Application.GetRealHeight(311);
			btnLine.Gravity = Gravity.CenterHorizontal;
			btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
			frameLinght.AddChidren(btnLine);

			//如果当前是展示模板
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			seekBar1.Enable = false;
			}
			}

			#endregion
			@@ -312,7 +319,7 @@
			private void AddSevenDryContactProgress(FrameLayout frameLinght)
			{
			var btnProgressView1 = new NormalViewControl(200, 49, true);
			btnProgressView1.X = ControlCommonResourse.XXLeft;
			btnProgressView1.X = HdlControlResourse.XXLeft;
			btnProgressView1.Y = Application.GetRealHeight(369);
			btnProgressView1.TextSize = 12;
			btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
			@@ -323,7 +330,7 @@
			btnProgress1.Y = Application.GetRealHeight(369);
			btnProgress1.TextSize = 12;
			btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
			btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
			btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
			frameLinght.AddChidren(btnProgress1);

			//进度条
			@@ -335,13 +342,13 @@
			{
			btnProgress1.Text = value + "%";
			//数据变更
			linghtLevelInfo.panelDirectionsLevel = value;
			linghtLevelInfo.panelBacklightLevel = value;
			valueChanged = true;
			};
			seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
			seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;

			var btnTemp1 = new NormalViewControl(200, 49, true);
			btnTemp1.X = ControlCommonResourse.XXLeft;
			btnTemp1.X = HdlControlResourse.XXLeft;
			btnTemp1.Y = Application.GetRealHeight(533);
			btnTemp1.TextSize = 12;
			btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
			@@ -358,11 +365,17 @@
			frameLinght.AddChidren(btnTemp2);

			//线
			var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
			var btnLine = new NormalViewControl(Application.GetRealWidth(965), HdlControlResourse.BottomLineHeight, false);
			btnLine.Gravity = Gravity.CenterHorizontal;
			btnLine.Y = Application.GetRealHeight(651);
			btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
			frameLinght.AddChidren(btnLine);

			//如果当前是展示模板
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			seekBar1.Enable = false;
			}
			}

			#endregion
			@@ -373,12 +386,12 @@
			/// 获取设备初始数据
			/// </summary>
			/// <returns></returns>
			private async Task<bool> GetDeviceDefultData()
			private bool GetDeviceDefultData()
			{
			//开启进度条
			this.ShowProgressBar();
			//亮度调节(他们说随便拿一路回路就行了)
			linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
			linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
			if (linghtLevelInfo == null)
			{
			//关闭进度条
			@@ -386,7 +399,7 @@
			return false;
			}
			//节能模式(他们说随便拿一路回路就行了)
			energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
			energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
			if (energyModeInfo == null)
			{
			//关闭进度条