From b012a9acbe4f8c78a26973d67232cc2856380d71 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 11:06:31 +0800
Subject: [PATCH] 20201224-1

---
 HDL_ON/Entity/FunctionList.cs |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 7adfaaf..7415c31 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -254,41 +254,41 @@
                 case FunctionType.AC:
                     var sidObj =  Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.aCs.Add(sidObj);
-                    sidObj.SaveFunctionData(false);
+                    sidObj.SaveFunctionFile();
                     break;
                 case FunctionType.FloorHeating:
                     var sidObj1 =  Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.floorHeatings.Add(sidObj1);
-                    sidObj1.SaveFunctionData(false);
+                    sidObj1.SaveFunctionFile();
                     break;
                 case FunctionType.Dimmer:
                 case FunctionType.RGB:
                 case FunctionType.Relay:
                     var sidObj2 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.lights.Add(sidObj2);
-                    sidObj2.SaveFunctionData(false);
+                    sidObj2.SaveFunctionFile();
                     break;
                 case FunctionType.Curtain:
                 case FunctionType.RollingShutter:
                 case FunctionType.MotorCurtain:
                     var sidObj3 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.curtains.Add(sidObj3 );
-                    sidObj3.SaveFunctionData(false);
+                    sidObj3.SaveFunctionFile();
                     break;
                 case FunctionType.TV:
                     var sidObj4 =  Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.tVs.Add(sidObj4);
-                    sidObj4.SaveFunctionData(false);
+                    sidObj4.SaveFunctionFile();
                     break;
                 case FunctionType.Socket:
                     var sidObj5 =  Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.switchSockets.Add(sidObj5);
-                    sidObj5.SaveFunctionData(false);
+                    sidObj5.SaveFunctionFile();
                     break;
                 case FunctionType.Fan:
                     var sidObj6 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.fans.Add(sidObj6);
-                    sidObj6.SaveFunctionData(false);
+                    sidObj6.SaveFunctionFile();
                     break;
                 case FunctionType.CO2:
                 case FunctionType.TVOC:
@@ -297,7 +297,7 @@
                 case FunctionType.Humidity:
                     var sidObj7 =  Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
                     List.sensorsEnvironmentalScience.Add(sidObj7);
-                    sidObj7.SaveFunctionData(false);
+                    sidObj7.SaveFunctionFile();
                     break;
             }
         }
@@ -417,7 +417,7 @@
                                         localFunction.modifyTime = newFunction.modifyTime;
                                         localFunction.roomIds = newFunction.roomIds;
                                         localFunction.bus = newFunction.bus;
-                                        localFunction.SaveFunctionData(false);
+                                        localFunction.SaveFunctionFile();
                                     }
                                     deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
                                 }
@@ -426,7 +426,7 @@
                         //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
                         foreach (var newFunction in deviceList.list)
                         {
-                            newFunction.SaveFunctionData(false);
+                            newFunction.SaveFunctionFile();
                             List.IniFunctionList(newFunction.savePath);
                         }
                     }
@@ -477,7 +477,7 @@
                                     localScene.collect = newScene.collect;
                                     localScene.modifyTime = newScene.modifyTime;
                                     localScene.roomIds = newScene.roomIds;
-                                    localScene.SaveSceneData(false);
+                                    localScene.SaveSceneFile();
                                 }
                                 sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
                             }
@@ -485,7 +485,7 @@
                         //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
                         foreach (var newScene in sceneList)
                         {
-                            newScene.SaveSceneData(false);
+                            newScene.SaveSceneFile();
                             List.scenes.Add(newScene);
                         }
                     }
@@ -499,8 +499,10 @@
         }
 
 
+
         /// <summary>
         /// 鍒犻櫎鍦烘櫙
+        /// todo
         /// </summary>
         public void DeleteScene(Scene scene,bool upSevser)
         {
@@ -510,22 +512,22 @@
                 var packCode = pm.DeleteScene(scene.userSceneId);
                 if (packCode == StateCode.SUCCESS)
                 {
-                    Common.FileUtlis.Files.DeleteFile(scene.savePath);
+                    FileUtlis.Files.DeleteFile(scene.savePath);
                     List.scenes.Remove(scene);
                 }
                 else
                 {
-                    Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode);
+                    IMessageCommon.Current.ShowErrorInfoAlter(packCode);
                 }
             }
             else
             {
-                Common.FileUtlis.Files.DeleteFile(scene.savePath);
+                FileUtlis.Files.DeleteFile(scene.savePath);
                 List.scenes.Remove(scene);
             }
         }
         /// <summary>
-        /// 鍒犻櫎鏈湴鍔熻兘鏂囦欢
+        /// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠�
         /// </summary>
         public void DeleteFunction(Function delTemp)
         {

--
Gitblit v1.8.0