Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Common/Room.cs

@@ -98,6 +98,7 @@
            {

                if (m_CurrentRoom == null && Lists.Count > 0)

                {

                    if (m_CurrentRoom == null) { m_CurrentRoom = Lists[0]; }

                    return Lists[0];

                }

                return m_CurrentRoom;

@@ -366,7 +367,6 @@
        /// </summary>
        public static void RefreshAllRoomByLocation()

        {

            Lists.Clear();

            var homeTemp = Config.Instance.Home;

            homeTemp.RoomFilePathList.Clear();



@@ -377,7 +377,7 @@
            if (listFile.Contains(fRoom) == true)

            {

                listFile.Remove(fRoom);

                homeTemp.AddRoomListFilePath(fRoom);

                homeTemp.RoomFilePathList.Add(fRoom);

            }



            var listRoomFile = new List<string>();

@@ -385,7 +385,7 @@
            {

                if (fileName.StartsWith("Room_"))

                {

                    homeTemp.AddRoomListFilePath(fileName);

                    homeTemp.RoomFilePathList.Add(fileName);

                    listRoomFile.Add(fileName);

                }

            }

@@ -736,7 +736,7 @@
                System.Console.WriteLine(ex.Message);
                return null;
            }
            

        }
        /// <summary>
        /// 获取当前楼层的房间名称
@@ -940,8 +940,6 @@
                //保存到本地
                Save();

                //添加自动备份
                HdlAutoBackupLogic.AddOrEditorFile(FileName);
                if (saveRealRoom == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)

                {

                    //如果只有一个回路,则修改真实物理设备的房间

@@ -1419,7 +1417,7 @@
            SceneUIList.Remove(sceneUI);
            SceneUIFilePathList.Remove(sceneUI.FileName);
            Save();
            

            Global.DeleteFilebyHomeId(sceneUI.FileName);
            HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
        }