From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
old mode 100644
new mode 100755
index 58e99ca..c0c7e95
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -36,7 +36,7 @@
Action actionRefresh;
#endregion
- public FunctionBaseInfoSetPage(Function func,Action action)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
@@ -196,10 +196,11 @@
// });
#endregion
+#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
{
- Y = nameView.Bottom,
+ Y = locationMagtView.Bottom,
Height = Application.GetRealHeight(55),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -227,7 +228,7 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#endregion
-
+#endif
LoadEventList();
}
--
Gitblit v1.8.0