2019.1.2-3

gxc

2020-01-02 34e965100d635346e2d4cd6e6013bdaed66b3004

 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();
@@ -370,15 +370,45 @@
                homeTemp.AddRoomListFilePath(fRoom);

            }



            var listRoomFile = new List<string>();

            foreach (string fileName in listFile)

            {

                if (fileName.StartsWith("Room_"))

                {

                    homeTemp.AddRoomListFilePath(fileName);

                    listRoomFile.Add(fileName);

                }

            }

            //检测楼层数据的合法性

            CheckFloorData(listRoomFile);



            homeTemp.Save(false);

            InitAllRoom();

        }

        /// <summary>

        /// 检测楼层数据的合法性

        /// </summary>

        /// <param name="listRoomFile"></param>
        private static void CheckFloorData(List<string> listRoomFile)

        {

            for (int i = 0; i < listRoomFile.Count; i++)

            {

                try

                {

                    var byteData = Global.ReadFileByHomeId(listRoomFile[i]);

                    string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                    var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);



                    //检测多个手机来回创建,然后又删除之后,楼层数据不能保证100%同步的问题

                    if (roomTemp.FloorId != string.Empty && Config.Instance.Home.FloorDics.ContainsKey(roomTemp.FloorId) == false)

                    {

                        //未知楼层

                        Config.Instance.Home.FloorDics[roomTemp.FloorId] = Language.StringByID(R.MyInternationalizationString.uUnKnownFloor);

                    }

                }

                catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }

            }

        }

        #endregion
@@ -428,8 +458,33 @@
            //删除来自拍照或者系统图库的房间背景图片
            if (room.BackgroundImageType == 1 || room.BackgroundImageType == 2)
            {
                DeleteBackGroundIamageFilebyHomeId(room.BackgroundImage);
                //删除掉原来的自定义图片
                if (Global.IsExistsByHomeId(room.BackgroundImage) == true)

                {

                    Global.DeleteFilebyHomeId(room.BackgroundImage);

                    //删除备份

                    HdlAutoBackupLogic.DeleteFile(room.BackgroundImage);

                }
            }
            //我的喜爱
            var loveRoom = this.GetLoveRoom();
            if (loveRoom != null)

            {

                //移除我的喜爱里面的设备

                for (int i = 0; i < room.DeviceUIFilePathList.Count; i++)

                {

                    loveRoom.DeviceUIFilePathList.Remove(room.DeviceUIFilePathList[i]);

                    loveRoom.DeviceUIList.RemoveAll((obj) => { return room.DeviceUIFilePathList[i] == obj.FileName; });

                }

                //移除我的喜爱里面的场景

                for (int i = 0; i < room.SceneUIFilePathList.Count; i++)

                {

                    loveRoom.SceneUIFilePathList.Remove(room.SceneUIFilePathList[i]);

                    loveRoom.SceneUIList.RemoveAll((obj) => { return room.SceneUIFilePathList[i] == obj.FileName; });

                }

                loveRoom.Save(false);

            }

            if (Global.IsExistsByHomeId(roomFilePath) == false)
            {
                return false;
@@ -766,31 +821,6 @@
        #endregion

        #region ◆ 房间背景图的相关___________________
        /// <summary>
        /// 删除背景图片
        /// </summary>
        /// <param name="fileName">fileName实际上包含了住宅路劲 如 住宅/文件名.</param>
        public static void DeleteBackGroundIamageFilebyHomeId(string fileName)
        {
            if (fileName == null)
            {
                return;
            }
            var pathLists = fileName.Split('/');
            if (pathLists == null || pathLists.Count() < 9 || pathLists[8] == null)
            {
                return;
            }
            var path = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
            if (!Global.IsExistsByHomeId(pathLists[8]))
            {
                return;
            }
            //删除本地图片
            System.IO.File.Delete(path);
            //删除备份
            Phone.UserCenter.HdlAutoBackupLogic.DeleteFile(pathLists[8]);
        }

        /// <summary>
        /// 移动背景图片到住宅目录下
@@ -921,6 +951,34 @@
            room.Save();

            //更改自动备份

            HdlAutoBackupLogic.AddOrEditorFile(room.FileName);

            //递归：删除掉以前的旧数据导致的多个房间的问题
            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