Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs

@@ -23,10 +23,6 @@
        Button btnFloorTitle;


        /// <summary>
        /// 房间绑定楼层的确定按钮
        /// </summary>
        Button btnConfrim;
        Room room;
        /// <summary>
        /// 标题栏增加楼层之后的回调事件
@@ -92,22 +88,54 @@

        void RefreshFloorsListView(string floorName)
        {
            try

            var waitPage = new Loading();
            MainPage.BaseView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
            new System.Threading.Thread(() =>
            {
                var f = new SpatialInfo("FLOOR") { roomName = floorName, parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID };
                var addResult = SpatialInfo.CurrentSpatial.AddFloor(f,out f);
                if (addResult == DAL.Server.StateCode.SUCCESS)
                try
                {
                    LoadFloorRow(f);
                    var f = new SpatialInfo("FLOOR") { roomName = floorName, parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID };
                    var addResult = SpatialInfo.CurrentSpatial.AddFloor(f, out f);
                    if (addResult == DAL.Server.StateCode.SUCCESS)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            LoadFloorRow(f);
                        });
                    }
                }
            }
            catch (Exception ex)
            {
                MainPage.Log("add floor eroor : " + ex.Message);
            }
            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));
                catch { }
                finally
                {
                    Application.RunOnMainThread(() => {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        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));
                    });
                }
            })
            { IsBackground = true }.Start();

            //try
            //{
            //    var f = new SpatialInfo("FLOOR") { roomName = floorName, parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID };
            //    var addResult = SpatialInfo.CurrentSpatial.AddFloor(f,out f);
            //    if (addResult == DAL.Server.StateCode.SUCCESS)
            //    {
            //        LoadFloorRow(f);
            //    }
            //}
            //catch (Exception ex)
            //{
            //    MainPage.Log("add floor eroor : " + ex.Message);
            //}
            //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));
        }

        public void LoadPage()
@@ -164,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();
        }
@@ -212,7 +241,7 @@
        /// </summary>
        void LoadEvent_BindFloor()
        {
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                if (lastButton == null)
                {
@@ -222,6 +251,7 @@
                backAction?.Invoke();
                bodyView.RemoveFromParent();
            };
            new BottomViewConfirmButton().LoadView(bodyView, eventHandler, Language.StringByID( StringId.Confirm));
        }

    }