Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs

@@ -59,20 +59,20 @@
            headPortraitView.AddChidren(btnMemberName);

            #region RoomList
            FrameLayout contentView = new FrameLayout()
            VerticalScrolViewLayout roomListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(138),
                Height = Application.GetRealHeight(485),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealHeight(471),
                //BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(contentView);
            bodyView.AddChidren(roomListView);

            var titleView = new FrameLayout()
            {
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealWidth(44),
            };
            contentView.AddChidren(titleView);
            roomListView.AddChidren(titleView);

            var btnTitle = new Button()
            {
@@ -92,15 +92,15 @@
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            };
            contentView.AddChidren(btnLine);
            roomListView.AddChidren(btnLine);

            //---------------------------------------------
            var roomListView = new VerticalScrolViewLayout()
            {
                Y = btnLine.Bottom,
                Height = Application.GetRealHeight(440),
            };
            contentView.AddChidren(roomListView);
            //var roomListView = new VerticalScrolViewLayout()
            //{
            //    Y = btnLine.Bottom,
            //    Height = Application.GetRealHeight(440),
            //};
            //contentView.AddChidren(roomListView);

            //List<Function> funss = new List<Function>();
            //if (memberInfo.CurResidenceShareDate.Count > 0)
@@ -207,20 +207,20 @@
                }
            }

            if (DB_ResidenceData.rooms.Count > 10)
            {
                roomListView.ScrollEnabled = true;
            }
            else
            {
                roomListView.ScrollEnabled = false;
            //if (DB_ResidenceData.rooms.Count > 10)
            //{
            //    roomListView.ScrollEnabled = true;
            //}
            //else
            //{
            //    roomListView.ScrollEnabled = false;

                roomListView.AddChidren(new Button()
                {
                    Height = Application.GetRealWidth(441),
                    BackgroundColor = CSS_Color.BackgroundColor,
                });
            }
            //    roomListView.AddChidren(new Button()
            //    {
            //        Height = Application.GetRealWidth(441),
            //        BackgroundColor = CSS_Color.BackgroundColor,
            //    });
            //}
            #endregion

            btnDelMember = new Button()