From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
old mode 100755
new mode 100644
index 02b75d2..27de3ca
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -98,13 +98,6 @@
};
contentView.AddChidren(btnBackIcon);
- btnBack = new Button()
- {
- Width = Application.GetRealWidth(50),
- //BackgroundColor = CSS_Color.AuxiliaryColor2,
- };
- contentView.AddChidren(btnBack);
-
Button btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -118,6 +111,12 @@
};
contentView.AddChidren(btnTilte);
+
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(70),
+ };
+ contentView.AddChidren(btnBack);
LoadEventList();
}
@@ -148,7 +147,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -172,13 +171,13 @@
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",
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -211,7 +210,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -243,7 +242,33 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- LoadEvent_AddEvent(type, callBack);
+ 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("", "");
+ }
};
}
@@ -332,7 +357,30 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- callBack?.Invoke();
+ addAction?.Invoke();
+ };
+ }
+ /// <summary>
+ /// 瀹夐槻涓績椤堕儴鏍�
+ /// </summary>
+ public void LoadTopView_ArmCenter(Action skipAction)//(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 = "FunctionIcon/ArmCenter/HistoryIcon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ skipAction?.Invoke();
};
}
}
--
Gitblit v1.8.0