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 | 167 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 104 insertions(+), 63 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index 21d70d7..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;
+ }
});
}
@@ -112,6 +117,10 @@
frameBack.Height = Application.GetRealHeight(170);
bodyFrameLayout.AddChidren(frameBack);
+ //褰撳墠浜害(鍏堝０鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+
//鑺傝兘妯″紡
frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
//寮�鍏虫帶浠�
@@ -126,11 +135,15 @@
{
frameBack.Height += value;
frameLinght.Y += value;
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
else
{
frameBack.Height -= value;
frameLinght.Y -= value;
+ btnProgressView1.Visible = false;
+ btnProgress1.Visible = false;
}
};
if (energyModeInfo.enable == true)
@@ -139,20 +152,20 @@
}
//褰撳墠浜害
- var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = HdlControlResourse.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);
+ btnProgressView1.Visible = false;
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);
+ btnProgress1.Visible = false;
//杩涘害鏉�
var seekBar1 = new SeekBarControl();
@@ -168,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;
@@ -190,6 +203,15 @@
var value = Application.GetRealHeight(259);
frameBack.Height += value;
frameLinght.Y += value;
+
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
+ }
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnSwitch.CanClick = false;
+ seekBar1.Enable = false;
}
}
@@ -205,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;
@@ -219,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;
@@ -246,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;
@@ -262,22 +284,22 @@
btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
- var frameColor = new FrameLayoutControl();
+ var frameColor = new FrameLayoutStatuControl();
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
- frameColor.Height = Application.GetMinRealAverage(79);
+ 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), Application.GetMinRealAverage(49), false);
+ var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
btnColorView.TextSize = 12;
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);
@@ -285,29 +307,34 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xff666666;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.Y = Application.GetRealHeight(5);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+ btnColor.Gravity = Gravity.Center;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
- var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
+ var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
btnRight.UnSelectedImagePath = "Item/RightNext.png";
btnRight.Y = Application.GetRealHeight(5);
- btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
- frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
- btnRight.Y += Application.GetMinRealAverage(8);
+ btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
+ frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
+ btnRight.Y += this.GetPictrueRealSize(8);
frameColor.ButtonClickEvent += (sender, e) =>
{
@@ -328,6 +355,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -342,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;
@@ -356,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;
@@ -383,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;
@@ -399,22 +432,22 @@
btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
- var frameColor = new FrameLayoutControl();
+ var frameColor = new FrameLayoutStatuControl();
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
- frameColor.Height = Application.GetMinRealAverage(79);
+ 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), Application.GetMinRealAverage(49), false);
+ var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
btnColorView.TextSize = 12;
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);
@@ -422,29 +455,34 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xff666666;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Y = Application.GetRealHeight(5);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+ btnColor.Gravity = Gravity.Center;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
- var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
+ var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
btnRight.UnSelectedImagePath = "Item/RightNext.png";
btnRight.Y = Application.GetRealHeight(5);
- btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
- frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
- btnRight.Y += Application.GetMinRealAverage(8);
+ btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
+ frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
+ btnRight.Y += this.GetPictrueRealSize(8);
frameColor.ButtonClickEvent += (sender, e) =>
{
@@ -465,6 +503,12 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鑳界紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ frameColor.CanClick = false;
+ seekBar1.Enable = false;
+ }
}
#endregion
@@ -475,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)
{
//鍏抽棴杩涘害鏉�
@@ -488,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)
{
//鍏抽棴杩涘害鏉�
@@ -515,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