From a75f121124e90619b2853ad079ae0a733366b022 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 08 十二月 2020 14:48:30 +0800
Subject: [PATCH] 2020-12-08-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index f8d382d..a8cb866 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -98,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);
@@ -146,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();
@@ -174,6 +180,7 @@
{
Logic.currlogic.name = logicName;
Logic.currlogic.sid = LogicMethod.NewSid();
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
var responsePackNew = Send.AddLogic(Logic.currlogic);
if (responsePackNew.Code == "0")
{
@@ -181,21 +188,25 @@
LogicMethod.RemoveAllView();
MainView.MainShow();
}
- //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ else {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
});
}
else
{
-
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
var responsePackNew = Send.updateLogic(Logic.currlogic);
if (responsePackNew.Code == "0")
{
LogicMethod.RemoveAllView();
MainView.MainShow();
}
- //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ else {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
}
};
@@ -495,9 +506,9 @@
{
Button monTextBtn = new Button
{
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- Radius = (uint)Application.GetRealHeight(15),
+ Width = Application.GetRealWidth(30),
+ Height = Application.GetRealWidth(30),
+ Radius = (uint)Application.GetRealWidth(15),
Text = i.ToString(),
TextSize = LogicView.TextSize.text14,
TextColor = CSS.CSS_Color.textColor,
--
Gitblit v1.8.0