From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index e20fdc3..7951076 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -79,12 +79,12 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView()
+ public void LoadTopView(uint color = CSS_Color.TopViewColor)
{
contentView = new FrameLayout()
{
Height = Application.GetRealHeight(64),
- BackgroundColor = CSS_Color.TopViewColor,
+ BackgroundColor = color,
};
baseView.AddChidren(contentView);
@@ -169,11 +169,15 @@
var btnSetting = new Button()
{
- X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
+ X = Application.GetRealWidth(337-37),
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetMinRealAverage(28+37),
+ Height = Application.GetMinRealAverage(28+19),
+ TextID = StringId.CombinedDimming,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.MainColor,
+ IsMoreLines = true
+ //UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
};
contentView.AddChidren(btnSetting);
@@ -334,9 +338,9 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView_Add3tyIot(string type, Action<string, string> callBack)
+ public void LoadTopView_Add3tyIot( Action<string, string> callBack)
{
- LoadTopView();
+ LoadTopView(CSS_Color.MainBackgroundColor);
var btnAddIcon = new Button()
{
@@ -344,39 +348,40 @@
Y = Application.GetRealHeight(29),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Public/AddIcon.png",
+ UnSelectedImagePath = "Public/LinkIotIcon.png",
};
contentView.AddChidren(btnAddIcon);
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- if (type == "floors")
- {
- Action<string> callBackAction = (floorName) =>
- {
- callBack("add", floorName);
- };
- string newFloorName = "1F";
- for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1;)
- {
- newFloorName = ++i + "F";
- if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newFloorName))
- {
- break;
- }
- }
- var fs = new List<string>();
- foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
- {
- fs.Add(f.roomName);
- }
- new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
- StringId.AddFloorFailed_FloorAlreadyExist, fs);
- }
- else
- {
- callBack("", "");
- }
+ var page = new Iot_BrandListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+
+
+ /// <summary>
+ /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,绗笁鏂瑰钩鍙�
+ /// </summary>
+ public void LoadTopView_3tyIot(Action action)
+ {
+ LoadTopView(CSS_Color.MainBackgroundColor);
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/Iot_agreement_icon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ action();
};
}
--
Gitblit v1.8.0