From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index d561905..556ac0f 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -95,13 +96,13 @@
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/BackIcon.png",
};
- baseView.AddChidren(btnBackIcon);
+ contentView.AddChidren(btnBackIcon);
btnBack = new Button()
{
- Width = Application.GetRealWidth(50),
+ Width = Application.GetRealWidth(100),
};
- baseView.AddChidren(btnBack);
+ contentView.AddChidren(btnBack);
Button btnTilte = new Button()
{
@@ -114,7 +115,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
Text = title
};
- baseView.AddChidren(btnTilte);
+ contentView.AddChidren(btnTilte);
LoadEventList();
@@ -144,8 +145,12 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler = (sender, e) =>
{
editAction();
@@ -166,12 +171,16 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Y = Application.GetRealHeight(28),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler = (sender, e) =>
{
@@ -199,7 +208,12 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler += (sender, e) =>
{
@@ -233,16 +247,92 @@
}
/// <summary>
- /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁娣诲姞鍥炬爣鐨勬寜閽�,杩斿洖鏈夊洖璋冧簨浠�
+ /// 妤煎眰绠＄悊椤堕儴鏍�
/// </summary>
- /// <param name="type"></param>
- /// <param name="callBack"></param>
- /// <param name="action"></param>
- public void LoadTopView_AddIcon_BackAction(string type, Action<string, string> callBack,Action action)
+ public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
{
- LoadTopView_AddIcon(type, callBack);
+ LoadTopView();
backAction = action;
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/AddIcon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ Action<string> callBackAction = (floorName) =>
+ {
+ callBack(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);
+ };
+ }
+ /// <summary>
+ /// 鎴块棿绠＄悊椤堕儴鏍�
+ /// </summary>
+ public void LoadTopView_RoomTopView(Action callBack)
+ {
+ LoadTopView();
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/AddIcon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ callBack?.Invoke();
+ };
+ }
+ /// <summary>
+ /// 鎴愬憳椤堕儴鏍�
+ /// </summary>
+ public void LoadTopView_MemberTopView(Action callBack, Action action)
+ {
+ LoadTopView();
+ backAction = action;
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/AddIcon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ callBack?.Invoke();
+ };
}
}
}
--
Gitblit v1.8.0