2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。

JLChen

2020-12-11 d616b67bd6ea95562af73a00bf0aab38eec935df

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

@@ -71,7 +71,7 @@
        {
            bodyView = this;
            roomsShowed = new List<Room>();
            roomsShowed.AddRange(DB_ResidenceData.rooms);
            roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
        }

        public void LoadPage()
@@ -224,20 +224,23 @@
                {
                    Gravity = Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealHeight(184),
                    Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                    Radius = (uint)Application.GetRealWidth(12),
                    Tag = room.sid,
                    Tag = room.roomId,
                };
                roomListView.AddChidren(roomView);

                var roomViewbg = new ImageView()
                {
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealHeight(184),
                    ImagePath = room.backgroundImage,
                    Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
                    //ImagePath = room.backgroundImage,
                    Radius = (uint)Application.GetRealWidth(12),
                };
                roomView.AddChidren(roomViewbg);

                //2020-12-03 修改图片加载方法
                ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);

                var roomViewbgColor = new Button()
                {
@@ -252,7 +255,7 @@
                    Y = Application.GetRealHeight(12 - 2),
                    Width = Application.GetRealWidth(266),
                    Height = Application.GetRealHeight(22 + 2 + 2),
                    Text = room.floorName + room.name,
                    Text = room.floorName + room.roomName,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
@@ -341,7 +344,7 @@
                var btnAllClose = new Button()
                {
                    X = Application.GetRealWidth(282),
                    Y = Application.GetRealHeight(126),
                    Y = Application.GetRealWidth(126),
                    Width = Application.GetMinRealAverage(58),
                    Height = Application.GetMinRealAverage(58),
                    UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
@@ -353,17 +356,22 @@

                var btn = new Button()
                {
                    Height = Application.GetRealHeight(20),
                    Height = Application.GetRealWidth(20),
                };
                roomListView.AddChidren(btn);

                roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                {
                    Action<Room > ReloadRoomName = (obj) => {
                        btnFloorAndRoomName.Text = obj.floorName + obj.name;
                    Action ReloadRoomName = () => {
                        btnFloorAndRoomName.Text = room.floorName + room.roomName;
                    };

                    var view = new RoomPage(room, ReloadRoomName);
                    //房间删除事件
                    Action deleteAction = () => {
                        roomView.RemoveFromParent();
                    };

                    var view = new RoomPage(room, ReloadRoomName, deleteAction);
                    MainPage.BasePageView.AddChidren(view);
                    view.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -810,10 +818,10 @@
                };
                dispalyView.AddChidren(contentView);

                if (DB_ResidenceData.residenceData.floors.Count < 2)
                if (SpatialInfo.CurrentSpatial.FloorList.Count < 2)
                {
                }
                else if (DB_ResidenceData.residenceData.floors.Count < 3)
                else if (SpatialInfo.CurrentSpatial.FloorList.Count < 3)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -828,7 +836,7 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (DB_ResidenceData.residenceData.floors.Count < 4)
                else if (SpatialInfo.CurrentSpatial.FloorList.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -863,9 +871,9 @@

                List<string> chooseList = new List<string>();
                chooseList.Add(Language.StringByID(StringId.All));
                foreach (var f in DB_ResidenceData.residenceData.floors)
                foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
                {
                    chooseList.Add(f.name);
                    chooseList.Add(f.roomName);
                }

                foreach (var floor in chooseList)
@@ -903,11 +911,11 @@
                        roomsShowed.Clear();
                        if (floor == Language.StringByID(StringId.All))
                        {
                            roomsShowed.AddRange(DB_ResidenceData.rooms);
                            roomsShowed.AddRange(DB_ResidenceData.residenceData.Rooms);
                        }
                        else
                        {
                            foreach (var room in DB_ResidenceData.rooms)
                            foreach (var room in DB_ResidenceData.residenceData.Rooms)
                            {
                                if (room.floorName == floor)
                                {