From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 十二月 2020 18:57:15 +0800
Subject: [PATCH] 20201208
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index c877f26..8640e96 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -35,7 +35,8 @@
topView.setBtn.Visible = true;
topView.clickSetBtn.Visible = true;
}
- topView.clickSetBtn.MouseUpEventHandler += (sender,e) => {
+ topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
+ {
Set set = new Set();
MainPage.BasePageView.AddChidren(set);
set.Show();
@@ -43,7 +44,7 @@
};
- VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
+ VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
{
Y = Application.GetRealHeight(64),
Width = Application.GetRealWidth(LogicView.TextSize.view375),
@@ -97,6 +98,7 @@
LogicView.LogicTypeTitleView titleOutpu = new LogicView.LogicTypeTitleView();
titleOutpu.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
titleOutpu.btnText.TextID = StringId.theFollowingActions;
+ titleOutpu.btnNextIcon.Visible = false;
viewLayout.AddChidren(titleOutpu.FLayoutView());
//鐩爣澶勭悊鏂规硶
InpOrOutLogicMethod.OutputTarget(this, viewLayout);
@@ -145,6 +147,11 @@
push.frameLayout.Height = Application.GetRealHeight(50);
push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
push.btnText.TextID = StringId.push;
+ push.btnNextIcon.Width = Application.GetMinRealAverage(36);
+ push.btnNextIcon.Height = Application.GetMinRealAverage(36);
+ push.btnNextIcon.X = Application.GetRealWidth(305);
+ push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
+ push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
viewLayout.AddChidren(push.FLayoutView());
///鍙戦�侀�氱煡View
LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
@@ -162,50 +169,45 @@
this.AddChidren(saveView.FLayoutView());
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ if (string.IsNullOrEmpty(Logic.currlogic.sid))
+ {
+ List<string> list = new List<string>();
+ foreach (var logic in Logic.LogicList)
+ {
+ list.Add(logic.name);
+ }
+ new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ {
+ Logic.currlogic.name = logicName;
+ Logic.currlogic.sid = LogicMethod.NewSid();
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ var responsePackNew = Send.AddLogic(Logic.currlogic);
+ if (responsePackNew.Code == "0")
+ {
+ Logic.LogicList.Add(Logic.currlogic);
+ LogicMethod.RemoveAllView();
+ MainView.MainShow();
+ }
+ else {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
- Logic.currlogic.sid = "000101000000000A0A0100CC1100";
- //Logic.currlogic.sid = LogicMethod.NewSid();
- //var f = Send.AddLogic(Logic.currlogic);
+ });
- //var a = Send.getLogicIdList();
-
- //var d = Send.getLogic(Logic.currlogic);
-
- // var c = Send.delLogic(Logic.currlogic);
-
- var e1= Send.switchLogic(Logic.currlogic);
-
-
-
- //if (string.IsNullOrEmpty(Logic.currlogic.sid))
- //{
- // List<string> list = new List<string>();
- // foreach (var logic in Logic.LogicList)
- // {
- // list.Add(logic.name);
- // }
- // new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
- // {
- // Logic.currlogic.name = logicName;
- // Logic.currlogic.sid = LogicMethod.NewSid();
- // var responsePackNew = Send.AddLogic(Logic.currlogic);
- // if (responsePackNew.Code == "0")
- // {
- // Logic.LogicList.Add(Logic.currlogic);
- // LogicMethod.RemoveAllView();
- // MainView.MainShow();
- // }
- // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
-
- // });
-
- //}
- //else
- //{
- // LogicMethod.RemoveAllView();
- // MainView.MainShow();
- // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
- //}
+ }
+ else
+ {
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ var responsePackNew = Send.updateLogic(Logic.currlogic);
+ if (responsePackNew.Code == "0")
+ {
+ LogicMethod.RemoveAllView();
+ MainView.MainShow();
+ }
+ else {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
+ }
};
#endregion
@@ -575,7 +577,6 @@
fLayout.RemoveFromParent();
};
}
-
/// <summary>
/// 婊¤冻鏉′欢
/// </summary>
--
Gitblit v1.8.0