2020-09-02-4

陈嘉乐

2020-09-02 652243206427f35a256400a149a1734085824cb9

 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs

@@ -20,7 +20,7 @@
        /// <summary>

        /// 是否同意隐私协议

        /// </summary>

        private bool isAgreePrivacyPolicy = true;

        private bool isAgreePrivacyPolicy = false;



        #endregion



@@ -52,13 +52,13 @@
            frameMidBack.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;

            this.AddChidren(frameMidBack);



            //HdlHome的图标

            //Evoyo Home的图标

            var btnLogoIcon = new PicViewControl(184, 184);

            btnLogoIcon.Y = Application.GetRealHeight(230);

            btnLogoIcon.UnSelectedImagePath = "Account/Logo_White.png";

            btnLogoIcon.UnSelectedImagePath = "Account/Logo_WhiteHome.png";

            btnLogoIcon.Gravity = Gravity.CenterHorizontal;

            this.AddChidren(btnLogoIcon);

            //Hdl Home

            //Evoyo Home

            var btnLogoName = new NormalViewControl(300, 69, true);

            btnLogoName.Y = btnLogoIcon.Bottom;

            btnLogoName.Gravity = Gravity.CenterHorizontal;

@@ -127,6 +127,9 @@
            frameMidBack.AddChidren(btnLoginByCode);

            btnLoginByCode.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                if (codeDiv == 1)

                {

                    //验证码登陆

@@ -166,6 +169,9 @@
            frameMidBack.AddChidren(btnRegister);

            btnRegister.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                var registerPage = new AccountRegister();

                CommonPage.Instance.AddChidren(registerPage);

                registerPage.Show();

@@ -176,7 +182,7 @@
            btnWebChat.Y = frameMidBack.Height - Application.GetRealHeight(69) - btnWebChat.IconSize;

            btnWebChat.UnSelectedImagePath = "Account/Wechat.png";

            btnWebChat.Gravity = Gravity.CenterHorizontal;

            frameMidBack.AddChidren(btnWebChat);

            //frameMidBack.AddChidren(btnWebChat);

            btnWebChat.ButtonClickEvent += (sender, e) =>

            {

                //微信登陆

@@ -184,7 +190,7 @@
            };



            //添加服务协议控件

            //this.AddServiceAgreementControl(frameMidBack);

            this.AddServiceAgreementControl(frameMidBack);



            //游客体验

            var btnTiyan = new NormalViewControl(300, 100, true);

@@ -197,9 +203,11 @@
            frameMidBack.AddChidren(btnTiyan);

            btnTiyan.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                btnTiyan.CanClick = false;

                //显示启动页

                HomePage.Instance.ShowLoginLoadView();

                HdlThreadLogic.Current.RunThread(() =>

                {

                    //初始化全部体验数据

@@ -381,6 +389,9 @@
            frameWhiteBack.AddChidren(btnForgot);

            btnForgot.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                var forgot = new AccountForgetPWD();

                CommonPage.Instance.AddChidren(forgot);

                forgot.Show();

@@ -557,8 +568,11 @@
            btnSendCode.TextAlignment = TextAlignment.Center;

            btnSendCode.IsBold = true;

            rowVerCode.AddChidren(btnSendCode);

            btnSendCode.ButtonClickEvent += async (sender, e) =>

            btnSendCode.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                //检测输入的账号

                nowInputAccount = txtAccount.Text.Trim();

                if (this.CheckInputAccount("86", nowInputAccount, i_div) == false)

@@ -566,7 +580,7 @@
                    return;

                }

                //发送验证码

                hadSendCode = await this.SendVerCode(btnSendCode, nowInputAccount, i_div);

                hadSendCode = this.SendVerCode(btnSendCode, nowInputAccount, i_div);

            };



            //底线

@@ -600,6 +614,9 @@
            frameWhiteBack.AddChidren(btnForgot);

            btnForgot.ButtonClickEvent += (sender, e) =>

            {

                //检测是否同意服务协议

                if (this.CheckPrivacyPolicy() == false) { return; }



                var forgot = new AccountForgetPWD();

                CommonPage.Instance.AddChidren(forgot);

                forgot.Show();

@@ -744,6 +761,8 @@
        /// <param name="i_div">1:手机号 2:邮箱</param>

        private void LoginByAccountAndPsw(string i_account, string i_psw, int i_div)

        {

            //检测是否同意服务协议

            if (this.CheckPrivacyPolicy() == false) { return; }

            //检测账号

            if (this.CheckInputAccount(string.Empty, i_account, i_div) == false)

            {

@@ -753,7 +772,7 @@
            //登陆中....

            CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //登陆参数

                var pra = new SendDataToServer.LoginObj();

@@ -764,7 +783,7 @@


                //访问接口

                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);

                var result = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));

                var result = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));



                //处理登陆成功的数据

                this.AdjustLoginSuccessData(result, pra, i_account, i_psw, i_div);

