2021-1-12-3

陈嘉乐

2021-01-11 631f94758c3cb42abcdda8094e77895f376eff16

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

@@ -373,7 +373,14 @@
                        roomView.RemoveFromParent();
                    };

                    var view = new RoomPage(room, ReloadRoomName, deleteAction);
                    //房间背景图修改事件回调
                    Action modifyImageAction = () =>
                    {
                        //roomViewbg.ImagePath = room.backgroundImage;
                        ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
                    };

                    var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
                    MainPage.BasePageView.AddChidren(view);
                    view.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -497,20 +504,20 @@
                //FunctionType ft = FunctionType.A31Music
                //switch (item)
                //{
                //    case FunctionType.FloorHeating:
                //    case SPK.FloorHeatStandard:
                //        break;
                //    case FunctionType.AC:
                //    case SPK.AcStandard:
                //        break;
                //    case FunctionType.MotorCurtain:
                //    case FunctionType.Curtain:
                //    case FunctionType.RollingShutter:
                //    case SPK.CurtainTrietex:
                //    case SPK.CurtainSwitch:
                //    case SPK.CurtainRoller:
                //        break;
                //    case FunctionType.Relay:
                //    case FunctionType.Dimmer:
                //    case FunctionType.RGB:
                //    case FunctionType.ColorTemperature:
                //    case SPK.LightSwitch:
                //    case SPK.LightDimming:
                //    case SPK.LightRGB:
                //    case SPK.LightCCT:
                //        break;
                //    case FunctionType.Socket:
                //    case SPK.ElectricSocket:
                //        break;
                //}
                FrameLayout functionView = new FrameLayout()
@@ -521,7 +528,6 @@
                    Tag = item + "_View",
                    Y = index % 2 == 1 ? lastY2 : lastY1
                };
                MainPage.Log($"Load FunctionView Tag = {item}");
                //高度稍高的view
                if (specialList.Contains(index))
                {
@@ -921,7 +927,7 @@
                        Text = floor.roomName,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
                        IsMoreLines = true,
                        //IsMoreLines = true,
                    };
                    contentView.AddChidren(btnHomeName);