Revert "20201127 合并嘉乐代码"

wei

2020-11-27 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c

 HDL_ON/UI/UI1-Login/SelectServerDialog.cs

@@ -25,10 +25,9 @@
        /// <summary>
        /// 
        /// </summary>
        public SelectServerDialog(Action selectAction)
        public SelectServerDialog()
        {
            bodyView = new FrameLayout();
            this.selectAction = selectAction;
        }


@@ -37,14 +36,12 @@
      /// </summary>
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            this.AddChidren(bodyView);
            //加载顶部菜单栏
            new TopViewDiv(this, bodyView, Language.StringByID(StringId.PleaseSelectCountryOrRegion)).LoadTopView();
            new TopViewDiv(this, bodyView, Language.StringByID(StringId.SelectCountryOrRegion)).LoadTopView();

            //加载服务器区域选择
            AddRegionalSelectionView();
            //Show
            this.Show();
        }


@@ -128,7 +125,7 @@
        /// <param name="VerticalScrolViewMiddle"></param>
        void AddRowView(GlobalRegionListRes mGlobalRegion, VerticalScrolViewLayout VerticalScrolViewMiddle)
        {
            var rowView = new FrameLayout()
            var rowView = new RowLayout()
            {
                Height = Application.GetRealHeight(44),
            };
@@ -137,18 +134,15 @@
            var urlBtn = new Button() {
                X = Application.GetRealWidth(16),
                Height = rowView.Height,
                Width = Application.GetRealWidth(200),
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
                SelectedTextColor = CSS_Color.MainColor,
                //Gravity = Gravity.CenterLeft,
                TextAlignment = TextAlignment.CenterLeft
                Gravity = Gravity.CenterLeft
            };
            rowView.AddChidren(urlBtn);

            //var lineView = new LineView();
            //rowView.AddChidren(lineView);
            //lineView.Y = rowView.Height - lineView.Height;
            var lineView = new LineView();
            rowView.AddChidren(lineView);
            lineView.Y = rowView.Height - lineView.Height;

            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                UserInfo.Current.RequestHttpsHost = mGlobalRegion.regionUrl;
@@ -161,7 +155,7 @@
            rowView.MouseUpEventHandler += eHandler;
            urlBtn.MouseUpEventHandler += eHandler;

            urlBtn.Text = mGlobalRegion.regionName;

            if (mGlobalRegion.regionUrl == UserInfo.Current.RequestHttpsHost)
            {
                urlBtn.TextColor = CSS_Color.MainColor;