合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Common/Room.cs

@@ -69,7 +69,7 @@

        /// <summary>

        /// 温度传感器(设备主键)

        /// </summary>   
        /// </summary>
        public string TemperatrueDevice = string.Empty;
        /// <summary>

        /// 湿度传感器(设备主键)

@@ -78,11 +78,11 @@
        /// <summary>
        /// 温度
        /// </summary>
        public double Temperatrue;
        public decimal Temperatrue;
        /// <summary>
        /// 湿度
        /// </summary>
        public double Humidity;
        public decimal Humidity;

        /// <summary>

        /// 当前选择的房间

@@ -332,7 +332,7 @@
                        room.Name = $"{room.Name}";
                    }
                    Lists.Add(room);
                   

                }
            }
            Config.Instance.Home.InitFloor();
@@ -943,6 +943,31 @@
            this.DeleteDevice(device);
        }

        /// <summary>
        /// 删除我的喜爱的设备
        /// </summary>
        /// <param name="device">要删除的设备对象</param>
        public void DeleteLoveDevice(CommonDevice device)
        {
            if (device == null)
            {
                return;
            }
            //我的喜爱
            var loveRoom = this.GetLoveRoom();

            if (loveRoom != null)

            {

                string deviceFile = device.FilePath;

                //移除缓存

                if (loveRoom.DeviceUIFilePathList.Contains(deviceFile) == false)

                {

                    return;

                }

                loveRoom.DeviceUIFilePathList.Remove(deviceFile);

                loveRoom.DeviceUIList.RemoveAll((obj) => obj.FileName == deviceFile);

            }
        }

        #endregion

        #region ◆ 获取设备_________________________
@@ -1208,10 +1233,10 @@
        /// <param name="addCommons">Add commons.</param>
        public async System.Threading.Tasks.Task<int> ModifyScene(SceneUI sceneUI, Scene.SceneRemoveMemberData sceneRemoveMemberData, List<Scene.AddSceneMemberData> addCommons)
        {
            if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
            {
                return 0;
            }
            //if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
            //{
            //    return 0;
            //}

            bool result = true;
            //移除成员 返回结果
@@ -1285,6 +1310,13 @@
            SceneUIList.Remove(sceneUI);
            SceneUIFilePathList.Remove(sceneUI.FileName);
            Save();
            if (IsLove == false)
            {
                if (CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == sceneUI.Id) != null)
                {
                    CurrentRoom.GetLoveRoom().DeleteScene(sceneUI);
                }
            }
            Global.DeleteFilebyHomeId(sceneUI.FileName);
            HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
        }