From f534d41c36d5895322bf691784a10435b64609fe Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 25 十二月 2020 13:52:00 +0800
Subject: [PATCH] 修复添加、删除楼层时候,界面刷新异常问题

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs |   95 ++++++++++++++++++++++++++++-------------------
 1 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 86ebc92..537504e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -4,7 +4,7 @@
 
 namespace HDL_ON.UI.UI2.Intelligence.Automation
 {
-    
+
     public class LogicMethod
     {
         /// <summary>
@@ -77,7 +77,7 @@
                 long m = (long)((dt - startTime).TotalMilliseconds / 10);
                 string sTimeSpan = byteArrayToHexString(int2ByteArray(getTimeStamp()));
 
-               
+
 
                 logicId = sOidBeginsWith + sTimeSpan;
 
@@ -92,10 +92,10 @@
                     string s = Logic.LogicList[i].sid.Substring(20, 4);
                     int iThisSceneId = Convert.ToInt16(s, 16);
                     if (iThisSceneId > maxId)
-                        maxId = iThisSceneId ;
+                        maxId = iThisSceneId;
                 }
 
-                logicId += (maxId+1).ToString("X4");//閫昏緫鍙� 涓や釜byte 
+                logicId += (maxId + 1).ToString("X4");//閫昏緫鍙� 涓や釜byte 
                 logicId += "0000";
             }
             catch
@@ -104,7 +104,6 @@
             }
             return logicId;
         }
-
         /// <summary>
         /// 灏佽Dictionary瀵硅薄
         /// </summary>
@@ -125,28 +124,33 @@
         /// 鑾峰彇缃戝叧鎴块棿鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<HDL_ON.Entity.Room> GetGatewayRoomList() 
+        public static List<HDL_ON.Entity.Room> GetGatewayRoomList()
         {
-            return HDL_ON.Entity.DB_ResidenceData.residenceData.Rooms;
+            return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;
         }
         /// <summary>
         /// 鑾峰彇缃戝叧鎴块棿鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name) 
+        public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name)
         {
-
             List<Entity.Room> roomList = new List<Entity.Room>();
             Entity.Room room1 = new Entity.Room();
-            room1.roomName = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
-            room1.uid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿
+            room1.roomName = name;//鑷畾涔夐粯璁や竴涓埧闂村悕涓�:6688
+            room1.roomId = "6688";//鑷畾涔夐粯璁d鐢ㄨ瘑鍒鎴块棿
             roomList.Add(room1);//榛樿娣诲姞鍒版埧闂村垪琛ㄩ噷
             var roomLists = GetGatewayRoomList();
-            foreach (var room in roomLists)
+            for (int i = 0; i < roomLists.Count; i++)
             {
+                var room = roomLists[i];
+                var devlist = GetRoomDevice(room);
+                if (devlist.Count == 0)
+                {
+                    //杩囨护鎺夋病鏈夎澶囩殑鎴块棿;
+                    continue;
+                }
                 roomList.Add(room);
             }
-
             return roomList;
         }
         /// <summary>
@@ -155,7 +159,7 @@
         /// <returns></returns>
         public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
         {
-            return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+            return Entity.FunctionList.List.GetDeviceFunctionList();
         }
         /// <summary>
         /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
@@ -163,7 +167,7 @@
         /// <returns></returns>
         public static List<HDL_ON.Entity.Scene> GetSceneList()
         {
-           return  HDL_ON.Entity.DB_ResidenceData.functionList.scenes;
+            return HDL_ON.Entity.FunctionList.List.scenes;
         }
         /// <summary>
         /// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
@@ -174,18 +178,24 @@
         {
             List<HDL_ON.Entity.Function> deviceLists = new List<Entity.Function>();
             List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList();
-            foreach (var dev in lists)
+            if (room.roomId == "6688")
             {
-                if (dev.roomIds.Find((id) => id == room.uid) != null)
+                //榛樿涓�涓埧闂村悕锛�6688
+                //鏄剧ず缃戝叧鍏ㄩ儴璁惧
+                deviceLists = lists;
+            }
+            else
+            {
+                for (int i = 0; i < lists.Count; i++)
                 {
-                    deviceLists.Add(dev);
-                }
-                if (room.uid == "鍏ㄩ儴鍖哄煙")
-                {
-                    //鎴块棿鍚嶄负鍏ㄩ儴鍖哄煙鏃讹紝鏄剧ず缃戝叧鍏ㄩ儴璁惧
-                    deviceLists = lists;
-                }
+                    var dev = lists[i];
+                    if (dev.roomIds.Find((id) => id == room.roomId) != null)
+                    {
+                        //娣诲姞灞炰簬杩欎釜鎴块棿鐨勮澶�;
+                        deviceLists.Add(dev);
+                    }
 
+                }
             }
             return deviceLists;
         }
