2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

 ZigbeeApp/Shared/Common/House.cs

@@ -57,9 +57,9 @@
        public double Latitude = 0;

        /// <summary>
        /// 房间路径列表
        /// 房间列表(房间的ID)
        /// </summary>
        public List<string> RoomFilePathList = new List<string> { };
        public List<string> ListRooms = new List<string>();

        /// <summary>
        /// 楼层字典
@@ -68,7 +68,7 @@
        /// </summary>
        public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
        /// <summary>
        /// 当前楼层
        /// 当前楼层Id
        /// </summary>
        public string CurrentFloorId;

@@ -235,8 +235,6 @@
        /// </summary>
        public static async System.Threading.Tasks.Task<List<string>> GetHomeLists()
        {
            //清空当前住宅列表
            Config.Instance.HomeFilePathList.Clear();
            var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()
            {
                PageSize = CommonPage.PageSize
@@ -266,7 +264,7 @@
                    if (responseDataObj.TotalCount == 0)
                    {
                        //当住宅为空时先提示用户新建住宅
                        var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
                        var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
                        alert.Show();
                        alert.ResultEventHandler += (sender, e) =>
                        {
@@ -278,6 +276,8 @@
                    }
                    else
                    {
                        //清空当前住宅列表
                        Config.Instance.HomeFilePathList.Clear();
                        if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
                        {
                            //赋一个初始值
@@ -443,10 +443,11 @@
            }
            return null;
        }

        /// <summary>
        /// InitFloor
        /// 设置当前楼层的ID
        /// </summary>
        public  void InitFloor()
        public void SetCurrentFloorId()
        {
            if (Config.Instance.Home.FloorDics.Count > 0 && string.IsNullOrEmpty(CurrentFloorId))
            {
@@ -466,19 +467,17 @@
        #region ◆ 添加房间路径_________________________

        /// <summary>
        /// 添加【房间路径】到房间路径列表
        /// 添加房间ID
        /// </summary>
        /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
        /// <param name="roomFilePath">Room file path.</param>
        public bool AddRoomListFilePath(string roomFilePath)
        public void AddRoomId(string roomId)
        {
            if (RoomFilePathList.Contains(roomFilePath))
            if (ListRooms.Contains(roomId) == false)
            {
                return false;
                ListRooms.Add(roomId);

                this.Save();
            }
            RoomFilePathList.Add(roomFilePath);
            Save();
            return true;
        }

        #endregion
@@ -486,19 +485,17 @@
        #region ◆ 删除房间路径_________________________

        /// <summary>
        /// 移除房间路径
        /// 移除房间Id
        /// </summary>
        /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
        /// <param name="roomFilePath">Room file path.</param>
        public bool RemoveRoomListFilePath(string roomFilePath)
        public void RemoveRoomId(string roomId)
        {
            if (!RoomFilePathList.Contains(roomFilePath))
            if (ListRooms.Contains(roomId)==true)
            {
                return false;
            }
            RoomFilePathList.Remove(roomFilePath);
                ListRooms.Remove(roomId);

            Save();
            return true;
            }
        }

        #endregion