From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 1e13358..84a2cae 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -75,7 +75,7 @@
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(29),
Width = Application.GetRealWidth(40),
- Height = Application.GetRealHeight(28),
+ Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/BackIcon.png",
};
baseView.AddChidren(btnBack);
@@ -99,10 +99,10 @@
/// <summary>
/// 鎷ユ湁涓�涓洖璋冧簨浠�
/// </summary>
- /// <param name="action"></param>
- public void LoadTopView(Action action)
+ /// <param name="backAct"></param>
+ public void LoadTopView(Action backAct)
{
- backAction = action;
+ backAction = backAct;
LoadTopView();
}
@@ -112,7 +112,7 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView(Function function, Action action)
+ public void LoadTopView_FunctionTop(Function function, Action action)
{
backAction = action;
@@ -130,17 +130,44 @@
btnSetting.MouseUpEventHandler += (sender, e) =>
{
- LoadEvent_SkipFunctionSetting(function);
+ var infoView = new FunctionBaseInfoSetPage(function, action);
+ MainPage.BasePageView.AddChidren(infoView);
+ infoView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
+ /// <summary>
+ /// 鎴块棿鏍囬鍖哄煙
+ /// </summary>
+ /// <param name="room"></param>
+ /// <param name="skipAction"></param>
+ public void LoadTopView_SettingIcon(Action skipAction)
+ {
+ LoadTopView();
+
+ var btnSetting = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+ };
+ contentView.AddChidren(btnSetting);
+
+ btnSetting.MouseUpEventHandler += (sender, e) =>
+ {
+ skipAction();
+ };
+ }
/// <summary>
/// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁娣诲姞鍥炬爣鐨勬寜閽�
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView(string type, Action<string, string> callBack)
+ public void LoadTopView_AddIcon(string type, Action<string, string> callBack)
{
LoadTopView();
@@ -157,7 +184,6 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
LoadEvent_AddEvent(type, callBack);
-
};
}
@@ -167,9 +193,9 @@
/// <param name="type"></param>
/// <param name="callBack"></param>
/// <param name="action"></param>
- public void LoadTopView(string type, Action<string, string> callBack,Action action)
+ public void LoadTopView_AddIcon_BackAction(string type, Action<string, string> callBack,Action action)
{
- LoadTopView(type, callBack);
+ LoadTopView_AddIcon(type, callBack);
backAction = action;
}
--
Gitblit v1.8.0