From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112

---
 HDL_ON/Entity/DB_ResidenceData.cs |  650 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 587 insertions(+), 63 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 7b0c7cb..3fc2293 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -1,6 +1,8 @@
 锘縰sing System;
 using System.Collections.Generic;
 using HDL_ON.DAL;
+using HDL_ON.DAL.Net;
+using Shared;
 
 namespace HDL_ON.Entity
 {
@@ -11,12 +13,10 @@
         }
 
         /// <summary>
-        /// 0:A鍗忚缃戝叧
-        /// 1:bus缃戝叧
-        /// 2:knx缃戝叧
+        /// 0:bus缃戝叧
+        /// 1:A鍗忚缃戝叧
         /// </summary>
-        public int GatewayType = 0;
-
+        public int GatewayType = 1;
         /// <summary>
         /// 浣忓畢鍩虹淇℃伅
         /// </summary>
@@ -24,40 +24,30 @@
         {
             get
             {
-                if (MainPage.LocalMode)
+                if (MainPage.NoLoginMode)
                 {
                     return new RegionInfoRes() { Name = "鏈湴妯″紡" };
                 }
                 else
                 {
-                    return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+                    var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
+                    //if (curRegion == null)
+                    //{
+                    //    CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+                    //    return MainPage.LoginUser.regionList[0];
+                    //}
+                    return curRegion;
                 }
             }
         }
-
         /// <summary>
         /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
         /// </summary>
         public string CurReginID = "";
-
         /// <summary>
         /// 妤煎眰鍒楄〃
         /// </summary>
         public List<Floor> floors = new List<Floor>();
-
-        /// <summary>
-        /// 鎴块棿鍒楄〃
-        /// </summary>
-        public List<Room> rooms = new List<Room>();
-        /// <summary>
-        /// 鍔熻兘鍒楄〃
-        /// </summary>
-        public FunctionList functionList = new FunctionList();
-        /// <summary>
-        /// 鍔熻兘oid鍒楄〃
-        /// </summary>
-        public List<FunctionOid> functionOidList = new List<FunctionOid>();
-
         /// <summary>
         /// 鍔熻兘绫诲瀷鍒楄〃
         /// </summary>
@@ -73,8 +63,9 @@
                     try
                     {
                         var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
-                        var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
+                        var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
                         DB_ResidenceData temp = null;
+
                         if (!string.IsNullOrEmpty(userConfigString))
                         {
                             temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
@@ -98,7 +89,298 @@
                                     ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                     ShowFunction.Sensor,ShowFunction.VideoIntercom
                                 });
+                            instance.SaveResidenceData();
                         }
