From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 84a2cae..d561905 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -20,7 +20,6 @@
/// </summary>
FrameLayout contentView;
-
/// <summary>
/// 鍚庨��鎸夐挳
/// </summary>
@@ -32,6 +31,11 @@
string title;
/// <summary>
+ /// 鏄惁闇�瑕佸叧闂〉闈�
+ /// </summary>
+ bool needClose = true;
+
+ /// <summary>
/// 鍚庨��鏃惰Е鍙戝浜嬩欢
/// </summary>
Action backAction;
@@ -40,6 +44,19 @@
{
baseView = frame;
title = str;
+ }
+
+ /// <summary>
+ /// TopViewDiv
+ /// </summary>
+ /// <param name="frame">鐖舵帶浠�</param>
+ /// <param name="title">鏍囬</param>
+ /// <param name="needClose">鏄惁闇�瑕佸叧闂〉闈�</param>
+ public TopViewDiv(FrameLayout frame, string title, bool needClose)
+ {
+ baseView = frame;
+ this.title = title;
+ this.needClose = needClose;
}
/// <summary>
@@ -70,7 +87,7 @@
};
baseView.AddChidren(contentView);
- btnBack = new Button()
+ Button btnBackIcon = new Button()
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(29),
@@ -78,13 +95,19 @@
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/BackIcon.png",
};
+ baseView.AddChidren(btnBackIcon);
+
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(50),
+ };
baseView.AddChidren(btnBack);
Button btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(150),
+ Width = Application.GetRealWidth(270),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.HeadlineFontSize,
@@ -105,6 +128,28 @@
backAction = backAct;
LoadTopView();
+ }
+
+ public void LoadTopView_RoomTop(Action backAction ,Action editAction)
+ {
+ this.backAction = backAction;
+
+ 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) =>
+ {
+ editAction();
+ };
}
/// <summary>
@@ -128,7 +173,7 @@
};
contentView.AddChidren(btnSetting);
- btnSetting.MouseUpEventHandler += (sender, e) =>
+ btnSetting.MouseUpEventHandler = (sender, e) =>
{
var infoView = new FunctionBaseInfoSetPage(function, action);
MainPage.BasePageView.AddChidren(infoView);
--
Gitblit v1.8.0