From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index 26f4c3a..eb51741 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -57,10 +57,10 @@
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
- private async void InitMiddleFrame()
+ private void InitMiddleFrame()
{
//鑾峰彇璁惧鍒濆鏁版嵁
- var result = await this.GetDeviceDefultData();
+ var result = this.GetDeviceDefultData();
if (result == false)
{
return;
@@ -92,6 +92,11 @@
//淇濆瓨闈㈡澘鏁版嵁
this.SavePanelData();
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSave.CanClick = false;
+ }
});
}
@@ -147,7 +152,7 @@
}
//褰撳墠浜害
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = HdlControlResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(164);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -176,7 +181,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;
@@ -202,6 +207,12 @@
btnProgressView1.Visible = true;
btnProgress1.Visible = true;
}
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -216,7 +227,7 @@
{
//鐐瑰嚮鍓�
var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.X = HdlControlResourse.XXLeft;
btnClick.Y = Application.GetRealHeight(35);
btnClick.TextSize = 12;
btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -230,7 +241,7 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = HdlControlResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -257,7 +268,7 @@
seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = HdlControlResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -278,7 +289,7 @@
frameColor.Width = Application.GetRealHeight(262);
frameColor.Height = this.GetPictrueRealSize(79);
frameColor.Y = Application.GetRealHeight(26);
- frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
+ frameColor.X = frameLinght.Width - HdlControlResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
@@ -288,7 +299,7 @@
btnColorView.Y = Application.GetRealHeight(5);
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
- frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
+ frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);
int R1 = Convert.ToInt32(this.keyColorData.CloseColorR, 16);
int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);
@@ -313,7 +324,7 @@
btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
- frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -322,7 +333,7 @@
btnRight.UnSelectedImagePath = "Item/RightNext.png";
btnRight.Y = Application.GetRealHeight(5);
btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
- frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
+ frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
btnRight.Y += this.GetPictrueRealSize(8);
frameColor.ButtonClickEvent += (sender, e) =>
@@ -344,6 +355,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -358,7 +375,7 @@
{
//鐐瑰嚮鍚�
var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.X = HdlControlResourse.XXLeft;
btnClick.Y = Application.GetRealHeight(536);
btnClick.TextSize = 12;
btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -372,7 +389,7 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = HdlControlResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -399,7 +416,7 @@
seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = HdlControlResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -420,7 +437,7 @@
frameColor.Width = Application.GetRealHeight(262);
frameColor.Height = this.GetPictrueRealSize(79);
frameColor.Y = Application.GetRealHeight(26);
- frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
+ frameColor.X = frameLinght.Width - HdlControlResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
@@ -430,7 +447,7 @@
btnColorView.Y = Application.GetRealHeight(5);
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
- frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
+ frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);
int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);
int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);
@@ -455,7 +472,7 @@
btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
- frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -464,7 +481,7 @@
btnRight.UnSelectedImagePath = "Item/RightNext.png";
btnRight.Y = Application.GetRealHeight(5);
btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
- frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
+ frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
btnRight.Y += this.GetPictrueRealSize(8);
frameColor.ButtonClickEvent += (sender, e) =>
@@ -486,6 +503,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -496,12 +519,12 @@
/// 鑾峰彇璁惧鍒濆鏁版嵁
/// </summary>
/// <returns></returns>
- private async Task<bool> GetDeviceDefultData()
+ private bool GetDeviceDefultData()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
+ linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
if (linghtLevelInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -509,14 +532,14 @@
return false;
}
//鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
+ energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
if (energyModeInfo == null)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
return false;
}
- keyColorData = await HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
+ keyColorData = HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
if (this.keyColorData == null)
{
//鍏抽棴杩涘害鏉�
@@ -536,26 +559,23 @@
/// <summary>
/// 淇濆瓨闈㈡澘鏁版嵁
/// </summary>
- private async void SavePanelData()
+ private void SavePanelData()
{
- this.ShowProgressBar();
//浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- var result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+ var result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
if (result == false)
{
this.CloseProgressBar();
return;
}
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+ result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
if (result == false)
{
- this.CloseProgressBar();
return;
}
//璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
- result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
- this.CloseProgressBar();
+ result = HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
if (result == false)
{
return;
--
Gitblit v1.8.0