20201218-2

wei

2020-12-19 c5a873df96e4a797426e4dd5eafe5b43f7aea564

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

old mode 100755
new mode 100644
@@ -494,6 +494,25 @@
                }
                functionCategoryCount++;

                //FunctionType ft = FunctionType.A31Music
                //switch (item)
                //{
                //    case FunctionType.FloorHeating:
                //        break;
                //    case FunctionType.AC:
                //        break;
                //    case FunctionType.MotorCurtain:
                //    case FunctionType.Curtain:
                //    case FunctionType.RollingShutter:
                //        break;
                //    case FunctionType.Relay:
                //    case FunctionType.Dimmer:
                //    case FunctionType.RGB:
                //    case FunctionType.ColorTemperature:
                //        break;
                //    case FunctionType.Socket:
                //        break;
                //}
                FrameLayout functionView = new FrameLayout()
                {
                    Height = Application.GetRealWidth(161),
@@ -502,6 +521,7 @@
                    Tag = item + "_View",
                    Y = index % 2 == 1 ? lastY2 : lastY1
                };
                MainPage.Log($"Load FunctionView Tag = {item}");
                //高度稍高的view
                if (specialList.Contains(index))
                {
@@ -614,7 +634,6 @@
                            Height = Application.GetRealWidth(32),
                            UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                            SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
                            //Tag = item + "_AllControl",
                            IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
                        };
                        functionView.AddChidren(btnClose);
@@ -920,7 +939,7 @@
                        {
                            foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
                            {
                                if (room.parentId == floor.roomId)
                                if (room.parentId == floor.uid)
                                {
                                    roomsShowed.Add(room);
                                }