2019.10.18

gxc

2019-10-18 d569f44a62fa915d4f01a80c21e617f676b6c5ea

 ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs

old mode 100755
new mode 100644
@@ -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
    }