From 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 02 十二月 2020 16:32:00 +0800
Subject: [PATCH] 2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 1e13358..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,13 +87,19 @@
};
baseView.AddChidren(contentView);
- btnBack = new Button()
+ Button btnBackIcon = new Button()
{
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(btnBackIcon);
+
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(50),
};
baseView.AddChidren(btnBack);
@@ -84,7 +107,7 @@
{
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,
@@ -99,12 +122,34 @@
/// <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();
+ }
+
+ 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>
@@ -112,7 +157,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;
@@ -128,19 +173,46 @@
};
contentView.AddChidren(btnSetting);
- btnSetting.MouseUpEventHandler += (sender, e) =>
+ 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 +229,6 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
LoadEvent_AddEvent(type, callBack);
-
};
}
@@ -167,9 +238,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