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/AirConditioner/IndoorUnitListForm.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index 5dadc7f..867258a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -39,7 +39,7 @@
/// <param name="i_diviceMac">璁惧Mac鍦板潃</param>
public void ShowForm(string i_diviceMac)
{
- this.listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(i_diviceMac);
+ this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_diviceMac);
//鏀堕泦鍏ㄩ儴绔偣
foreach (var device in this.listDevice)
{
@@ -116,14 +116,14 @@
var btnIcon = new IconViewControl(78);
btnIcon.Gravity = Gravity.Center;
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
btnIconBack.AddChidren(btnIcon);
frameTable.ChangedChidrenBindMode(btnIconBack, ChidrenBindMode.BindEvent);
rowInfo.btnIcon = btnIcon;
//璁惧鍚嶇О
var btnDeviceName = new NormalViewControl(700, 60, true);
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
btnDeviceName.X = Application.GetRealWidth(193);
btnDeviceName.Y = Application.GetRealHeight(45);
frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
@@ -226,13 +226,13 @@
frameTable.ButtonClickEvent += (sender, e) =>
{
- this.actionDeviceKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ this.actionDeviceKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
var form = new IndoorUnitSettionForm();
form.AddForm(device);
};
- dicControl[HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device)] = rowInfo;
+ dicControl[Common.LocalDevice.Current.GetDeviceMainKeys(device)] = rowInfo;
}
#endregion
@@ -284,12 +284,12 @@
{
HdlGatewayReceiveLogic.Current.AddAttributeEvent("IndoorUnitListFormEvent", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (device) =>
{
- string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
if (dicControl.ContainsKey(mainkeys) == false || device.DeviceStatusReport.CluterID != 513)
{
return;
}
- var localDevice = HdlDeviceCommonLogic.Current.GetDevice(mainkeys);
+ var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
if (localDevice == null)
{
return;
@@ -374,11 +374,11 @@
if (this.actionDeviceKeys != null && dicControl.ContainsKey(this.actionDeviceKeys) == true)
{
//鍒锋柊璁惧淇℃伅
- var device = HdlDeviceCommonLogic.Current.GetDevice(this.actionDeviceKeys);
+ var device = Common.LocalDevice.Current.GetDevice(this.actionDeviceKeys);
if (device != null)
{
var contr = dicControl[this.actionDeviceKeys];
- contr.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ contr.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
contr.btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
}
}
--
Gitblit v1.8.0