合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -104,15 +104,25 @@
            var deviceList = GetTemperatrueDevices();
            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)
                if (tempDevice!=null && tempDevice==device)
                {
                    tempDeviceRow = devRow;
                    tempDevice = device;