+
+                        new Light()
+                        {
+                            sid = "030101123456780202010005ABCD",
+                            name = "鐏厜1",
+                            function = new List<Trait>() {
+                                        new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
+                                        },
+                            roomIdList = new List<string>() { "0001" },
+                            bus_Data = new BusData
+                            {
+                                SubnetID = 42,
+                                DeviceID = 6,
+                                LoopID = 1,
+                            },
+                        }.SaveFunctionData();
+
+
+
+
+#if DEBUG11
+                        if (rooms.Count == 0 )
+                        {
+                            //--------------------
+                            var r111 = new Room() { sid = "0001", name = "瀹㈠巺", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
+                            rooms.Add(r111);
+                            instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
+                            r111.SaveRoomData();
+                            new AC()
+                            {
+                                sid = "030101123456780604010001ABCD",
+                                name = "绌鸿皟",
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
+                                                                new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
+                                                                new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
+                                                            },
+                                roomIdList = new List<string>() { "0001" },
+                                lastState = "鍒跺喎 涓 18掳C",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 8,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Light()
+                            {
+                                sid = "030101123456780202020002ABCD",
+                                name = "璋冨厜鐏�",
+                                function = new List<Trait>() {
+                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
+                                                            },//"brightness",
+                                roomIdList = new List<string>() { "0001" },
+                                lastState = "20%",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 9,
+                                    LoopID = 1,
+                                },
+
+                            }.SaveFunctionData();
+                            new Curtain()
+                            {
+                                sid = "030101123456780303010003ABCD",
+                                name = "绐楀笜",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
+                                                            },// "curtain",
+                                lastState = "寮�",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 7,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Curtain()
+                            {
+                                sid = "030101123456780303030011ABCD",
+                                name = "寮�鍚堝笜",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
+                                                            },//"curtaintype",
+                                lastState = "20%",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 7,
+                                    LoopID = 11,
+                                },
+                            }.SaveFunctionData();
+                            new Curtain()
+                            {
+                                sid = "030101123456780503040012ABCD",
+                                name = "鍗峰笜",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
+                                                                new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
+
+                                                            },// "rollingshutter",
+                                lastState = "20%",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 17,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new FloorHeating()
+                            {
+                                sid = "030101123456780404020004ABCD",
+                                name = "鍦扮儹",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
+                                                                new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
+                                                            },//
+                                lastState = "鑷姩 25掳C",
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 12,
+                                    LoopID = 1
+                                }
+                            }.SaveFunctionData();
+                            new Light()
+                            {
+                                sid = "030101123456780202010005ABCD",
+                                name = "鍚婄伅",
+                                function = new List<Trait>() {
+                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
+                                                            },//"on_off",
+                                roomIdList = new List<string>() { "0001" },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 6,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Light()
+                            {
+                                sid = "030101123456780202040006ABCD",
+                                name = "RGB鐏�",
+                                function = new List<Trait>() {
+                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
+                                                                new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
+                                                            },//"brightness,color",
+                                roomIdList = new List<string>() { "0001" },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 4,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Fan()
+                            {
+                                sid = "030101123456781010020006ABCD",
+                                name = "椋庢墖",
+                                function = new List<Trait>() {
+                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+                                                            new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
+                                                        },//"brightness,color",
+                                roomIdList = new List<string>() { "0001" },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 142,
+                                    DeviceID = 4,
+                                    LoopID = 11,
+                                },
+                            }.SaveFunctionData();
+                            new TV()
+                            {
+                                sid = "030101123456781010020006ABCD",
+                                name = "鐢佃",
+                                function = new List<Trait>() {
+                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+                                                        },
+                                roomIdList = new List<string>() { "0001" },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 142,
+                                    DeviceID = 4,
+                                    LoopID = 111,
+                                },
+                            }.SaveFunctionData();
+                            new SwitchSocket()
+                            {
+                                sid = "030101123456780101020006ABCD",
+                                name = "鎻掑骇",
+                                function = new List<Trait>() {
+                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
+                                                        },
+                                roomIdList = new List<string>() { "0001" },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 42,
+                                    DeviceID = 6,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Sensor()
+                            {
+                                sid = "030101123456781005060006ABCD",
+                                name = "PM2.5",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
+                                                        },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 15,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Sensor()
+                            {
+                                sid = "030101123456781005070006ABCD",
+                                name = "CO2",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
+                                                        },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 15,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Sensor()
+                            {
+                                sid = "030101123456781005020006ABCD",
+                                name = "娓╁害",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
+                                                        },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 15,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Sensor()
+                            {
+                                sid = "030101123456781005050006ABCD",
+                                name = "TVOC",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
+                                                        },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 15,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            new Sensor()
+                            {
+                                sid = "030101123456781005030006ABCD",
+                                name = "婀垮害",
+                                roomIdList = new List<string>() { "0001" },
+                                function = new List<Trait>() {
+                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
+                                                        },
+                                bus_Data = new BusData
+                                {
+                                    SubnetID = 111,
+                                    DeviceID = 15,
+                                    LoopID = 1,
+                                },
+                            }.SaveFunctionData();
+                            instance.SaveResidenceData();
+                        }
+#endif
+
+
+
 
                     }
                     catch (Exception ex)
