From 1ecba3f7432912d4eb7637355f4dfae676059e00 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 17:23:58 +0800
Subject: [PATCH] 1

---
 HDL_ON/Entity/FunctionList.cs |  312 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 217 insertions(+), 95 deletions(-)

diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 23f7b2e..0cbae44 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using HDL_ON.DAL;
 using HDL_ON.DAL.Server;
+using Shared;
 
 namespace HDL_ON.Entity
 {
@@ -130,48 +131,51 @@
                         case SPK.LightRGB:
                         case SPK.LightRGBW:
                         case SPK.LightCCT:
-                            _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
+                            var light = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString);
+                            _FunctionList.lights.Add(light);
+                            deviceFunctionList.Add(light);
                             break;
                         case SPK.CurtainRoller:
                         case SPK.CurtainShades:
                         case SPK.CurtainSwitch:
                         case SPK.CurtainTrietex:
-                            _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
+                            var curtain = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString);
+                            _FunctionList.curtains.Add(curtain);
+                            deviceFunctionList.Add(curtain);
                             break;
                         case SPK.AcStandard:
-                            _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
+                            var ac = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString);
+                            _FunctionList.aCs.Add(ac);
+                            deviceFunctionList.Add(ac);
                             break;
                         case SPK.FloorHeatStandard:
-                            //鎭㈠鍦扮儹鏁版嵁
-                            _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
+                            var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString);
+                            _FunctionList.floorHeatings.Add(fh);
+                            deviceFunctionList.Add(fh);
                             break;
                         case SPK.SensorPm25:
                         case SPK.SensorCO2:
                         case SPK.SensorTVOC:
                         case SPK.SensorTemperature:
                         case SPK.SensorHumidity:
-                            //鎭㈠鐜鏁版嵁
-                            _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
+                            var sensor = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
+                            _FunctionList.sensorsEnvironmentalScience.Add(sensor);
+                            deviceFunctionList.Add(sensor);
                             break;
                         case SPK.ElectricSocket:
-                            //鎭㈠鎻掑骇鏁版嵁
-                            _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
+                            var ele = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString);
+                            _FunctionList.switchSockets.Add(ele);
+                            deviceFunctionList.Add(ele);
                             break;
                         case SPK.ElectricTV:
-                            //鎭㈠鐢佃鏁版嵁
-                            _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
+                            var tv = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString);
+                            _FunctionList.tVs.Add(tv);
+                            deviceFunctionList.Add(tv);
                             break;
                         case SPK.ElectricFan:
-                            //鎭㈠椋庢墖鏁版嵁
-                            _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
-                            deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
+                            var  fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
+                            _FunctionList.fans.Add(fan);
+                            deviceFunctionList.Add(fan);
                             break;
                     }
                 }
@@ -185,23 +189,10 @@
             }
         }
 
-
-        /// <summary>
-        /// 鑾峰彇鎵�鏈夊姛鑳藉垪琛�
-        /// </summary>
-        public List<Function> GetAllFunction()
-        {
-            var fs = new List<Function>();
-            fs.AddRange(GetAllDeviceFunctionList());
-            return fs;
-        }
-
-        //public void 
-
         /// <summary>
         /// 鑾峰彇璁惧鍔熻兘鍒楄〃
         /// </summary>
