From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"

---
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs |   78 +++------------------------------------
 1 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 1c8ae6d..25fd27b 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -21,7 +21,6 @@
             LoadEvent_Register();
             LoadEvent_LimtPasswordLength();
             LoadEvent_TextChange();
-            LoadEvent_Server();
             //var areaCodeList = pm.GetAreaCode();
         }
         /// <summary>
@@ -69,7 +68,7 @@
             //閫夋嫨鎵嬫満娉ㄥ唽
             btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
             {
-                if (registerType == 0)
+                if(registerType == 0)
                 {
                     return;
                 }
@@ -207,7 +206,7 @@
                             }
                         }
                     }
-                    if (accountType == 0)
+                    if(accountType ==0)
                     {
                         registerPhone = etAccount.Text.Trim();
                     }
@@ -368,9 +367,6 @@
             {
                 if ((sender as Button).IsSelected)
                 {
-                    //鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
-                    if (CheckIfSelectServer() == false) return;
-
                     string account = etAccount.Text.Trim();
                     int time = 60;
                     new Thread(() =>
@@ -385,7 +381,7 @@
                             {
                                 //鐭俊鍙戦�侀棿闅�60s
                                 (sender as Button).IsSelected = false;
-
+                             
                             });
                             //2.1 寮�濮嬪�掕鏃�
                             new Thread(() =>
@@ -425,13 +421,11 @@
                                 IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                             }
 
-                        }
-                        else if (result.Code.ToUpper() == StateCode.SUCCESS)
+                        }else if (result.Code.ToUpper() == StateCode.SUCCESS)
                         {
                             //3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
                             Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
-                        }
-                        else
+                        } else
                         {
                             //4.鎻愮ず鍏跺畠寮傚父閿欒
                             IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
@@ -496,7 +490,7 @@
         {
             btnRegister.MouseUpEventHandler = (sender, e) =>
             {
-                if (etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length < 6)
+                if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
                 {
                     new Tip()
                     {
@@ -508,9 +502,6 @@
                 }
                 if (btnRegister.IsSelected)
                 {
-                    //鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
-                    if (CheckIfSelectServer() == false) return;
-
                     waitPage = new Loading();
                     new PublicAssmebly().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage);
                 }
@@ -597,63 +588,6 @@
                     });
                 }
             });
-        }
-
-        /// <summary>
-        /// 鍔犺浇鏈嶅姟鍣ㄩ�夋嫨鎸夐挳浜嬩欢
-        /// </summary>
-        void LoadEvent_Server()
-        {
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-            {
-                Action selectAction = () =>
-                {
-                    //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
-                    isSelectServer = true;
-                    ShowServerBottomLineState(false);
-                    btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
-                    btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
-                };
-                new SelectServerDialog(selectAction).LoadPage();
-
-            };
-
-            btnServerGo.MouseUpEventHandler = eventHandler;
-            btnServerText.MouseUpEventHandler = eventHandler;
-        }
-
-        /// <summary>
-        /// 妫�娴嬫槸鍚﹂�夋嫨浜嗘湇鍔″櫒
-        /// </summary>
-        /// <returns></returns>
-        private bool CheckIfSelectServer()
-        {
-            if (isSelectServer == false)
-            {
-                //璇峰厛閫夋嫨鍥藉/鍖哄煙
-                Utlis.ShowTip(Language.StringByID(StringId.PleaseSelectCountryOrRegion));
-                ShowServerBottomLineState(true);
-                return false;
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 鏈嶅姟鍣ㄤ笅鍒掔嚎鏍峰紡
-        /// </summary>
-        /// <param name="isError"></param>
-        void ShowServerBottomLineState(bool isError)
-        {
-            if (isError)
-            {
-                btnServerBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
-                btnServerBottomLine.Height = Application.GetRealHeight(2);
-            }
-            else
-            {
-                btnServerBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
-                btnServerBottomLine.Height = Application.GetRealHeight(1);
-            }
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0