Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -167,7 +167,7 @@
            var zoneRow = new DeviceInfoRow(308);
            zoneRow.Init();
            zoneRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongZone)} : ");
            zoneRow.SetTitle(Common.Room.CurrentRoom.GetRoomName(roomNameList));
            //zoneRow.SetTitle(Common.Room.CurrentRoom.GetRoomName(roomNameList));
            infoFL.AddChidren(zoneRow);

            var modelRow = new DeviceInfoRow(446);