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

JLChen

2020-12-11 d616b67bd6ea95562af73a00bf0aab38eec935df

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs

@@ -10,7 +10,7 @@
        /// <summary>
        /// 楼层按钮修改名称点击事件
        /// </summary>
        void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,Floor floor)
        void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,SpatialInfo floor)
        {
            btn.MouseUpEventHandler = (sender, e) =>
            {
@@ -27,21 +27,21 @@
                        }.Show(bodyView);
                        return;
                    }
                    if (Floor.InsFloor.Floors.Find((obj) => obj.roomName == newName) != null)
                    if (SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newName) != null)
                    {
                        return;
                    }
                    else
                    {
                        floor.roomName = newName;
                        floor.SaveFloorData();
                        floor.UpdateFloor();
                        btn.Text = newName;
                        btnDel.Tag = newName;
                        row.Tag = newName;
                    }
                };
                var floors = new List<string>();
                foreach (var f in Floor.InsFloor.Floors)
                foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
                {
                    floors.Add(f.roomName);
                }
@@ -98,11 +98,11 @@
                {
                    return;
                }
                room.parentId = lastButton.Tag.ToString();
                //room.parentId = lastButton.Tag.ToString();
                room.parentId = lastButton.Tag.ToString();
                backAction?.Invoke();
                bodyView.RemoveFromParent();
                DB_ResidenceData.residenceData.SaveResidenceData();
                //DB_ResidenceData.residenceData.SaveResidenceData();
            };
        }