From 6b6a65cc86b668b57a84d6d8a7bec4c43ddcc0f5 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 十二月 2020 20:35:02 +0800
Subject: [PATCH] 2020-12-02-4

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs |   72 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 3a0bfcb..5a1b895 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -16,7 +16,7 @@
         /// </summary>
         public const string target_if = "鐩爣";
         /// <summary>
-        /// 绉婚櫎鎵�鏈夌晫闈�
+        /// 绉婚櫎鎵�鏈�"Logic"鐣岄潰
         /// </summary>
         public static void RemoveAllView()
         {
@@ -93,7 +93,7 @@
         /// 鑾峰彇缃戝叧鎴块棿鍒楄〃
         /// </summary>
         /// <returns></returns>
-        public static List<HDL_ON.Entity.Room> GetGatewayRoomListG()
+        public static List<HDL_ON.Entity.Room> GetGatewayRoomList() 
         {
             return HDL_ON.Entity.DB_ResidenceData.rooms;
         }
@@ -109,7 +109,7 @@
             room1.name = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
             room1.sid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿
             roomList.Add(room1);//榛樿娣诲姞鍒版埧闂村垪琛ㄩ噷
-            var roomLists = GetGatewayRoomListG();
+            var roomLists = GetGatewayRoomList();
             foreach (var room in roomLists)
             {
                 roomList.Add(room);
@@ -123,8 +123,40 @@
         /// <returns></returns>
         public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
         {
-
-            return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+            List<HDL_ON.Entity.Function> list = new List<Entity.Function>();
+            for (int i=0;i<3;i++) {
+                HDL_ON.Entity.Function function = new Entity.Function();
+                switch (i) {
+                    case 0: {
+                            function.sid = "1234560001212121020182";
+                            function.name ="鐏厜";
+                            list.Add(function);
+                        }
+                        break;
+                    case 1: {
+                          
+                            function.sid = "1234560001212121030182";
+                            function.name = "绐楀笜";
+                            list.Add(function);
+                        } break;
+                    case 2: {
+                            function.sid = "1234560001212121040182";
+                            function.name = "绌鸿皟";
+                            list.Add(function);
+                        } break;
+                     
+                }
+            }
+            return list;
+            //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+        }
+        /// <summary>
+        /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<HDL_ON.Entity.Scene> GetSceneList()
+        {
+           return  HDL_ON.Entity.DB_ResidenceData.functionList.scenes;
         }
         /// <summary>
         /// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
@@ -137,7 +169,7 @@
             List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList();
             foreach (var dev in lists)
             {
-                if (dev.roomIdList.Find((id) => id == room.sid) != null)
+                if (dev.roomIds.Find((id) => id == room.sid) != null)
                 {
                     deviceLists.Add(dev);
                 }
@@ -169,6 +201,26 @@
             }
             return device;
         }
+
+        /// <summary>
+        /// 鑾峰彇褰撲釜鍦烘櫙
+        /// </summary>
+        /// <param name="sid">鍦烘櫙鍞竴鏍囪瘑</param>
+        /// <returns></returns>
+        public static HDL_ON.Entity.Scene GetSecne(string sid)
+        {
+            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" };
+            List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
+            foreach (var sce in sceneLists)
+            {
+                if (sce.sid == sid)
+                {
+                    scene = sce;
+                    break;
+                }
+            }
+            return scene;
+        }
         /// <summary>
         /// 鑾峰彇鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
         /// </summary>
@@ -177,9 +229,9 @@
         public static string GetGetRoomName(HDL_ON.Entity.Function device)
         {
             string roomName = "";
-            List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomListG();
+            List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomList();
 
-            foreach (var dev in device.roomIdList)
+            foreach (var dev in device.roomIds)
             {
                 var room = roomLists.Find((c) => c.sid == dev);
                 if (room != null)
@@ -268,11 +320,15 @@
             switch (if_type) {
                 case condition_if: {
                         deviceTypeList.Add(FunctionType.Relay);
+                        deviceTypeList.Add(FunctionType.Curtain);
+                        deviceTypeList.Add(FunctionType.AC);
                     }
                     break;
                 case target_if:
                     {
                         deviceTypeList.Add(FunctionType.Relay);
+                        deviceTypeList.Add(FunctionType.Curtain);
+                        deviceTypeList.Add(FunctionType.AC);
                     }
                     break;
             }

--
Gitblit v1.8.0