@@ -816,6 +835,8 @@
        /// </summary>

        private void LoginByWechat()

        {

            //检测是否同意服务协议

            if (this.CheckPrivacyPolicy() == false) { return; }

#if Android

            com.hdl.home.Application.WXLogin();

            com.hdl.home.WXEntryActivity.RespAction = (authStr) =>

@@ -830,35 +851,38 @@
                {

                    return;

                }

                HdlThreadLogic.Current.RunThread(async () =>

                HdlThreadLogic.Current.RunThread(() =>

                {

                    //是否已经绑定

                    var re = await isBindAuthAsync(authStr);

                    var re = isBindAuthAsync(authStr);

                    if (re)

                    {

                        Application.RunOnMainThread(() =>

                        {

                            //直接登录

                            HomePage.Instance.ShowLoginLoadView();

                        });

                        var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();

                        var homes = await HdlResidenceLogic.Current.GetHomeListsFromDb();

                        ProgressBar.Show(Language.StringByID(R.MyInternationalizationString.Logining));



                        var resultRegID = Shared.Common.CommonPage.Instance.PushRegID();

                        var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);

                        //刷新个人中心的内存及线程

                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();



                        //启动ZigBee

                        ZigBee.Common.Application.Init();



                        Application.RunOnMainThread(() =>

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            ProgressBar.Close();

                            this.RemoveFromParent();

                            CommonPage.Instance.RemoveViewByTag("Login");

                            UserPage.Instance.ReFreshControl();

                            if (result == true)

                            {

                                //false:开启了调试功能

                                UserPage.Instance.ReFreshControl();

                            }

                        });

                    }

                    else

                    {

                        var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);

                        Application.RunOnMainThread(() =>

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            var registerPage = new AccountRegister();

                            CommonPage.Instance.AddChidren(registerPage);

@@ -875,7 +899,7 @@
        /// </summary>

        /// <param name="authStr"></param>

        /// <returns></returns>

        private async System.Threading.Tasks.Task<bool> isBindAuthAsync(string authStr)

        private bool isBindAuthAsync(string authStr)

        {

            var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);

            var auth = new SendDataToServer.AuthUser()

@@ -887,7 +911,7 @@
            //获取微信昵称

            var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + authRes.access_token;

            strUrl += "&openid=" + authRes.openid;

            var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");

            var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");

            if (byteData == null)

            {

                return false;

@@ -897,7 +921,7 @@
            auth.UserName = nickData.nickname;



            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);

            var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));

            var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));

            if (revertObj == null)

            {

                return false;

@@ -932,18 +956,26 @@
        /// <param name="i_account">账号</param>

        /// <param name="i_verCode">验证码</param>

        /// <param name="i_div">1:手机号 2:邮箱</param>

        private async void LoginByVerCode(string i_account, string i_verCode, int i_div)

        private void LoginByVerCode(string i_account, string i_verCode, int i_div)

        {

            var pra = new SendDataToServer.LoginValidCodeOBJ()

            //检测是否同意服务协议

            if (this.CheckPrivacyPolicy() == false) { return; }

            //登陆中....

            CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));



            HdlThreadLogic.Current.RunThread(() =>

            {

                Account = i_account,

                Code = i_verCode,

                Language = CommonPage.ZigBeeLanguage,

                AreaCode = int.Parse(CommonPage.PhoneZoneStr)

            };

            var result = await CommonFormResouce.LoginByCode(pra);

            //处理登陆成功的数据

            this.AdjustLoginSuccessData(result, pra, i_account, string.Empty, i_div);

                var pra = new SendDataToServer.LoginValidCodeOBJ()

                {

                    Account = i_account,

                    Code = i_verCode,

                    Language = CommonPage.ZigBeeLanguage,

                    AreaCode = int.Parse(CommonPage.PhoneZoneStr)

                };

                var result = CommonFormResouce.LoginByCode(pra);

                //处理登陆成功的数据

                this.AdjustLoginSuccessData(result, pra, i_account, string.Empty, i_div);

            });

        }



        /// <summary>

