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/SharedContent/AddNewSharedContentForm.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index 816556e..cef5888 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -211,6 +211,7 @@
frameContr.AddChidren(btnPic, ChidrenBindMode.BindEventOnly);
var btnName = new NormalViewControl(251, 282, true);
+ btnName.IsMoreLines = true;
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
@@ -409,7 +410,7 @@
//濡傛灉宸茬粡鍒嗕韩浜�,鍒欎笉鏄剧ず
continue;
}
- var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
{
dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
--
Gitblit v1.8.0