From da40946e8cf2ffb41157f5c388c525ccccaca692 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 29 七月 2022 15:44:58 +0800 Subject: [PATCH] 备份 --- HDL_ON/UI/UI0-Public/TopViewDiv.cs | 65 ++++++++++++++++---------------- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs index e20fdc3..63e8ba3 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); @@ -334,9 +334,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 +344,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