From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 十一月 2020 14:27:16 +0800 Subject: [PATCH] 1127最新合并代码,合并嘉乐更新 --- HDL_ON/UI/UI1-Login/RegisterPage.cs | 130 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 104 insertions(+), 26 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs index 720f2ab..f69f6d2 100644 --- a/HDL_ON/UI/UI1-Login/RegisterPage.cs +++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs @@ -27,6 +27,36 @@ /// 閫夋嫨閭鐧诲綍鎸夐挳 /// </summary> Button btnEmailLogin; + #region 鏈嶅姟鍣ㄩ�夋嫨 + /// <summary> + /// 鏈嶅姟鍣ㄥ尯鍩� + /// </summary> + FrameLayout serverView; + /// <summary> + /// 鏈嶅姟鍣↖con鎸夐挳 + /// </summary> + Button btnServerIcon; + /// <summary> + /// 鏈嶅姟鍣ㄦ枃鏈 + /// </summary> + Button btnServerText; + ///// <summary> + ///// 鏈嶅姟鍣ㄦ枃鏈 + ///// </summary> + //EditText etServer; + ///// <summary> + ///// 鏈嶅姟鍣ㄥ瓙鍖哄煙閲岄潰鐨勫垎鍓茬嚎1 + ///// </summary> + //Button btnLineVertical_server; + /// <summary> + ///鏈嶅姟鍣╣o鎸夐挳 + /// </summary> + Button btnServerGo; + /// <summary> + /// 鏈嶅姟鍣ㄥ瓙鍖哄煙搴曢儴妯嚎 + /// </summary> + Button btnServerBottomLine; + #endregion /// <summary> /// 璐﹀彿瀛愬尯鍩� /// </summary> @@ -168,6 +198,10 @@ /// 鎵嬫満鍖哄彿 /// </summary> string phoneZoneCode = "86"; + /// <summary> + /// 鏄惁閫夋嫨杩囨湇鍔″櫒 + /// </summary> + bool isSelectServer; string registerPhone; string registerEmail; @@ -227,11 +261,66 @@ bodyView.AddChidren(btnEmailLogin); #endregion + #region 鏈嶅姟鍣ㄩ�夋嫨 + serverView = new FrameLayout() + { + X = Application.GetRealWidth(28), + Y = Application.GetRealHeight(167), + Width = Application.GetRealWidth(319), + Height = Application.GetRealHeight(44), + }; + bodyView.AddChidren(serverView); + + btnServerIcon = new Button() + { + X = Application.GetRealWidth(9), + Gravity = Gravity.CenterVertical, + Width = Application.GetMinRealAverage(20), + Height = Application.GetMinRealAverage(20), + UnSelectedImagePath = "LoginIcon/Server.png", + + }; + serverView.AddChidren(btnServerIcon); + + btnServerText = new Button() + { + X = Application.GetRealWidth(49), + Width = Application.GetRealWidth(319 - 78), + TextAlignment = TextAlignment.CenterLeft, + TextColor = CSS_Color.PromptingColor1, + TextSize = CSS_FontSize.TextFontSize, + TextID = StringId.PleaseSelectCountryOrRegion, + }; + serverView.AddChidren(btnServerText); + + #region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇 + btnServerGo = new Button() + { + X = Application.GetRealWidth(303), + Gravity = Gravity.CenterVertical, + Width = Application.GetMinRealAverage(16), + Height = Application.GetMinRealAverage(16), + UnSelectedImagePath = "Public/Right.png", + }; + serverView.AddChidren(btnServerGo); + + #endregion + btnServerBottomLine = new Button() + { + Y = Application.GetRealHeight(42), + BackgroundColor = CSS_Color.DividingLineColor, + SelectedBackgroundColor = CSS_Color.MainColor, + Height = Application.GetRealHeight(1), + }; + serverView.AddChidren(btnServerBottomLine); + #endregion + + int topPadding = Application.GetRealHeight(12); #region 璐﹀彿濉啓 accountView = new FrameLayout() { X = Application.GetRealWidth(28), - Y = Application.GetRealHeight(167), + Y = serverView.Bottom + topPadding, Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(44), }; @@ -313,7 +402,7 @@ passwordView = new FrameLayout() { X = Application.GetRealWidth(28), - Y = Application.GetRealHeight(223), + Y = accountView.Bottom + topPadding, Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(44), }; @@ -379,7 +468,7 @@ repeatPasswordView = new FrameLayout() { X = Application.GetRealWidth(28), - Y = Application.GetRealHeight(279), + Y = passwordView.Bottom + topPadding, Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(44), }; @@ -447,7 +536,8 @@ verificationCodeView = new FrameLayout() { X = Application.GetRealWidth(28), - Y = Application.GetRealHeight(335), + Y = repeatPasswordView.Bottom + topPadding, + //Y = Application.GetRealHeight(335), Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(44), }; @@ -524,10 +614,11 @@ btnRegister = new Button() { Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(421), + Y = verificationCodeView.Bottom + Application.GetRealHeight(42), + //Y = Application.GetRealHeight(421), Width = Application.GetRealWidth(220), - Height = Application.GetRealHeight(44), - Radius = (uint)Application.GetRealHeight(22), + Height = Application.GetRealWidth(44), + Radius = (uint)Application.GetRealWidth(22), SelectedBackgroundColor = CSS_Color.MainColor, BackgroundColor = CSS_Color.PromptingColor1, TextID = StringId.Register, @@ -727,28 +818,15 @@ var responsePack = pm.GetHomePager(); if (responsePack == StateCode.SUCCESS) { + //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔� + if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0) + { + result = true; + } } else { - var tipStr = "Server erorr"; - switch (responsePack) - { - case "NoLogin": - tipStr = Language.StringByID(StringId.InvalidLoginCertificate); - break; - } - Application.RunOnMainThread(() => - { - //鎻愮ず鍘熷洜 - var tip = new Tip() - { - Text = tipStr, - CloseTime = 1, - Direction = AMPopTipDirection.None - }; - tip.Show(bodyView); - }); - + IMessageCommon.Current.ShowErrorInfoAlter(responsePack); } return result; } -- Gitblit v1.8.0