From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 69 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index af59d9a..ed8ba3b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -9,18 +9,38 @@
{
#region 鎺т欢鍒楄〃
FrameLayout bodyView;
-
+ /// <summary>
+ /// 鍔熻兘鍚嶇О鏄剧ず鎸夐挳
+ /// </summary>
+ Button btnFunctionName;
+ /// <summary>
+ /// 鍔熻兘鍚嶇О缂栬緫鎸夐挳
+ /// </summary>
+ Button btnEditName;
+ /// <summary>
+ /// 浣嶇疆淇℃伅鏄剧ず鎸夐挳
+ /// </summary>
+ Button btnLocationValues;
+ /// <summary>
+ /// 浣嶇疆淇℃伅璺宠浆缂栬緫鎸夐挳
+ /// </summary>
+ Button btnLocationInfoRight;
#endregion
#region 灞�閮ㄥ彉閲�
Function function;
+ /// <summary>
+ /// 鍚庨��鏃讹紝鍒锋柊涔嬪墠鐣岄潰鐨勬樉绀轰俊鎭�
+ /// </summary>
+ Action actionRefresh;
#endregion
- public FunctionBaseInfoSetPage(Function func)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
+ actionRefresh = action;
}
/// <summary>
/// 鍔犺浇鐣岄潰
@@ -28,7 +48,7 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Setting));
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
#region name view
var nameView = new FrameLayout()
@@ -50,18 +70,18 @@
};
nameView.AddChidren(btnNameText);
- var btnNameValues = new Button()
+ btnFunctionName = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
Text = function.name,
};
- nameView.AddChidren(btnNameValues);
+ nameView.AddChidren(btnFunctionName);
- var btnEditName = new Button()
+ btnEditName = new Button()
{
X = Application.GetRealWidth(333),
Gravity = Gravity.CenterVertical,
@@ -81,17 +101,6 @@
Height = Application.GetRealHeight(1)
});
- btnEditName.MouseUpEventHandler += (sender, e) => {
- //鍒涘缓鍥炶皟浜嬩欢
- Action<string> callBackAction = (name) =>
- {
- function.name = name;
- DB_ResidenceData.residenceData.SaveResidenceData();
- };
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction);
- };
-
-
#endregion
#region 浣嶇疆绠＄悊
@@ -103,7 +112,7 @@
};
bodyView.AddChidren(locationMagtView);
- var btnLocationMagtText = new Button()
+ var btnLocationMagtTitle = new Button()
{
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(160),
@@ -112,12 +121,12 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextID = StringId.LocationManagement,
};
- locationMagtView.AddChidren(btnLocationMagtText);
+ locationMagtView.AddChidren(btnLocationMagtTitle);
- var btnLocationValues = new Button()
+ btnLocationValues = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
@@ -125,7 +134,7 @@
};
locationMagtView.AddChidren(btnLocationValues);
- var btnLocationMagtRight = new Button()
+ btnLocationInfoRight = new Button()
{
X = Application.GetRealWidth(339),
Gravity = Gravity.CenterVertical,
@@ -133,7 +142,7 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/RightIcon.png",
};
- locationMagtView.AddChidren(btnLocationMagtRight);
+ locationMagtView.AddChidren(btnLocationInfoRight);
locationMagtView.AddChidren(
new Button()
@@ -144,58 +153,54 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(1)
});
- btnLocationMagtRight.MouseUpEventHandler += (sender, e) =>
- {
- SkipChooseRoomPage();
- };
#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,
};
@@ -223,8 +228,8 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#endregion
-
-
+#endif
+ LoadEventList();
}
--
Gitblit v1.8.0