From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 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..312e8f1 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)
                     {
@@ -114,8 +110,11 @@
                 finally
                 {
                     Application.RunOnMainThread(() => {
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
                         int count = SpatialInfo.CurrentSpatial.FloorList.Count > 10 ? 10 : SpatialInfo.CurrentSpatial.FloorList.Count;
                         floorsListView.Height = Application.GetRealHeight(50 * count);
                         contentView.Height = Application.GetRealHeight(50 * (count + 1));
@@ -196,21 +195,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 +244,7 @@
         /// </summary>
         void LoadEvent_BindFloor()
         {
-            btnConfrim.MouseUpEventHandler = (sender, e) =>
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
                 if (lastButton == null)
                 {
@@ -254,6 +254,7 @@
                 backAction?.Invoke();
                 bodyView.RemoveFromParent();
             };
+            new BottomViewConfirmButton().LoadView(bodyView, eventHandler, Language.StringByID( StringId.Confirm));
         }
 
     }

--
Gitblit v1.8.0