From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
index 75fc9ce..dbac75a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
@@ -40,7 +40,7 @@
{
this.ScrollEnabled = false;
- this.listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(i_deviceMac);
+ this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));
@@ -65,7 +65,7 @@
//鐐瑰嚮鐘舵��
var btnClickStatu = new NormalViewControl(600, 49, true);
- btnClickStatu.X = HdlControlResourse.XXLeft;
+ btnClickStatu.X = ControlCommonResourse.XXLeft;
btnClickStatu.Y = Application.GetRealHeight(207);
btnClickStatu.TextSize = 12;
btnClickStatu.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -146,7 +146,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
energyModeInfo.enable = btnSwitch.IsSelected;
//灞曞紑鎴栬�呯缉灏忕殑楂樺害
- var value = Application.GetRealHeight(259 + 23) + HdlControlResourse.ListViewRowHeight;
+ var value = Application.GetRealHeight(259 + 23) + ControlCommonResourse.ListViewRowHeight;
if (btnSwitch.IsSelected == true)
{
frameBack.Height += value;
@@ -172,7 +172,7 @@
}
//褰撳墠浜害
- btnProgressView1.X = HdlControlResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(161);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -202,7 +202,7 @@
seekBar1.Progress = energyModeInfo.level;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = HdlControlResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(325);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -221,7 +221,7 @@
if (energyModeInfo.enable == true)
{
//灞曞紑鎴栬�呯缉灏忕殑楂樺害
- var value = Application.GetRealHeight(259 + 23) + HdlControlResourse.ListViewRowHeight;
+ var value = Application.GetRealHeight(259 + 23) + ControlCommonResourse.ListViewRowHeight;
frameBack.Height += value;
btnClickStatu.Y += value;
frameLinght.Y += value;
@@ -327,7 +327,7 @@
private void AddSixDryContactProgress(FrameLayout frameLinght)
{
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = HdlControlResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(29);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -356,7 +356,7 @@
seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = HdlControlResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(193);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -373,7 +373,7 @@
frameLinght.AddChidren(btnTemp2);
//绾�
- var btnLine = new NormalViewControl(Application.GetRealWidth(965), HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
btnLine.Y = Application.GetRealHeight(311);
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
@@ -397,7 +397,7 @@
private void AddSevenDryContactProgress(FrameLayout frameLinght)
{
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = HdlControlResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(369);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -426,7 +426,7 @@
seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = HdlControlResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(533);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -443,7 +443,7 @@
frameLinght.AddChidren(btnTemp2);
//绾�
- var btnLine = new NormalViewControl(Application.GetRealWidth(965), HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(Application.GetRealWidth(965), ControlCommonResourse.BottomLineHeight, false);
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = Application.GetRealHeight(651);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
--
Gitblit v1.8.0