From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 216 +++++++++++++++++++++++++++--------------------------
1 files changed, 110 insertions(+), 106 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index b3e6f0f..bdacca4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -47,14 +47,17 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ });
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private async void InitMiddleFrame()
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private async void InitMiddleFrame()
{
//鑾峰彇璁惧鍒濆鏁版嵁
var result = await this.GetDeviceDefultData();
@@ -62,31 +65,34 @@
{
return;
}
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- //鍚勭鑳屽厜鐏殑瀹瑰櫒
- var frameLinght = new FrameLayout();
- frameLinght.Height = Application.GetRealHeight(1003);
- frameLinght.Y = Application.GetRealHeight(170);
- bodyFrameLayout.AddChidren(frameLinght);
-
- //娣诲姞鑺傝兘妯″紡
- this.AddEnergyConservationRow(frameLinght);
- //娣诲姞鐐瑰嚮鍓嶏紝浜害杩涘害鏉�
- this.AddBeforeClickProgress(frameLinght);
- //娣诲姞鐐瑰嚮鍚庯紝浜害杩涘害鏉�
- this.AddAfterClickProgress(frameLinght);
-
- //淇濆瓨
- var btnSave = new BottomClickButton();
- btnSave.TextID = R.MyInternationalizationString.uSave;
- bodyFrameLayout.AddChidren(btnSave);
- btnSave.ButtonClickEvent += (sender, e) =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- //淇濆瓨闈㈡澘鏁版嵁
- this.SavePanelData();
- };
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鍚勭鑳屽厜鐏殑瀹瑰櫒
+ var frameLinght = new FrameLayout();
+ frameLinght.Height = Application.GetRealHeight(1003);
+ frameLinght.Y = Application.GetRealHeight(170);
+ bodyFrameLayout.AddChidren(frameLinght);
+
+ //娣诲姞鑺傝兘妯″紡
+ this.AddEnergyConservationRow(frameLinght);
+ //娣诲姞鐐瑰嚮鍓嶏紝浜害杩涘害鏉�
+ this.AddBeforeClickProgress(frameLinght);
+ //娣诲姞鐐瑰嚮鍚庯紝浜害杩涘害鏉�
+ this.AddAfterClickProgress(frameLinght);
+
+ //淇濆瓨
+ var btnSave = new BottomClickButton();
+ btnSave.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnSave);
+ btnSave.ButtonClickEvent += (sender, e) =>
+ {
+ //淇濆瓨闈㈡澘鏁版嵁
+ this.SavePanelData();
+ };
+ });
}
#endregion
@@ -134,18 +140,18 @@
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
- btnProgressView1.Y = Application.GetRealHeight(161);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.Y = Application.GetRealHeight(164);
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(222);
- btnProgress1.Y = Application.GetRealHeight(158);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = energyModeInfo.level + "%";
+ btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.Y = Application.GetRealHeight(164);
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = energyModeInfo.level + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -168,20 +174,20 @@
};
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(325);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(325);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
if (energyModeInfo.enable == true)
@@ -204,12 +210,12 @@
private void AddBeforeClickProgress(FrameLayout frameLinght)
{
//鐐瑰嚮鍓�
- var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
- btnClick.Y = Application.GetRealHeight(35);
- btnClick.TextSize = 12;
- btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnClick.TextID = R.MyInternationalizationString.uBeforeClick;
+ var btnClick = new NormalViewControl(600, 49, true);
+ btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.Y = Application.GetRealHeight(35);
+ btnClick.TextSize = 12;
+ btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClick.TextID = R.MyInternationalizationString.uBeforeClick;
frameLinght.AddChidren(btnClick);
//鑳屾櫙
var frameBack = new FrameLayout();
@@ -219,18 +225,18 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(52);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -253,20 +259,20 @@
};
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(216);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
var frameColor = new FrameLayoutControl();
@@ -280,7 +286,7 @@
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
- btnColorView.TextSize = 12;
+ btnColorView.TextSize = 12;
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
@@ -291,13 +297,12 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69);
+ btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
btnColor.BackgroundColor = backColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
btnRight.UnSelectedImagePath = "Item/Next.png";
- btnRight.BackgroundColor = UserCenterColor.Current.Green;
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
btnRight.Y += Application.GetMinRealAverage(8);
@@ -332,12 +337,12 @@
private void AddAfterClickProgress(FrameLayout frameLinght)
{
//鐐瑰嚮鍚�
- var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
- btnClick.Y = Application.GetRealHeight(536);
- btnClick.TextSize = 12;
- btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnClick.TextID = R.MyInternationalizationString.uAfterClick;
+ var btnClick = new NormalViewControl(600, 49, true);
+ btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.Y = Application.GetRealHeight(536);
+ btnClick.TextSize = 12;
+ btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClick.TextID = R.MyInternationalizationString.uAfterClick;
frameLinght.AddChidren(btnClick);
//鑳屾櫙
var frameBack = new FrameLayout();
@@ -347,18 +352,18 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(52);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -381,20 +386,20 @@
};
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(216);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
var frameColor = new FrameLayoutControl();
@@ -408,7 +413,7 @@
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
- btnColorView.TextSize = 12;
+ btnColorView.TextSize = 12;
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
@@ -419,13 +424,12 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69);
+ btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
btnColor.BackgroundColor = backColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
btnRight.UnSelectedImagePath = "Item/Next.png";
- btnRight.BackgroundColor = UserCenterColor.Current.Green;
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
btnRight.Y += Application.GetMinRealAverage(8);
@@ -462,7 +466,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- linghtLevelInfo = await HdlPanelLogic.Current.GetDeviceLightSettion(panelDevice);
+ linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
if (linghtLevelInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -470,14 +474,14 @@
return false;
}
//鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- energyModeInfo = await HdlPanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
+ energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
if (energyModeInfo == null)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
return false;
}
- keyColorData = await HdlPanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
+ keyColorData = await HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
if (this.keyColorData == null)
{
//鍏抽棴杩涘害鏉�
@@ -501,21 +505,21 @@
{
this.ShowProgressBar();
//浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- var result = await HdlPanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+ var result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
if (result == false)
{
this.CloseProgressBar();
return;
}
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- result = await HdlPanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+ result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
this.CloseProgressBar();
if (result == false)
{
return;
}
//璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
- result = await HdlPanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
+ result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
if (result == false)
{
return;
@@ -547,11 +551,11 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
UserView.HomePage.Instance.ScrollEnabled = true;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0