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/Residence/LookRoomSettionForm.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index ce14d26..c34be8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -152,7 +152,7 @@
}
var frameBack = new FrameLayout();
- frameBack.X = HdlControlResourse.XXLeft;
+ frameBack.X = ControlCommonResourse.XXLeft;
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
frameBack.Height = Application.GetRealHeight(1650);
@@ -171,7 +171,7 @@
this.AddDeviceRow(dicGroupDevice[strText], strText, listView);
foreach (var deviceKey in dicGroupDevice[strText].listDeviceKeys)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
+ var device = Common.LocalDevice.Current.GetDevice(deviceKey);
//浠ュ洖璺綔涓虹储寮曞幓鎸囧畾瀵硅薄
dicData[deviceKey] = dicGroupDevice[strText];
}
@@ -199,8 +199,8 @@
private void AddDeviceRow(DeviceRowInfo rowInfo, string strText, VerticalListControl listView)
{
var frameRow = new FrameRowControl(listView.rowSpace / 2);
- frameRow.LeftOffset = Application.GetRealWidth(46) - HdlControlResourse.XXLeft;
- frameRow.RightOffset = -HdlControlResourse.XXLeft;
+ frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft;
+ frameRow.RightOffset = -ControlCommonResourse.XXLeft;
listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.AddLeftIcon(81);
@@ -238,7 +238,7 @@
var dic = new Dictionary<string, DeviceRowInfo>();
foreach (var device in listDevice)
{
- var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
+ var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
//鎸夋墍灞濱D鍒嗙粍
if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
@@ -246,10 +246,10 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- HdlDeviceCommonLogic.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
}
- dic[typeInfo.BeloneText].listDeviceKeys.Add(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
+ dic[typeInfo.BeloneText].listDeviceKeys.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));
}
return dic;
}
@@ -278,11 +278,11 @@
if (dicCheck.ContainsKey(localDevice.DeviceAddr) == false)
{
//鍙渶瑕佹娴嬩竴璺�
- var deviceInfo = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(localDevice);
+ var deviceInfo = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(localDevice);
if (deviceInfo != null)
{
localDevice.IsOnline = deviceInfo.IsOnline;
- dicCheck[localDevice.DeviceAddr] = HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(localDevice, false);
+ dicCheck[localDevice.DeviceAddr] = Common.LocalDevice.Current.CheckDeviceIsOnline(localDevice, false);
}
}
if (dicCheck.ContainsKey(localDevice.DeviceAddr) == false
@@ -291,7 +291,7 @@
//缃戝叧娌℃湁鍥炲,鎴栬�呬笉鍦ㄧ嚎
continue;
}
- string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(localDevice);
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(localDevice);
if (dicData.ContainsKey(mainkeys) == true)
{
HdlThreadLogic.Current.RunMain(() =>
--
Gitblit v1.8.0