@@ -953,7 +985,7 @@
        /// <param name="account">账号</param>

        /// <param name="i_div">1:手机号 2:邮箱</param>

        /// <returns></returns>

        private async System.Threading.Tasks.Task<bool> SendVerCode(NormalViewControl btnSendCode, string account, int i_div)

        private bool SendVerCode(NormalViewControl btnSendCode, string account, int i_div)

        {

            //不能再点击

            btnSendCode.CanClick = false;

@@ -974,7 +1006,7 @@
                AreaCode = int.Parse(CommonPage.PhoneZoneStr),

                Language = CommonPage.ZigBeeLanguage

            };

            var requestRevertObj = await CommonFormResouce.LoginSendVerCode(reqDtoSignPhone);

            var requestRevertObj = CommonFormResouce.LoginSendVerCode(reqDtoSignPhone);

            if (requestRevertObj == null)

            {

                //请求服务器失败

@@ -1068,7 +1100,7 @@
        /// <param name="i_account">账号</param>

        /// <param name="i_psw">密码，验证码登陆时,设置为 string.Empty</param>

        /// <param name="i_div">1:手机号 2:邮箱</param>

        private async void AdjustLoginSuccessData(Common.ResponseEntity.ResponsePack revertObj, object pra,

        private void AdjustLoginSuccessData(Common.ResponseEntity.ResponsePack revertObj, object pra,

            string i_account, string i_psw, int i_div)

        {

            if (revertObj == null)

@@ -1085,11 +1117,6 @@
            //Error 不能直接从服务器取，只能根据状态码逐一判断

            if (stateCodeStr == "SUCCESS")

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //显示启动页

                    HomePage.Instance.ShowLoginLoadView();

                });

                //存储数据

                var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());

                var revertData = responseDataObj;

@@ -1104,10 +1131,11 @@
                Config.Instance.LoginToken = revertData.Token;

                Config.Instance.Save();



                var resultRegID = await CommonPage.Instance.PushRegID();

                var homes = await HdlResidenceLogic.Current.GetHomeListsFromDb();

                var resultRegID = CommonPage.Instance.PushRegID();

                var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);

                //刷新个人中心的内存及线程

                await UserCenterLogic.InitUserCenterMenmoryAndThread();

                bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();



                //启动ZigBee

                ZigBee.Common.Application.Init();



@@ -1116,7 +1144,11 @@
                    CommonPage.Loading.Hide();

                    this.RemoveFromParent();

                    CommonPage.Instance.RemoveViewByTag("Login");

                    UserPage.Instance.ReFreshControl();

                    if (result == true)

                    {

                        //false:开启了调试功能

                        UserPage.Instance.ReFreshControl();

                    }

                });

                return;

            }