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/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 9322e2d..8874393 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -101,7 +101,7 @@
//璁惧鍥炬爣鎺т欢
this.btnDeviceIcon = new IconViewControl(78);
btnDeviceIcon.Gravity = Gravity.Center;
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
frameIconBackGroud.AddChidren(btnDeviceIcon);
//閲嶆柊缁戝畾浜嬩欢
this.frameTable.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);
@@ -116,7 +116,7 @@
btnDeviceName.X = Application.GetRealWidth(181);
//褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
@@ -140,9 +140,9 @@
}
//搴曠嚎
- var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
+ var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
btnBottomLine.X = Application.GetRealWidth(181);
- btnBottomLine.Y = this.Height - HdlControlResourse.BottomLineHeight;
+ btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
this.frameTable.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);
@@ -245,7 +245,7 @@
{
this.frameTable.AddChidren(this.btnSwitch, ChidrenBindMode.NotBind);
btnSwitch.InitControl();
- btnSwitch.X -= HdlControlResourse.XXLeft;
+ btnSwitch.X -= ControlCommonResourse.XXLeft;
btnSwitch.Y += this.chidrenYaxis;
return btnSwitch;
@@ -262,9 +262,9 @@
public virtual void RefreshControlInfo(CommonDevice i_device)
{
//璁惧鍥炬爣涔熷埛鏂�
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
//璁惧鍚嶅瓧
- this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
+ this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
@@ -292,7 +292,7 @@
//璁惧鐘舵�佸繀椤诲埛鏂�
if (this.btnStatu != null)
{
- this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
}
//寮�鍏虫帶浠�
if (this.btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
@@ -355,7 +355,7 @@
//濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
- return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);
+ return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);
}
@@ -526,7 +526,7 @@
public void StartRowLightAppeal()
{
//璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
if (this.isAppeal == true) { return; }
this.isAppeal = true;
--
Gitblit v1.8.0