From 31e484e5d3e42e825e43ef9d1707c1adc02a4e1c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十二月 2020 19:57:34 +0800
Subject: [PATCH] 完成 dali 的 UI
---
HDL_ON/Entity/FunctionList.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
old mode 100644
new mode 100755
index 7026912..0be3c7f
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -407,7 +407,7 @@
localFunction.collect = newFunction.collect;
localFunction.modifyTime = newFunction.modifyTime;
localFunction.roomIds = newFunction.roomIds;
- localFunction.bus_Data = newFunction.bus_Data;
+ localFunction.bus = newFunction.bus;
localFunction.SaveFunctionData(false);
}
deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
@@ -626,7 +626,26 @@
})
{ IsBackground = true }.Start();
}
-
+ #region 鍦烘櫙鐩稿叧
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
+ public Scene AddScene(Scene scene,out string result)
+ {
+ Scene tempScene = null;
+ var pm = new HttpServerRequest();
+ var revPack = pm.AddScene(scene);
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
+ tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
+ Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ }
+ result = revPack.Code;
+ return tempScene;
+ }
+ #endregion
#region 鍔熻兘鏂囨湰鐩稿叧
/// <summary>
--
Gitblit v1.8.0