From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
index 25f51cf..48f2341 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
@@ -23,10 +23,6 @@
Button btnFloorTitle;
- /// <summary>
- /// 鎴块棿缁戝畾妤煎眰鐨勭‘瀹氭寜閽�
- /// </summary>
- Button btnConfrim;
Room room;
/// <summary>
/// 鏍囬鏍忓鍔犳ゼ灞備箣鍚庣殑鍥炶皟浜嬩欢
@@ -100,7 +96,7 @@
{
try
{
- var f = new SpatialInfo("FLOOR") { roomName = floorName, parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID };
+ var f = new SpatialInfo("FLOOR") { roomName = floorName, parentId = DB_ResidenceData.Instance.CurrentRegion.id };
var addResult = SpatialInfo.CurrentSpatial.AddFloor(f, out f);
if (addResult == DAL.Server.StateCode.SUCCESS)
{
@@ -196,21 +192,22 @@
LoadFloorRow(floor);
}
- btnConfrim = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(582),
- Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
- BackgroundColor = CSS_Color.MainColor,
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextAlignment = TextAlignment.Center,
- IsBold = true,
- TextID = StringId.Confirm,
- };
- bodyView.AddChidren(btnConfrim);
+ //btnConfrim = new Button()
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(582),
+ // Width = Application.GetRealWidth(220),
+ // Height = Application.GetRealWidth(44),
+ // Radius = (uint)Application.GetRealWidth(22),
+ // BackgroundColor = CSS_Color.MainColor,
+ // TextColor = CSS_Color.MainBackgroundColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextAlignment = TextAlignment.Center,
+ // IsBold = true,
+ // TextID = StringId.Confirm,
+ //};
+ //bodyView.AddChidren(btnConfrim);
+
LoadEvent_BindFloor();
}
@@ -244,7 +241,7 @@
/// </summary>
void LoadEvent_BindFloor()
{
- btnConfrim.MouseUpEventHandler = (sender, e) =>
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
if (lastButton == null)
{
@@ -254,6 +251,7 @@
backAction?.Invoke();
bodyView.RemoveFromParent();
};
+ new BottomViewConfirmButton().LoadView(bodyView, eventHandler, Language.StringByID( StringId.Confirm));
}
}
--
Gitblit v1.8.0