Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -36,7 +36,6 @@

            Action backAction_AddMember = () =>
            {
                //new PublicAssmebly().LoadPage_WaitPage(LoadThread_GetResidenceMemberAccount(), bodyView, waitPage);
                LoadThread_GetResidenceMemberAccount().Start();
            };
            Action<string, string> refreshAction = (s1, s2) =>
@@ -46,7 +45,7 @@
                mmp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView("Member", refreshAction, backAction);
            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_AddIcon_BackAction("Member", refreshAction, backAction);

            contentView = new VerticalScrolViewLayout()
            {
@@ -90,6 +89,28 @@
                };
                sView.AddChidren(view1);

                var userTypeView = new FrameLayout()
                {
                    Width = Application.GetRealWidth(122),
                    Height = Application.GetRealHeight(58),
                    X = Application.GetRealWidth(270),
                    Y = Application.GetRealHeight(16),
                    BackgroundImagePath = "PersonalCenter/UserTypebg.png",
                };
                view1.AddChidren(userTypeView);

                var btnUserTypeName = new Button()
                {
                    X = Application.GetRealWidth(28),
                    Width = Application.GetRealWidth(80),
                    Height = Application.GetRealHeight(17 * 3),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextID = StringId.Member
                };
                userTypeView.AddChidren(btnUserTypeName);

                var memberHeadImageView = new ImageView()
                {
                    X = Application.GetRealWidth(16),
@@ -111,7 +132,7 @@
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    IsBold = true,
                    Text = memberInfo.UserName
                    Text = memberInfo.nickName
                };
                view1.AddChidren(btnMemberName);

@@ -161,7 +182,7 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = memberInfo.Nickname
                    Text = memberInfo.nickName
                };
                view2.AddChidren(btnNickname);

@@ -264,15 +285,13 @@
                    Height = Application.GetMinRealAverage(38),
                    UnSelectedImagePath = "Public/Switch_2.png",
                    SelectedImagePath = "Public/SwitchOn_2.png",
                    IsSelected = memberInfo.IsAllowCreateScene
                    IsSelected = memberInfo.isAllowCreateScene
                };
                view4.AddChidren(btnCreateSceneRight);

                LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
                #endregion 

            }
        }

    }
}