From 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:07:47 +0800
Subject: [PATCH] Revert "20201127 合并嘉乐代码"
---
HDL_ON/UI/UI1-Login/SelectServerDialog.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
index 33b620f..4ad3d99 100644
--- a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
+++ b/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();
}
@@ -60,6 +57,20 @@
Height = bodyView.Height - Application.GetRealHeight(64),
};
bodyView.AddChidren(VerticalScrolViewMiddle);
+
+ //var TipView = new Button()
+ //{
+ // Y = bodyView.Height - Application.GetRealHeight(60),
+ // Width = LayoutParams.MatchParent,
+ // Height = Application.GetRealHeight(60),
+ // BackgroundColor = 0xFFFFFFE0,
+ // TextSize = 11,
+ // //Text = "璇烽�夋嫨娉ㄥ唽鐨勫尯鍩�",
+ // //TextID = R.MyInternationalizationString.SelectRegisteredArea,
+ // TextColor = 0xFF1F1F1F,
+ // IsMoreLines = true
+ //};
+ //bodyView.AddChidren(TipView);
var waitPage = new Loading();
waitPage.Start("Please wait...");
@@ -114,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),
};
@@ -123,16 +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,
- 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;
@@ -145,7 +155,6 @@
rowView.MouseUpEventHandler += eHandler;
urlBtn.MouseUpEventHandler += eHandler;
- urlBtn.Text = mGlobalRegion.regionName;
if (mGlobalRegion.regionUrl == UserInfo.Current.RequestHttpsHost)
{
--
Gitblit v1.8.0