From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 19 +++++++++++++------
1 files changed, 13 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 b8f1cc4..815d67d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -47,10 +47,11 @@
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 鎵�鏈夌偣鍑讳簨浠�
+ //鍔熻兘鐐瑰嚮浜嬩欢
functionView.btnClick.MouseUpEventHandler += (sen, e) =>
{
FunTpye funTpye = new FunTpye();
@@ -59,7 +60,7 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
-
+ //鍦烘櫙鐐瑰嚮浜嬩欢
sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
{
@@ -70,7 +71,7 @@
this.AddChidren(fLayout);
SceneMethod(fLayout);
};
-
+ //寤舵椂鐐瑰嚮浜嬩欢
delayView.btnClick.MouseUpEventHandler += (sen, e) =>
{
@@ -105,11 +106,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];
@@ -121,8 +126,8 @@
sceneView.btnLine.X = Application.GetRealWidth(20);
sceneView.btnLine.Width = Application.GetRealWidth(303);
sceneView.btnNextIcon.X = Application.GetRealWidth(303);
- sceneView.btnNextIcon.Width = Application.GetMinRealAverage(28);
- sceneView.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ sceneView.btnNextIcon.Width = Application.GetRealWidth(28);
+ sceneView.btnNextIcon.Height = Application.GetRealWidth(28);
sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
verticalRefresh.AddChidren(sceneView.FLayoutView());
@@ -149,6 +154,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