Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs

@@ -107,13 +107,24 @@

            for (int i = 0; i < deviceList.Count; i++)
            {
                var fl = new FrameLayout
                {
                    Height = Application.GetRealHeight(127 + 20),
                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                };
                verticalScrolView.AddChidren(fl);

                var device = deviceList[i];
                var devRow = new DeviceInfoWithZoneRow(20 + i * (127 + 20));
                verticalScrolView.AddChidren(devRow);
                var devRow = new DeviceInfoWithZoneRow(20);
                fl.AddChidren(devRow);
                devRow.Init();
                devRow.SetIcon(device.IconPath);
                devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
                devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
                if (i == deviceList.Count - 1)
                {
                    devRow.HideLine(true);
                }

                if (tempDevice != null && tempDevice == device)
                {