@@ -119,6 +401,13 @@
         public void EixtAccount()
         {
             instance = null;
+            ins_Room = null;
+            ins_OidList = null;
+            ins_Function = null;
+            if (MainPage.IsRemote)
+            {
+                Mqtt_Cloud.DisConnectRemoteMqttClient("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+            }
         }
 
         /// <summary>
@@ -126,23 +415,237 @@
         /// </summary>
         public string residenceImage;
         /// <summary>
-        /// 浣忓畢鏁版嵁鏄惁瀛樺湪鍙樺寲
-        /// </summary>
-        bool hasChange = false;
-        /// <summary>
         /// 褰撳墠浣忓畢鐨勭綉鍏矼AC
         /// </summary>
-        public string residenceGatewayMAC = "4E47323347591243";
+        public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";
         /// <summary>
         /// 淇濆瓨浣忓畢鏁版嵁
         /// </summary>
         public void SaveResidenceData()
         {
-            if (this == null|| this.residecenInfo==null)
+            if (this == null || this.residecenInfo == null)
                 return;
-            var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
             FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
             MainPage.Log("Save DB_ResidenceData");
+        }
+
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+        /// </summary>
+        public string CurFoor = Language.StringByID(StringId.All);
+
+        #region 鎴块棿鏁版嵁鐩稿叧
+        /// <summary>
+        /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
+        /// </summary>
+        public static void InitRoomFunction()
+        {
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
+                    foreach (var r in rooms)
+                    {
+                        r.GetRoomFunctions(true);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"Init room function error : {ex.Message}");
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
+        static List<Room> ins_Room;
+        public static List<Room> rooms
+        {
+            get
+            {
+                if (ins_Room == null)
+                {
+                    try
+                    {
+                        ins_Room = new List<Room> { };
+                        var filePathList = FileUtils.ReadFiles();
+
+                        foreach (var filePath in filePathList)
+                        {
+                            if (filePath.StartsWith("RoomData_"))
+                            {
+                                var roomDataBytes = FileUtils.ReadFile(filePath);
+                                var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
+                                var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
+                                if (room != null)
+                                {
+                                    ins_Room.Add(room);
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+                    }
+                }
+                return ins_Room;
+            }
+        }
+        /// <summary>
+        /// 鍒犻櫎鎴块棿
+        /// </summary>
+        /// <param name="delRoom"></param>
+        public static void DelRoom(Room delRoom)
+        {
+            var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
+            if (tRoom != null)
+            {
+                FileUtils.DeleteFile(delRoom.roomSavePath);
+                rooms.Remove(tRoom);
+            }
+        }
+        #endregion
+
+        #region 鍔熻兘鏁版嵁
+        static FunctionList ins_Function;
+        public static FunctionList functionList
+        {
+            get
+            {
+                if (ins_Function == null)
+                {
+                    try
+                    {
+                        ins_Function = new FunctionList { };
+                        #region 鎭㈠鏁版嵁
+                        var filePathList = FileUtils.ReadFiles();
+
+                        List<Function> fs = new List<Function>();
+
+                        foreach (var filePath in filePathList)
+                        {
+                            if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
+                            {
+                                //var filePath = fp.Remove(0, 13);
+                                var _functionTypeString = filePath.Substring(16 + 13, 4);
+                                var ft = (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
+
+                                switch (ft)
+                                {
+                                    case FunctionType.AC:
+                                        //鎭㈠绌鸿皟鏁版嵁
+                                        var acDataBytes = FileUtils.ReadFile(filePath);
+                                        var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
+                                        ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
+                                        break;
+                                    case FunctionType.Relay:
+                                    case FunctionType.Dimmer:
+                                    case FunctionType.RGB:
+                                        //鎭㈠鐏厜鏁版嵁
+                                        var lightsDataBytes = FileUtils.ReadFile(filePath);
+                                        var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);
+                                        ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
+                                        break;
+                                    case FunctionType.Curtain:
+                                    case FunctionType.MotorCurtain:
+                                    case FunctionType.RollingShutter:
+                                        //鎭㈠绐楀笜鏁版嵁
+                                        var curtainsDataBytes = FileUtils.ReadFile(filePath);
+                                        var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);
+                                        ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
+                                        break;
+                                    case FunctionType.FloorHeating:
+                                        //鎭㈠鍦扮儹鏁版嵁
+                                        var fhDataBytes = FileUtils.ReadFile(filePath);
+                                        var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
+                                        ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
+                                        break;
+                                    case FunctionType.PM25:
+                                    case FunctionType.CO2:
+                                    case FunctionType.TVOC:
+                                    case FunctionType.Temp:
+                                    case FunctionType.Humidity:
+                                        //鎭㈠鐜鏁版嵁
+                                        var sesDataBytes = FileUtils.ReadFile(filePath);
+                                        var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);
+                                        ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
+                                        break;
+                                    case FunctionType.Socket:
+                                        //鎭㈠鎻掑骇鏁版嵁
+                                        var eleDataBytes = FileUtils.ReadFile(filePath);
+                                        var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);
+                                        ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
+                                        break;
+                                    case FunctionType.TV:
+                                        //鎭㈠鐢佃鏁版嵁
+                                        var eleDataBytes1 = FileUtils.ReadFile(filePath);
+                                        var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);
+                                        ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
+                                        break;
+                                    case FunctionType.Fan:
+                                        //鎭㈠椋庢墖鏁版嵁
+                                        var eleDataBytes2 = FileUtils.ReadFile(filePath);
+                                        var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);
+                                        ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
+                                        break;
+                                    case FunctionType.Scene:
+                                        //鎭㈠鍦烘櫙鏁版嵁
+                                        var scenesDataBytes = FileUtils.ReadFile(filePath);
+                                        var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);
+                                        ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
+                                        break;
+
+                                }
+                            }
+                        }
+                        #endregion
+                    }
+                    catch (Exception ex)
+                    {
+                        MainPage.Log($"鍔熻兘鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
+                    }
+
+                }
+                return ins_Function;
+            }
+        }
+        /// <summary>
+        /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夊姛鑳芥暟鎹�
+        /// </summary>
+        public static void DelAllFunctionData()
+        {
+            var filePathList = FileUtils.ReadFiles();
+            foreach (var filePath in filePathList)
+            {
+                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
+                {
+                    FileUtils.DeleteFile(filePath);
+                }
+            }
+            ins_Function = new FunctionList();
+            ins_Function.aCs = new List<AC>();
+            ins_Function.lights = new List<Light>();
+            ins_Function.curtains = new List<Curtain>();
+            ins_Function.floorHeatings = new List<FloorHeating>();
+            ins_Function.sensorsEnvironmentalScience = new List<Sensor>();
+            ins_Function.switchSockets = new List<SwitchSocket>();
+            ins_Function.tVs = new List<TV>();
+            ins_Function.fans = new List<Fan>();
+            ins_Function.scenes = new List<Scene>();
+        }
+        /// <summary>
+        /// 鍒犻櫎鍔熻兘
+        /// </summary>
+        public static void DelSceneFunction(string fSid)
+        {
+            var f = functionList.scenes.Find((obj) => obj.sid == fSid);
+            if (f != null)
+            {
+                FileUtils.DeleteFile(f.savePath);
+                functionList.scenes.Remove(f);
+            }
         }
 
         /// <summary>
@@ -154,21 +657,21 @@
             {
                 try
                 {
-                    foreach (var function in functionList.functions)
+                    foreach (var function in functionList.GetAllDeviceFunctionList())
                     {
                         System.Threading.Thread.Sleep(100);
-                        //if (function.bus_Data != null)
+                        switch (function.functionCategory)
                         {
-                            switch (function.functionCategory)
-                            {
-                                case FunctionCategory.Light:
-                                case FunctionCategory.Electrical:
-                                case FunctionCategory.SwitchDevice:
-                                case FunctionCategory.Curtain:
-                                case FunctionCategory.Thermostat:
-                                    Control.SendReadCommand(function);
-                                    break;
-                            }
+                            case FunctionCategory.Light:
+                            case FunctionCategory.Electrical:
+                            case FunctionCategory.SwitchDevice:
+                            case FunctionCategory.Curtain:
+                            case FunctionCategory.Thermostat:
+                                if (DB_ResidenceData.residenceData.GatewayType == 0)
+                                {
+                                    DriverLayer.Control.ins.SendReadCommand(function);
+                                }
+                                break;
                         }
                     }
                 }
@@ -180,36 +683,57 @@
             { IsBackground = true }.Start();
         }
 
-        /// <summary>
-        /// 鍒濆鍖栨瘡涓埧闂寸殑鍔熻兘鏁版嵁
-        /// </summary>
-        public static void InitRoomFunction()
+
+        #endregion
+
+        #region oid鍒楄〃 a鍗忚杞琤us鍗忚鎺у埗浣跨敤
+        static List<FunctionOid> ins_OidList;
+        public static List<FunctionOid> functionOidList
         {
-            new System.Threading.Thread(() =>
+            get
             {
-                try
+                if (ins_OidList == null)
                 {
-                    //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
-                    instance.functionList.GetAllFunction();
-                    //鍒濆鍖栦綇瀹呮墍鏈夋埧闂村姛鑳芥暟鎹�
-                    foreach (var r in instance.rooms)
+                    var bytes = FileUtils.ReadFile("AProtocolData_FunctionOid");
+                    if (bytes == null || bytes.Length == 0)
                     {
-                        r.functions.Clear();
-                        foreach (var func in instance.functionList.functions)
+                        ins_OidList = new List<FunctionOid>();
+                    }
+                    else
+                    {
+                        var jsonString = System.Text.Encoding.UTF8.GetString(bytes);
+                        if (string.IsNullOrEmpty(jsonString))
                         {
-                            MainPage.Log($"init room function sid {func.functionCategory.ToString()}:{r.sid}");
-                            if (func.roomIdList.Contains(r.sid))
+                            ins_OidList = new List<FunctionOid>();
+                        }
+                        else
+                        {
+                            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(jsonString);
+                            if (list == null)
                             {
-                                r.functions.Add(func);
+                                ins_OidList = new List<FunctionOid>();
+                            }
+                            else
+                            {
+                                ins_OidList = list;
                             }
                         }
                     }
-                }catch(Exception ex)
-                {
-                    MainPage.Log($"Init room function error : {ex.Message}");
                 }
-            })
-            { IsBackground = true }.Start();
+                return ins_OidList;
+            }
         }
+        /// <summary>
+        /// 淇濆瓨oid鏁版嵁锛屾瘡娆′繚瀛橀兘浼氳鐩�
+        /// </summary>
+        public static void SaveFunctionOidJsonDataList(string oidJsonString)
+        {
+            oidJsonString = oidJsonString.Replace("add", "get_list_response");
+            var oidBytes = System.Text.Encoding.UTF8.GetBytes(oidJsonString);
+
+            FileUtils.WriteFileByBytes("AProtocolData_FunctionOid", oidBytes);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0