From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 7cf9971..92ec0a2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -122,6 +122,7 @@
frameContr.AddChidren(btnPic);
var btnName = new NormalViewControl(251, 282, true);
+ btnName.IsMoreLines = true;
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
@@ -247,7 +248,7 @@
var dic = new Dictionary<int, DeviceRowInfo>();
foreach (var device in listDevice)
{
- var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
//鎸夋墍灞濱D鍒嗙粍
if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
{
@@ -255,7 +256,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceBeloneIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
dic[typeInfo.BeloneTextId].IconPath = path1;
}
dic[typeInfo.BeloneTextId].listDeviceKeys.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));
--
Gitblit v1.8.0