From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码

---
 ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs |  302 +++++++++++++++++++++++--------------------------
 1 files changed, 142 insertions(+), 160 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
index d7429da..20faead 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
@@ -1,186 +1,168 @@
 锘縰sing System;
 using System.Text;
 using Shared.Common;
+using Shared.Phone.UserCenter;
 using Shared.Phone.UserView;
 
 namespace Shared.Phone.Login
 {
+    /// <summary>
+    /// 璐﹀彿娉ㄥ唽鎴愬姛鐨勬彁绀虹晫闈�
+    /// </summary>
     public class AccountRegisterSuccess : FrameLayout
-    {
+    {
+        #region 鈻� 鍒濆鍖朹____________________________
+
         /// <summary>
-        /// registerSuccess
+        /// 鍒濆鍖�
         /// </summary>
-        /// <param name="account"></param>
-        /// <param name="password"></param>
-        public void Show(string account, string password,string OpenID="")
+        /// <param name="account">璐﹀彿</param>
+        /// <param name="password">瀵嗙爜</param>
+        /// <param name="OpenID">绗笁鏂圭粦瀹氱殑id</param>
+        public void ShowForm(string account, string password, string OpenID = "")
         {
-            var dialog = new FrameLayout()
-            {
-                BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
-            };
-            AddChidren(dialog);
+            //鏁翠釜鑳屾櫙
+            var frameBack = new FrameLayout();
+            frameBack.BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor;
+            this.AddChidren(frameBack);
+            //涓婇儴榛戣壊閮ㄥ垎
+            var frameBlack = new FrameLayout();
+            frameBlack.Y = Application.GetRealHeight(527);
+            frameBlack.Width = Application.GetRealWidth(688);
+            frameBlack.Height = Application.GetRealHeight(274);
+            frameBlack.Gravity = Gravity.CenterHorizontal;
+            frameBlack.BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor;
+            frameBlack.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+            this.AddChidren(frameBlack);
+            //涓嬮儴鐧借壊閮ㄥ垎
+            var frameWhite = new FrameLayout();
+            frameWhite.Y = frameBlack.Bottom;
+            frameWhite.Width = Application.GetRealWidth(688);
+            frameWhite.Height = Application.GetRealHeight(579);
+            frameWhite.Gravity = Gravity.CenterHorizontal;
+            frameWhite.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+            frameWhite.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+            this.AddChidren(frameWhite);
+            //璐﹀彿澶村儚
+            var btnAccountIcon = new PicViewControl(294, 316);
+            btnAccountIcon.Y = Application.GetRealHeight(648);
+            btnAccountIcon.Gravity = Gravity.CenterHorizontal;
+            btnAccountIcon.UnSelectedImagePath = "Account/Cat.png";
+            this.AddChidren(btnAccountIcon);
+            //璐﹀彿
+            var btnAccount = new NormalViewControl(500, 80, true);
+            btnAccount.Y = btnAccountIcon.Bottom;
+            btnAccount.Gravity = Gravity.CenterHorizontal;
+            btnAccount.Text = account;
+            btnAccount.TextColor = ZigbeeColor.Current.GXCTextGrayColor2;
+            btnAccount.TextAlignment = TextAlignment.Center;
+            this.AddChidren(btnAccount);
+            //鎭枩娉ㄥ唽鎴愬姛锛�
+            var btnTip = new NormalViewControl(500, 80, true);
+            btnTip.Y = Application.GetRealHeight(1143);
+            btnTip.Gravity = Gravity.CenterHorizontal;
+            btnTip.TextID = R.MyInternationalizationString.RegisterSuccessTip;
+            btnTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor2;
+            btnTip.TextAlignment = TextAlignment.Center;
+            btnTip.TextSize = 16;
+            btnTip.IsBold = true;
+            this.AddChidren(btnTip);
+            //鍗冲皢鑷姩鐧诲綍
+            var btnWillLogin = new NormalViewControl(500, 80, true);
+            btnWillLogin.Y = btnTip.Bottom + Application.GetRealHeight(15);
+            btnWillLogin.Gravity = Gravity.CenterHorizontal;
+            btnWillLogin.TextID = R.MyInternationalizationString.WillAutoLogin;
+            btnWillLogin.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
+            btnWillLogin.TextAlignment = TextAlignment.Center;
+            AddChidren(btnWillLogin);
 
-            var blackBG = new FrameLayout()
-            {
-                Y = Application.GetRealHeight(527),
-                Width = Application.GetRealWidth(688),
-                Height = Application.GetRealHeight(274),
-                Gravity = Gravity.CenterHorizontal,
-                BackgroundColor = ZigbeeColor.Current.GXCBlackBackgroundColor
-            };
-            AddChidren(blackBG);
-
-            var whiteBG = new FrameLayout()
-            {
-                Y = blackBG.Bottom,
-                Width = Application.GetRealWidth(688),
-                Height = Application.GetRealHeight(579),
-                Gravity = Gravity.CenterHorizontal,
-                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
-            };
-            AddChidren(whiteBG);
-
-            var accountImg = new Button()
-            {
-                Y = Application.GetRealHeight(648),
-                Width = Application.GetMinRealAverage(294),
-                Height = Application.GetMinRealAverage(316),
-                Gravity = Gravity.CenterHorizontal,
-                UnSelectedImagePath = "Account/Cat.png"
-            };
-            AddChidren(accountImg);
-
-            var accountBtn = new Button()
-            {
-                Y = accountImg.Bottom,
-                Width = Application.GetRealWidth(500),
-                Height = Application.GetRealHeight(80),
-                Gravity = Gravity.CenterHorizontal,
-                Text = account,
-                TextColor = ZigbeeColor.Current.GXCTextGrayColor2,
-                TextSize = 14,
-            };
-            AddChidren(accountBtn);
-
-            var tip = new Button()
-            {
-                Y = Application.GetRealHeight(1143),
-                Width = Application.GetRealWidth(500),
-                Height = Application.GetRealHeight(80),
-                Gravity = Gravity.CenterHorizontal,
-                TextID = R.MyInternationalizationString.RegisterSuccessTip,
-                TextColor = ZigbeeColor.Current.GXCTextBlackColor2,
-                TextSize = 16,
-            };
-            AddChidren(tip);
-
-            var willLogin = new Button()
-            {
-                Y = tip.Bottom + Application.GetRealHeight(15),
-                Width = Application.GetRealWidth(500),
-                Height = Application.GetRealHeight(80),
-                Gravity = Gravity.CenterHorizontal,
-                TextID = R.MyInternationalizationString.WillAutoLogin,
-                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
-                TextSize = 14,
-            };
-            AddChidren(willLogin);
-
-            AutoLogin(account, password,OpenID);
-        }
-
+            HdlThreadLogic.Current.RunThread(() =>
+            {
+                System.Threading.Thread.Sleep(2000);
+                //2绉掑悗鑷姩鐧诲綍
+                this.LoginByAccountAndPsw(account, password, OpenID);
+            });
+        }
+
+        #endregion
+
+        #region 鈻� 鑷姩鐧诲綍___________________________
+
         /// <summary>
         /// AutoLogin
         /// </summary>
         /// <param name="account"></param>
         /// <param name="password"></param>
-        private void AutoLogin(string account, string password, string OpenID = "")
+        private void LoginByAccountAndPsw(string account, string password, string OpenID = "")
         {
-            new System.Threading.Thread(() =>
-            {
-                System.Threading.Thread.Sleep(1500);
-                Application.RunOnMainThread(() =>
-                {
-                    try
-                    {
-                        HomePage.Instance.ShowLoginLoadView();
-
-                        CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
-                        Action action = async () => {
-                            var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
-                            if (loginSuccess==1)
-                            {
-                                new System.Threading.Thread(async () =>
-                                {
-                                    if (string.IsNullOrEmpty(OpenID)==false)
-                                    {
-                                        BindAuthUser(Config.Instance.Guid, OpenID);
-                                    }
-                                    //鐧诲綍鎴愬姛
-                                    var homes = await House.GetHomeLists();
-                      
-                                    //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
-                                    //鍚姩ZigBee
-                                    ZigBee.Common.Application.Init();
-
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        CommonPage.Loading.Hide();
-                                        this.RemoveFromParent();
-                                        CommonPage.Instance.RemoveViewByTag("Register");
-                                        CommonPage.Instance.RemoveViewByTag("Login");
-                                        UserPage.Instance.Fresh();
-                                    });
-                                })
-                                { IsBackground = true }.Start();
-
-                            }
-                            else
-                            {
-                                //鏈櫥褰曟垚鍔熷脊鍑虹櫥褰曠晫闈� 鍚屾椂闇�瑕佹爣璁颁负鏈櫥褰曠姸鎬�
-                                Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
-                                Config.Instance.Save();
-                                var login = new AccountLogin { };
-                                CommonPage.Instance.AddChidren(login);
-                                login.Show(account);
-                            }
-                        };
-                        action();
-                    }
-                    catch (Exception ex)
-                    {
-                        var errMsg = ex.Message;
-                    }
-                    finally
-                    {
-                        CommonPage.Loading.Hide();
-                    }
-                });
-            })
-            { IsBackground = true }.Start();
-        }
+            HdlThreadLogic.Current.RunMain(() =>
+            {
+                //鎵撳紑鍚姩椤�
+                HomePage.Instance.ShowLoginLoadView();
+                CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
+                
+                HdlThreadLogic.Current.RunThread(async () =>
+                {
+                    //璐﹀彿瀵嗙爜鐧婚檰
+                    var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
+                    if (loginSuccess == 1)
+                    {
+                        if (string.IsNullOrEmpty(OpenID) == false)
+                        {
+                            //缁戝畾绗笁鏂�
+                            await BindAuthUser(Config.Instance.Guid, OpenID);
+                        }
+                        var homes = await House.GetHomeLists();
+
+                        //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+                        await UserCenterLogic.InitUserCenterMenmoryAndThread();
+                        //鍚姩ZigBee
+                        ZigBee.Common.Application.Init();
+
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            CommonPage.Loading.Hide();
+                            this.RemoveFromParent();
+                            CommonPage.Instance.RemoveViewByTag("Register");
+                            CommonPage.Instance.RemoveViewByTag("Login");
+                            UserPage.Instance.Fresh();
+                        });
+                    }
+                    else
+                    {
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            //鏈櫥褰曟垚鍔熷脊鍑虹櫥褰曠晫闈� 鍚屾椂闇�瑕佹爣璁颁负鏈櫥褰曠姸鎬�
+                            Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+                            Config.Instance.Save();
+                            var login = new AccountLogin();
+                            CommonPage.Instance.AddChidren(login);
+                            login.ShowForm(account);
+                        });
+                    }
+                });
+            });
+        }
+
+        #endregion
+
+        #region 鈻� 缁戝畾绗笁鏂筥________________________
 
         /// <summary>
         /// 缁戝畾
         /// </summary>
         /// <param name="guid"></param>
         /// <param name="openId"></param>
-        private void BindAuthUser(string guid, string openId)
-        {
-            new System.Threading.Thread(async () =>
-            {
-                var auth = new SendDataToServer.BindAuthUser
-                {
-                    AccountGuid = guid,
-                    OpenID = openId
-                };
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
-                var revert = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
-            })
-            {
-                IsBackground = true
-            }.Start();
-        }
+        private async System.Threading.Tasks.Task BindAuthUser(string guid, string openId)
+        {
+            var auth = new SendDataToServer.BindAuthUser();
+            auth.AccountGuid = guid;
+            auth.OpenID = openId;
+
+            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
+            await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0