From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index b8f1cc4..fca082a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -47,7 +47,7 @@
delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
delayView.btnText.TextID = StringId.delayLogic;
delayView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
- viewLayout.AddChidren(delayView.FLayoutView());
+ //viewLayout.AddChidren(delayView.FLayoutView());
#endregion
#region 鎵�鏈夌偣鍑讳簨浠�
@@ -105,11 +105,15 @@
};
dateView.frameLayout.AddChidren(verticalRefresh);
-
//瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鐘舵��
Button buttonClick = new Button();
HDL_ON.Entity.Scene sceneSelecetd = null;
var sceneList = LogicMethod.GetSceneList();
+ verticalRefresh.BeginHeaderRefreshingAction += () =>
+ {
+ //鍏抽棴鍒锋柊View锛�
+ verticalRefresh.EndHeaderRefreshing();
+ };
for (int i = 0; i < sceneList.Count; i++)
{
var scene = sceneList[i];
@@ -149,6 +153,8 @@
Output outputDevice = new Output();
outputDevice.target_type = "2";
outputDevice.sid = sceneSelecetd.sid;
+ //娌″暐浣滅敤锛屼负浜嗘暟鎹牸寮忕粺涓�,鍙戦�佹椂涓嶅啀鍒ゆ柇
+ outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene"},{ "value", "0" } } };
AddOutput(outputDevice);
fLayout.RemoveFromParent();
LogicMethod.RemoveAllView();
--
Gitblit v1.8.0