From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index b3e6f0f..220071e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -47,8 +47,11 @@
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ });
}
/// <summary>
@@ -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
@@ -462,7 +468,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- linghtLevelInfo = await HdlPanelLogic.Current.GetDeviceLightSettion(panelDevice);
+ linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
if (linghtLevelInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -470,14 +476,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 +507,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;
--
Gitblit v1.8.0