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 | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 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 6c3064a..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;
@@ -156,51 +156,51 @@
#endregion
#region 鍏变韩
- var sharedView = new FrameLayout()
- {
- Y = locationMagtView.Bottom,
- Height = Application.GetRealHeight(55),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(sharedView);
+ //var sharedView = new FrameLayout()
+ //{
+ // Y = locationMagtView.Bottom,
+ // Height = Application.GetRealHeight(55),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //bodyView.AddChidren(sharedView);
- var btnSharedText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(160),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.Shared,
- };
- sharedView.AddChidren(btnSharedText);
+ //var btnSharedText = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Width = Application.GetRealWidth(160),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextID = StringId.Shared,
+ //};
+ //sharedView.AddChidren(btnSharedText);
- var btnSharedRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/RightIcon.png",
- };
- sharedView.AddChidren(btnSharedRight);
+ //var btnSharedRight = new Button()
+ //{
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/RightIcon.png",
+ //};
+ //sharedView.AddChidren(btnSharedRight);
- sharedView.AddChidren(
- new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(54),
- BackgroundColor = CSS_Color.DividingLineColor,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(1)
- });
-
+ //sharedView.AddChidren(
+ // new Button()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(54),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(1)
+ // });
#endregion
+#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
{
- Y = sharedView.Bottom,
+ Y = locationMagtView.Bottom,
Height = Application.GetRealHeight(55),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -228,7 +228,7 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#endregion
-
+#endif
LoadEventList();
}
--
Gitblit v1.8.0