Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -119,7 +119,7 @@
                Y = Application.GetRealHeight(519 + 64),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealHeight(44),
                Height = Application.GetRealWidth(44),
                BackgroundColor = CSS_Color.MainColor,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.MainBackgroundColor,
@@ -148,7 +148,7 @@
        void LoadFunctionRow(List<ShareData>  shareDatas)
        {
            contentView.RemoveAll();
            foreach (var function in room.functions)
            foreach (var function in room.GetRoomFunctions(false))
            {
                var roomView = new FrameLayout()
                {
@@ -180,7 +180,7 @@
                    Tag = "ChooseIcon"
                };
                roomView.AddChidren(btnChoose);
                if (shareDatas.Find((obj) => obj.ShareName == function.sid) != null)
                if (shareDatas.Find((obj) => obj.fileName == function.sid) != null)
                {
                    btnChoose.IsSelected = true;
                }
@@ -194,12 +194,12 @@
                var btnLine = new Button()
                {
                    Gravity = Gravity.CenterHorizontal,
                    Y = Application.GetRealHeight(49),
                    Height = Application.GetMinReal(1),
                    //Y = Application.GetRealHeight(49),
                    Height = Application.GetRealHeight(1),
                    Width = Application.GetRealWidth(343),
                    BackgroundColor = CSS_Color.DividingLineColor,
                };
                roomView.AddChidren(btnLine);
                contentView.AddChidren(btnLine);
            }
        }