合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -91,7 +91,7 @@
            };
            bodyFrameLayout.AddChidren(verticalScrolView);

            var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
            var confirm = new Device.CommonForm.CompleteButton(1700, 900, 127);
            confirm.SetTitle(R.MyInternationalizationString.Save);
            AddChidren(confirm);
            confirm.MouseUpEventHandler += (sender, e) =>
@@ -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)
                {