From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 3db439e..5f4320a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -90,13 +90,13 @@
{
LogicView.TimeView timePointView = new LogicView.TimeView();
timePointView.FLayoutView(fLayout);
- EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) =>
+ EventHandler<MouseEventArgs> removefLayout = (sender, e1) =>
{
//绉婚櫎fLayout鐣岄潰
fLayout.RemoveFromParent();
};
//鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
+ timePointView.btnCancel.MouseUpEventHandler += removefLayout;
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
@@ -155,7 +155,7 @@
//娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
Logic.currlogic.input.Add(inputTime);
}
- RemoveViewByTag("Logic");
+ LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
@@ -173,7 +173,6 @@
{
#region 鐣岄潰甯冨眬
LogicView.TimeHorizonView timeHorizonView = new LogicView.TimeHorizonView();
- timeHorizonView.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
timeHorizonView.FLayoutView(fLayout);
//寮�濮嬫椂闂�
LogicView.SelectTypeView startTimeView = new LogicView.SelectTypeView();
@@ -190,7 +189,7 @@
{
TextSize = LogicView.TextSize.text12,
Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
X = Application.GetRealWidth(260),
@@ -200,7 +199,7 @@
//缁撴潫鏃堕棿
LogicView.SelectTypeView endTimeView = new LogicView.SelectTypeView();
- endTimeView.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+ endTimeView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
endTimeView.frameLayout.Y = startTimeView.frameLayout.Bottom;
endTimeView.btnIcon.Visible = false;
endTimeView.btnLine.Visible = false;
@@ -213,7 +212,7 @@
{
TextSize = LogicView.TextSize.text12,
Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
X = Application.GetRealWidth(260),
@@ -280,7 +279,7 @@
//娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
Logic.currlogic.input.Add(inputTime);
}
- RemoveViewByTag("Logic");
+ LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0