最新代码

黄学彪

2020-04-02 9904031f5291daaf56985146bb671f25e18ebbdf

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs

@@ -510,6 +510,13 @@
        /// <param name="saveRealRoom">是否修改真实物理设备的房间,不出意外,这个值默认为true即可</param>

        public void ChangedRoom(CommonDevice device, string roomId, bool saveRealRoom = true)

        {

            //选择的是未分配

            if (roomId == string.Empty)

            {

                //从原来的房间移除设备

                this.DeleteDevice(device);

                return;

            }

            //房间是否修改

            if (this.IsRoomChanged(device, roomId) == false)

            {

@@ -763,6 +770,11 @@
            var listEsxit = new HashSet<string>();

            foreach (var room in this.dicRooms.Values)

            {

                if (room.IsLove == true)

                {

                    //不包含收藏房间

                    continue;

                }

                foreach (string mainkeys in room.ListDevice)

                {

                    if (listEsxit.Contains(mainkeys) == false)

@@ -776,6 +788,11 @@
            var commonDeviceList = LocalDevice.Current.listAllDevice;

            foreach (var device in commonDeviceList)

            {

                //判断该设备能否显示在主页

                if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)

                {

                    continue;

                }

                string mainkeys = LocalDevice.Current.GetDeviceMainKeys(device);

                if (listEsxit.Contains(mainkeys) == false)

                {

@@ -1010,7 +1027,7 @@
            if (Config.Instance.Home.ListRooms.Contains("Favorite") == false)

            {

                //默认添加喜爱的房间--禁止修改房间名

                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.JPG", Id = "Favorite" };

                var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.jpg", Id = "Favorite" };

                love.Save(false);

                //添加到house 房间路径列表

                var currentHome = Config.Instance.Home;