-        public List<Function> GetAllDeviceFunctionList()
+        public List<Function> GetDeviceFunctionList()
         {
             if (deviceFunctionList == null || deviceFunctionList.Count == 0)
             {
@@ -227,18 +218,19 @@
         /// <summary>
         /// 娓呯┖璁惧鍔熻兘鍒楄〃
         /// </summary>
-        public void ClearAllDeviceFunctionList()
+        public void Clear()
         {
-            aCs = new List<AC>();
-            lights = new List<Light>();
-            curtains = new List<Curtain>();
-            floorHeatings = new List<FloorHeating>();
-            tVs = new List<TV>();
-            switchSockets = new List<SwitchSocket>();
-            fans = new List<Fan>();
-            sensorsEnvironmentalScience = new List<Sensor>();
-            scenes = new List<Scene>();
-            deviceFunctionList = null;
+            _FunctionList.aCs = new List<AC>();
+            _FunctionList.lights = new List<Light>();
+            _FunctionList.curtains = new List<Curtain>();
+            _FunctionList.floorHeatings = new List<FloorHeating>();
+            _FunctionList.tVs = new List<TV>();
+            _FunctionList.switchSockets = new List<SwitchSocket>();
+            _FunctionList.fans = new List<Fan>();
+            _FunctionList.sensorsEnvironmentalScience = new List<Sensor>();
+            _FunctionList.scenes = new List<Scene>();
+            _FunctionList.deviceFunctionList = null;
+            _FunctionList = null;
         }
 
         /// <summary>
@@ -252,41 +244,41 @@
             {
                 case FunctionType.AC:
                     var sidObj =  Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.aCs.Add(sidObj);
+                    List.aCs.Add(sidObj);
                     sidObj.SaveFunctionData(false);
                     break;
                 case FunctionType.FloorHeating:
                     var sidObj1 =  Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);
+                    List.floorHeatings.Add(sidObj1);
                     sidObj1.SaveFunctionData(false);
                     break;
                 case FunctionType.Dimmer:
                 case FunctionType.RGB:
                 case FunctionType.Relay:
                     var sidObj2 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.lights.Add(sidObj2);
+                    List.lights.Add(sidObj2);
                     sidObj2.SaveFunctionData(false);
                     break;
                 case FunctionType.Curtain:
                 case FunctionType.RollingShutter:
                 case FunctionType.MotorCurtain:
                     var sidObj3 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.curtains.Add(sidObj3 );
+                    List.curtains.Add(sidObj3 );
                     sidObj3.SaveFunctionData(false);
                     break;
                 case FunctionType.TV:
                     var sidObj4 =  Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.tVs.Add(sidObj4);
+                    List.tVs.Add(sidObj4);
                     sidObj4.SaveFunctionData(false);
                     break;
                 case FunctionType.Socket:
                     var sidObj5 =  Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.switchSockets.Add(sidObj5);
+                    List.switchSockets.Add(sidObj5);
                     sidObj5.SaveFunctionData(false);
                     break;
                 case FunctionType.Fan:
                     var sidObj6 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.fans.Add(sidObj6);
+                    List.fans.Add(sidObj6);
                     sidObj6.SaveFunctionData(false);
                     break;
                 case FunctionType.CO2:
@@ -295,7 +287,7 @@
                 case FunctionType.Temp:
                 case FunctionType.Humidity:
                     var sidObj7 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
-                    DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
+                    List.sensorsEnvironmentalScience.Add(sidObj7);
                     sidObj7.SaveFunctionData(false);
                     break;
             }
@@ -390,22 +382,9 @@
                     var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
                     if (deviceList != null)
                     {
-                        foreach(var serverFunction in deviceList.list)
+                        for (int i =0;i < List.GetDeviceFunctionList().Count;)
                         {
-                            MainPage.Log($"deviceId:{serverFunction.deviceId}");
-                        }
-
-                        ////灏嗕笅杞藉埌鍒版暟鎹叏閮ㄤ繚瀛�
-                        //new Thread(() => {
-                        //    foreach (var temp in deviceList.list)
-                        //    {
-                        //        temp.SaveFunctionData();
-                        //    }
-                        //})
-                        //{ IsBackground = true }.Start();
-                        for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
-                        {
-                            var localFunction = List.GetAllDeviceFunctionList()[i];
+                            var localFunction = List.GetDeviceFunctionList()[i];
                             var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
                             if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
                             {
@@ -416,6 +395,7 @@
                                 i++;
                                 if (localFunction.modifyTime != newFunction.modifyTime)
                                 {
+                                    MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");
                                     localFunction.name = newFunction.name;
                                     localFunction.collect = newFunction.collect;
                                     localFunction.modifyTime = newFunction.modifyTime;
@@ -458,17 +438,14 @@
                     var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                     if (sceneList != null)
                     {
-                        ////灏嗕笅杞藉埌鍒版暟鎹叏閮ㄤ繚瀛�
-                        //new Thread(() => {
-                        //    foreach (var temp in sceneList)
-                        //    {
-                        //        temp.SaveSceneData();
-                        //    }
-                        //})
-                        //{ IsBackground = true }.Start();
-                        for(int i=0;i<List.scenes.Count;)
+                        for (int i=0;i<List.scenes.Count;)
                         {
                             var localScene = List.scenes[i];
+                            if (localScene == null)
+                            {
+                                List.scenes.Remove(localScene);
+                                continue;
+                            }
                             var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                             if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
                             {
@@ -505,21 +482,6 @@
         }
 
 
-        /// <summary>
-        /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夌紦瀛樺姛鑳芥暟鎹�
-        /// </summary>
-        public void DelAllFunctionData()
-        {
-            var filePathList = Common.FileUtlis.Files.ReadFiles();
-            foreach (var filePath in filePathList)
-            {
-                if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
-                {
-                    Common.FileUtlis.Files.DeleteFile(filePath);
-                }
-            }
-            _FunctionList = new FunctionList();
-        }
         /// <summary>
         /// 鍒犻櫎鍦烘櫙
         /// </summary>
@@ -621,7 +583,7 @@
                     if (DriverLayer.Control.Ins.IsRemote)
                     {
                         var functionIds = new List<string>();
-                        foreach (var function in GetAllDeviceFunctionList())
+                        foreach (var function in GetDeviceFunctionList())
                         {
                             functionIds.Add(function.deviceId);
                         }
@@ -629,7 +591,7 @@
                     }
                     else
                     {
-                        foreach (var function in GetAllDeviceFunctionList())
+                        foreach (var function in GetDeviceFunctionList())
                         {
                             switch (function.functionCategory)
                             {
@@ -657,6 +619,166 @@
             { IsBackground = true }.Start();
         }
 
+
+        #region 鍔熻兘鏂囨湰鐩稿叧
+        /// <summary>
+        /// 灞炴�у悕绉版樉绀烘枃鏈�
+        /// 涓嫳鏂囨樉绀�
+        /// </summary>
+        public string GetNameText(string key)
+        {
+            string text = "";
+            switch (key)
+            {
+                case FunctionAttributeKey.OnOff:
+                    text = Language.StringByID(StringId.OnOff);
+                    break;
+                case FunctionAttributeKey.Brightness:
+                    text = Language.StringByID(StringId.Brightness);
+                    break;
+                case FunctionAttributeKey.Color:
+                    text = Language.StringByID(StringId.ColorValue);
+                    break;
+                case FunctionAttributeKey.Mode:
+                    text = Language.StringByID(StringId.Mode);
+                    break;
+                case FunctionAttributeKey.FanSpeed:
+                    text = Language.StringByID(StringId.FanSpeed);
+                    break;
+                case FunctionAttributeKey.SetTemp:
+                    text = Language.StringByID(StringId.Temp);
+                    break;
+                case FunctionAttributeKey.IndoorTemp:
+                    text = Language.StringByID(StringId.IndoorTemp);
+                    break;
+                case FunctionAttributeKey.Delay:
+                    text = Language.StringByID(StringId.Delay);
+                    break;
+                case FunctionAttributeKey.CCT:
+                    text = "CCT";
+                    break;
+                case FunctionAttributeKey.Percent:
+                    text = Language.StringByID(StringId.PercentAdjustment);
+                    break;
+            }
+            return text;
+        }
+
+        /// <summary>
+        /// 灞炴�у�煎崟浣�
+        /// </summary>
+        public string GetUintString(string key)
+        {
+            var us = "";
+            switch (key)
+            {
+                case FunctionAttributeKey.SetTemp:
+                case FunctionAttributeKey.IndoorTemp:
+                    us = "掳C";
+                    break;
+                case FunctionAttributeKey.Percent:
+                case FunctionAttributeKey.Brightness:
+                    us = "%";
+                    break;
+            }
+            return us;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎸囧畾灞炴�х殑鏄剧ず鏂囨湰
+        /// 涓嫳鏂囨樉绀�
+        /// </summary>
+        public string GetValueText(string key, string value)
+        {
+            string text = "";
+            switch (key)
+            {
+                case FunctionAttributeKey.OnOff:
+                    text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
+                    break;
+                case FunctionAttributeKey.SetTemp:
+                case FunctionAttributeKey.IndoorTemp:
+                case FunctionAttributeKey.Brightness:
+                case FunctionAttributeKey.Percent:
+                    if (value == "")
+                    {
+                        value = "0";
+                    }
+                    text = value;
+                    break;
+                case FunctionAttributeKey.Mode:
+                    switch (value)
+                    {
+                        //----绌鸿皟
+                        case "auto":
+                            text = Language.StringByID(StringId.Auto);
+                            break;
+                        case "cool":
+                            text = Language.StringByID(StringId.Cool);
+                            break;
+                        case "heat":
+                            text = Language.StringByID(StringId.Heat);
+                            break;
+                        case "dry":
+                            text = Language.StringByID(StringId.Dry);
+                            break;
+                        case "fan":
+                            text = Language.StringByID(StringId.AirSupply);
+                            break;
+                        //-----鍦扮儹
+                        case "day":
+                            text = Language.StringByID(StringId.Day);
+                            break;
+                        case "night":
+                            text = Language.StringByID(StringId.Night);
+                            break;
+                        case "away":
+                            text = Language.StringByID(StringId.Away);
+                            break;
+                        case "normal":
+                            text = Language.StringByID(StringId.Normal);
+                            break;
+                        case "timer":
+                            text = Language.StringByID(StringId.Timer);
+                            break;
+                    }
+                    break;
+                case FunctionAttributeKey.FanSpeed:
+                    switch (value)
+                    {
+                        case "high":
+                            text = Language.StringByID(StringId.HighWindSpeed);
+                            break;
+                        case "medium":
+                            text = Language.StringByID(StringId.MiddleWindSpeed);
+                            break;
+                        case "low":
+                            text = Language.StringByID(StringId.LowWindSpeed);
+                            break;
+                        case "auto":
+                            text = Language.StringByID(StringId.Auto);
+                            break;
+                        default:
+                            text = "low";
+                            break;
+                    }
+                    break;
+                case "high":
+                    text = Language.StringByID(StringId.HighWindSpeed);
+                    break;
+                case "medium":
+                    text = Language.StringByID(StringId.MiddleWindSpeed);
+                    break;
+                case "low":
+                    text = Language.StringByID(StringId.LowWindSpeed);
+                    break;
+                case "auto":
+                    text = Language.StringByID(StringId.Auto);
+                    break;
+            }
+            return text;
+        }
+        #endregion
     }
 
 }

--
Gitblit v1.8.0