From 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:01 +0800
Subject: [PATCH] Merge branch 'wxr6' into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 85da9ad..2bc0a26 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -52,6 +52,9 @@
viewLayout.AddChidren(addInputTextView.FLayoutView(46, 12));
///婊¤冻浠ヤ笅鏉′欢鐨刅iew
LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView();
+ titleCondition.btnText.Width = Application.GetRealWidth(300);
+ titleCondition.btnText.Height = Application.GetRealHeight(28);
+ titleCondition.btnText.IsMoreLines = true;
titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
titleCondition.btnText.TextID = StringId.andCondition;
viewLayout.AddChidren(titleCondition.FLayoutView());
@@ -122,13 +125,13 @@
push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
push.btnClick.Width = Application.GetRealWidth(305);
- //viewLayout.AddChidren(push.FLayoutView());
+ viewLayout.AddChidren(push.FLayoutView());
///鍙戦�侀�氱煡View
LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
notification.btnText.TextID = StringId.notification;
notification.btnLine.BackgroundColor = CSS.CSS_Color.textWhiteColor;
- // viewLayout.AddChidren(notification.FLayoutView());
+ viewLayout.AddChidren(notification.FLayoutView());
//鏄剧ず涔嬪墠鎺ㄩ�佸紑鍏崇姸鎬�
if (Logic.currlogic.noticeConfig.enable)
{
--
Gitblit v1.8.0