From d569f44a62fa915d4f01a80c21e617f676b6c5ea Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 18 十月 2019 10:12:10 +0800
Subject: [PATCH] 2019.10.18
---
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
old mode 100755
new mode 100644
index 51e053c..83af5ef
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
@@ -13,9 +13,9 @@
/// </summary>
private FrameLayout bodyFrameLayout;
/// <summary>
- /// 鎵�灞炲尯鍩�
+ /// 鎵�灞炲尯鍩熷垪琛�
/// </summary>
- private string roomName;
+ private List<string> roomNameList;
/// <summary>
/// action
/// </summary>
@@ -161,13 +161,13 @@
var nameRow = new DeviceInfoEditRow(170);
nameRow.Init();
nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.FunctionName)} : ");
- nameRow.SetTitle(string.IsNullOrEmpty(device.CommonDevice.DeviceEpointName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : device.CommonDevice.DeviceName);
+ nameRow.SetTitle(string.IsNullOrEmpty(device.CommonDevice.DeviceEpointName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : device.CommonDevice.DeviceEpointName);
infoFL.AddChidren(nameRow);
var zoneRow = new DeviceInfoRow(308);
zoneRow.Init();
zoneRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongZone)} : ");
- zoneRow.SetTitle(roomName);
+ //zoneRow.SetTitle(Common.Room.CurrentRoom.GetRoomName(roomNameList));
infoFL.AddChidren(zoneRow);
var modelRow = new DeviceInfoRow(446);
@@ -255,7 +255,8 @@
/// <param name="device"></param>
public void Init(DeviceUI device)
{
- roomName = Common.Room.CurrentRoom.GetRoomNameByDevice(device.CommonDevice);
+ roomNameList = new List<string> { };
+ //roomNameList = Common.Room.CurrentRoom.GetRoomListNameByDevice(device.CommonDevice);
}
#endregion
}
--
Gitblit v1.8.0