From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 101d71f..e5a83d5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -52,7 +52,6 @@
addLogic.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- //寮�鍏冲浘鏍囩殑鐐瑰嚮浜嬩欢
logicView.btnSwitchIcon.MouseUpEventHandler += (sender1, e1) =>
{
logicView.btnSwitchIcon.IsSelected = !logicView.btnSwitchIcon.IsSelected;
@@ -60,25 +59,16 @@
{
logicView.btnSwitchIcon.IsSelected = true;
currLogic.enable = "true";
+
+
}
else
{
logicView.btnSwitchIcon.IsSelected = false;
currLogic.enable = "false";
}
- //Send.switchLogic(currLogic);
- new System.Threading.Thread(() =>
- {
- try
- {
- //閫昏緫浣胯兘鐨勫懡浠�
- Send.switchLogic(currLogic);
+ Send.switchLogic(currLogic);
- }
- catch { }
-
- })
- { IsBackground = true }.Start();
};
GetSelectIcon(logicView.frameLayout, currLogic);
//if (i==0)闄嶅簭鎺掑垪
@@ -210,6 +200,7 @@
return weekTextName.TrimEnd(',');
}
+
/// <summary>
/// 鑾峰彇姣忔湀鐨勫瓧绗︿覆
/// </summary>
--
Gitblit v1.8.0