合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Common/House.cs

@@ -135,10 +135,39 @@
            }
        }

        /// <summary>

        /// 当前楼层ID

        /// 当前楼层id

        /// </summary>

        private string m_CurrentFloorId = string.Empty;

        /// <summary>
        /// 当前楼层Id
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string CurrentFloorId = string.Empty;
        public string CurrentFloorId

        {

            //来回切换备份,会出现问题,楼层id没清除

            get

            {

                //没有楼层

                if (this.FloorDics.Count == 0) { return string.Empty; }



                if (this.FloorDics.ContainsKey(m_CurrentFloorId) == true)

                {

                    //当前的楼层id没问题

                    return m_CurrentFloorId;

                }

                //如果当前设置的楼层id并不存在的话,重新设置

                m_CurrentFloorId = string.Empty;

                var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

                foreach (var floorId in dicFloor.Keys)

                {

                    //给一个过去即可

                    m_CurrentFloorId = floorId;

                    break;

                }

                return m_CurrentFloorId;

            }

            set { m_CurrentFloorId = value; }

        }

        #endregion

@@ -150,6 +179,11 @@
        /// <param name="autoBackup">是否备份</param>
        public void Save(bool autoBackup = true)
        {
            //如果当前是展示模板,则不允许保存
            if (this.IsShowTemplate == true)
            {
                return;
            }
            //修改时间
            this.LastEditorTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
            var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Id);