From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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..7113132 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());
@@ -61,12 +61,13 @@
list.Add(logic.name);
}
- new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName,view
+ ) =>
{
btnAutomationName.Text = logicName;
Logic.currlogic.name = logicName;
- });
+ },()=> { });
};
nameView.btnClick.MouseUpEventHandler += editClick;
btnAutomationName.MouseUpEventHandler += editClick;
@@ -95,13 +96,47 @@
EventHandler<MouseEventArgs> delClick = (sender, e) =>
{
-
+ Loading loading = new Loading();
+ this.AddChidren(loading);
+ HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
new LogicView.TipPopView().TipBox(StringId.tip, StringId.delAutomation, () =>
{
- LogicMethod.RemoveAllView();
- Logic.LogicList.Remove(Logic.currlogic);
- MainView.MainShow();
- //鍙戦�佸垹闄ら�昏緫鍛戒护锛�
+ loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ //鍙戦�佸垹闄ら�昏緫鍛戒护锛�
+ responsePackNew = Send.DelLogic(Logic.currlogic);
+
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ if (responsePackNew != null && responsePackNew.Code == "0")
+ {
+ LogicMethod.CurrLogicMethod.RemoveAllView();
+ Logic.LogicList.Remove(Logic.currlogic);
+ MainView.MainShow();
+ //鍙戦�佸垹闄ら�昏緫鍛戒护锛�
+ }
+ else if (responsePackNew != null && responsePackNew.Code == "14005")
+ {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
+ }
+ else
+ {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.delFail));
+ }
+ });
+ }
+
+ })
+ { IsBackground = true }.Start();
+
});
};
--
Gitblit v1.8.0