From 90fadf3023d54d780154eaa2a839e2106317297f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 05 七月 2021 13:38:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index cdb06f7..d185e19 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -85,7 +85,7 @@
/// </summary>
public void SceneMethod()
{
- var sceneList = LogicMethod.CurrLogicMethod.GetSceneList();
+ var sceneList = LogicMethod.GetSceneList();
List<string> nameList = new List<string>();
for (int i = 0; i < sceneList.Count; i++) {
var scene = sceneList[i];
@@ -101,7 +101,7 @@
//娌″暐浣滅敤锛屼负浜嗗彂閫佹暟鎹牸寮忕粺涓�;
outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene" }, { "value", "0" } } };
AddOutput(outputDevice);
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
@@ -168,11 +168,11 @@
return;
}
Output outputTime= new Output();
- outputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
+ outputTime.sid = LogicMethod.NewSid();
outputTime.target_type = "3";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", "delay");
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", timepoint);
+ LogicMethod.dictionary(dic, "key", "delay");
+ LogicMethod.dictionary(dic, "value", timepoint);
outputTime.status.Add(dic);
if (edit)
{
@@ -187,7 +187,7 @@
AddOutput(outputTime);
}
fLayout.RemoveFromParent();
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0