From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 146 ++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 74 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
old mode 100755
new mode 100644
index 220071e..bdacca4
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -54,10 +54,10 @@
});
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private async void InitMiddleFrame()
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private async void InitMiddleFrame()
{
//鑾峰彇璁惧鍒濆鏁版嵁
var result = await this.GetDeviceDefultData();
@@ -140,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);
//杩涘害鏉�
@@ -174,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)
@@ -210,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();
@@ -225,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);
//杩涘害鏉�
@@ -259,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();
@@ -286,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);
@@ -297,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);
@@ -338,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();
@@ -353,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);
//杩涘害鏉�
@@ -387,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();
@@ -414,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);
@@ -425,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);
@@ -553,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