@@ -196,10 +206,11 @@
         /// <returns></returns>
         public static HDL_ON.Entity.Function GetDevice(string sid)
         {
-            HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown"};
+            HDL_ON.Entity.Function device = new Entity.Function() { name = "Unknown" };
             List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList();
-            foreach (var dev in deviceLists)
+            for (int i = 0; i < deviceLists.Count; i++)
             {
+                var dev = deviceLists[i];
                 if (dev.sid == sid)
                 {
                     device = dev;
@@ -216,10 +227,11 @@
         /// <returns></returns>
         public static HDL_ON.Entity.Scene GetSecne(string sid)
         {
-            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown"};
+            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown" };
             List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
-            foreach (var sce in sceneLists)
+            for (int i = 0; i < sceneLists.Count; i++)
             {
+                var sce = sceneLists[i];
                 if (sce.sid == sid)
                 {
                     scene = sce;
@@ -237,10 +249,10 @@
         {
             string roomName = "";
             List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomList();
-
-            foreach (var dev in device.roomIds)
+            for (int i = 0; i < device.roomIds.Count; i++)
             {
-                var room = roomLists.Find((c) => c.uid == dev);
+                var dev = device.roomIds[i];
+                var room = roomLists.Find((c) => c.roomId == dev);
                 if (room != null)
                 {
                     roomName += room.floorName + "." + room.roomName + ",";
@@ -294,17 +306,17 @@
         /// </summary>
         /// <param name="deviceList">璁惧鍒楄〃</param>
         /// <returns></returns>
-        public static List<string> GetDeviceTypeList(List<HDL_ON.Entity.Function> deviceList) 
+        public static List<string> GetDeviceTypeList(List<HDL_ON.Entity.Function> deviceList)
         {
-            List<string> deviceStrTypeList = new List<string>(); 
+            List<string> deviceStrTypeList = new List<string>();
             deviceStrTypeList.Clear();
-            var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.ColorTemperature || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW);
+            var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer || device.functionType == FunctionType.ColorTemperature || device.functionType == FunctionType.RGB || device.functionType == FunctionType.RGBW);
             if (lightjosn != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
             }
 
-            var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.MotorCurtain|| device.functionType == FunctionType.RollingShutter);
+            var curtainjosn = deviceList.Find((device) => device.functionType == FunctionType.Curtain || device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter);
             if (curtainjosn != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
@@ -360,11 +372,13 @@
         /// 鏉′欢/鐩爣鏀寔璁惧
         /// </summary>
         /// <returns></returns>
-        public static List<FunctionType> GetSupportEquipment(string if_type)  
+        public static List<FunctionType> GetSupportEquipment(string if_type)
         {
             List<FunctionType> deviceTypeList = new List<FunctionType>();
-            switch (if_type) {
-                case condition_if: {
+            switch (if_type)
+            {
+                case condition_if:
+                    {
                         deviceTypeList.Add(FunctionType.Relay);
                         deviceTypeList.Add(FunctionType.RGB);
                         deviceTypeList.Add(FunctionType.RGBW);
@@ -403,14 +417,17 @@
         public static List<Entity.Function> GetShowDeviceList(List<FunctionType> functionType, List<HDL_ON.Entity.Function> deviceList)
         {
             List<HDL_ON.Entity.Function> devList = new List<Entity.Function>();
-            foreach (var dev in deviceList)
+            for (int i = 0; i < deviceList.Count; i++)
             {
+                var dev = deviceList[i];
                 if (functionType.Contains(dev.functionType))
                 {
                     ///杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧
                     devList.Add(dev);
                 }
+
             }
+
             return devList;
         }
         /// <summary>

--
Gitblit v1.8.0