From d7094fc4ff54ada4c39868c8be1907e0a1c25b32 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:58 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
index 94c4318..24724ca 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
@@ -35,8 +35,8 @@
nameView.btnText.Height = Application.GetRealHeight(22);
nameView.btnText.TextID = StringId.namelogic;
nameView.btnIcon.Visible = false;
- nameView.btnNextIcon.Height = Application.GetMinRealAverage(28);
- nameView.btnNextIcon.Width = Application.GetMinRealAverage(28);
+ nameView.btnNextIcon.Height = Application.GetRealWidth(28);
+ nameView.btnNextIcon.Width = Application.GetRealWidth(28);
nameView.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
viewLayout.AddChidren(nameView.FLayoutView());
@@ -98,10 +98,18 @@
new LogicView.TipPopView().TipBox(StringId.tip, StringId.delAutomation, () =>
{
- LogicMethod.RemoveAllView();
- Logic.LogicList.Remove(Logic.currlogic);
- MainView.MainShow();
- //鍙戦�佸垹闄ら�昏緫鍛戒护锛�
+ var responsePackNew= Send.delLogic(Logic.currlogic);
+ if (responsePackNew.Code == "0")
+ {
+ LogicMethod.RemoveAllView();
+ Logic.LogicList.Remove(Logic.currlogic);
+ MainView.MainShow();
+ //鍙戦�佸垹闄ら�昏緫鍛戒护锛�
+ }
+ else
+ {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.delFail));
+ }
});
};
--
Gitblit v1.8.0