From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 178 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index a30be7c..9ab7f3f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -38,27 +38,27 @@
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm(string i_deviceMac)
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm(string i_deviceMac)
{
UserView.HomePage.Instance.ScrollEnabled = false;
- this.deviceMac = i_deviceMac;
- this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
-
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private async void InitMiddleFrame()
+ this.deviceMac = i_deviceMac;
+ this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private async void InitMiddleFrame()
{
//鑾峰彇璁惧鍒濆鏁版嵁
var result = await this.GetDeviceDefultData();
@@ -67,22 +67,22 @@
return;
}
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- //鐐瑰嚮鐘舵��
- var btnClickStatu = new NormalViewControl(600, 49, true);
- btnClickStatu.X = ControlCommonResourse.XXLeft;
- btnClickStatu.Y = Application.GetRealHeight(207);
- btnClickStatu.TextSize = 12;
- btnClickStatu.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnClickStatu.TextID = R.MyInternationalizationString.uClickStatu;
- bodyFrameLayout.AddChidren(btnClickStatu);
-
+ this.ClearBodyFrame();
+
+ //鐐瑰嚮鐘舵��
+ var btnClickStatu = new NormalViewControl(600, 49, true);
+ btnClickStatu.X = ControlCommonResourse.XXLeft;
+ btnClickStatu.Y = Application.GetRealHeight(207);
+ btnClickStatu.TextSize = 12;
+ btnClickStatu.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClickStatu.TextID = R.MyInternationalizationString.uClickStatu;
+ bodyFrameLayout.AddChidren(btnClickStatu);
+
//鍚勭鑳屽厜鐏殑瀹瑰櫒
- var frameLinght = new FrameLayout();
- frameLinght.Height = Application.GetRealHeight(818);
- frameLinght.Y = Application.GetRealHeight(279);
- frameLinght.BackgroundColor = UserCenterColor.Current.White;
+ var frameLinght = new FrameLayout();
+ frameLinght.Height = Application.GetRealHeight(818);
+ frameLinght.Y = Application.GetRealHeight(279);
+ frameLinght.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(frameLinght);
//娣诲姞1-6骞叉帴鐐圭殑鑳屽厜鐏繘搴︽潯
@@ -102,14 +102,14 @@
{
this.ShowProgressBar();
//浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- result = await HdlPanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+ result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
if (result == false)
{
this.CloseProgressBar();
return;
}
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- result = await HdlPanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+ result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
this.CloseProgressBar();
if (result == false)
{
@@ -171,18 +171,18 @@
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(161);
- 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(158);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = energyModeInfo.level + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = energyModeInfo.level + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -206,20 +206,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)
@@ -243,18 +243,18 @@
private void AddSixDryContactProgress(FrameLayout frameLinght)
{
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(29);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.Text = "Dry1-6";
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.Text = "Dry1-6";
frameLinght.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(204);
+ btnProgress1.X = Application.GetRealWidth(204);
btnProgress1.Y = Application.GetRealHeight(29);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -278,27 +278,27 @@
};
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(193);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameLinght.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(193);
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%";
frameLinght.AddChidren(btnTemp2);
//绾�
var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
btnLine.Y = Application.GetRealHeight(311);
btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameLinght.AddChidren(btnLine);
}
@@ -313,18 +313,18 @@
private void AddSevenDryContactProgress(FrameLayout frameLinght)
{
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(369);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.Text = "Dry7";
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.Text = "Dry7";
frameLinght.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(161);
+ btnProgress1.X = Application.GetRealWidth(161);
btnProgress1.Y = Application.GetRealHeight(369);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -348,27 +348,27 @@
};
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(533);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameLinght.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(533);
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%";
frameLinght.AddChidren(btnTemp2);
//绾�
var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = Application.GetRealHeight(651);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
frameLinght.AddChidren(btnLine);
}
@@ -385,7 +385,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- linghtLevelInfo = await HdlPanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
+ linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
if (linghtLevelInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -393,7 +393,7 @@
return false;
}
//鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
- energyModeInfo = await HdlPanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
+ energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
if (energyModeInfo == null)
{
//鍏抽棴杩涘害鏉�
@@ -413,11 +413,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