合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs

old mode 100755
new mode 100644
@@ -20,7 +20,7 @@
        /// <summary>

        /// 是否同意隐私协议

        /// </summary>

        private bool isAgreePrivacyPolicy = true;

        private bool isAgreePrivacyPolicy = false;



        #endregion



@@ -55,11 +55,11 @@
            //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);

            //Evoyo Home

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

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

            btnLogoName.Y = btnLogoIcon.Bottom;

            btnLogoName.Gravity = Gravity.CenterHorizontal;

            btnLogoName.TextID = R.MyInternationalizationString.AppName;

@@ -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,6 +203,9 @@
            frameMidBack.AddChidren(btnTiyan);

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

            {

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

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



                btnTiyan.CanClick = false;

                //显示启动页

                HdlThreadLogic.Current.RunThread(() =>

@@ -380,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();

@@ -558,6 +570,9 @@
            rowVerCode.AddChidren(btnSendCode);

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

            {

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

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



                //检测输入的账号

                nowInputAccount = txtAccount.Text.Trim();

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

@@ -599,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();

@@ -666,7 +684,8 @@
            btnMsg2.ButtonClickEvent += (sender, e) =>

            {

                var form = new UserCenter.Abount.SLAForm();

                this.AddChidren(form);

                CommonPage.Instance.AddChidren(form);



                form.InitTopFrameLayout();

                form.InitBodyFrameLayout();

                form.ShowForm();

@@ -743,6 +762,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)

            {

@@ -758,8 +779,6 @@
                var pra = new SendDataToServer.LoginObj();

                pra.Account = i_account;

                pra.Password = i_psw;

                pra.Source = CommonPage.Source;

                pra.Company = CommonPage.Company;



                //访问接口

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

@@ -815,6 +834,8 @@
        /// </summary>

        private void LoginByWechat()

        {

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

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

#if Android

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

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

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

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

        {

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

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

            //登陆中....

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



@@ -1087,6 +1110,7 @@
                    CommonPage.Instance.FailureToServer();

                    CommonPage.Loading.Hide();

                });

                HdlLogLogic.Current.WriteLog(-1, "登陆时,没网络");

                return;

            }

            var stateCodeStr = revertObj.StateCode.ToUpper();

@@ -1113,8 +1137,15 @@
                bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();



                //启动ZigBee

                ZigBee.Common.Application.Init();



                ZigBee.Common.Application.Init();

//#if iOS


//                //初始化全视通
//                Shared.IOS.HDLFVSDK.Video.Init("", revertData.UserID.ToString());

//#endif


                HdlThreadLogic.Current.RunMain(() =>

                {

                    CommonPage.Loading.Hide();

@@ -1167,6 +1198,11 @@
                    //请先获取验证码

                    btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;

                }

                else if (stateCodeStr == "BERESTRICT")

                {

                    //此账号无权登录

                    btnErrorMsg.TextID = R.MyInternationalizationString.ThisAccountHasNoAuthorityToLogin;

                }

                else if (stateCodeStr == "YOUDATANOISLOCALREGION")

                {

                    //不在本区域，需要重定向区域后再次请求登录

@@ -1195,9 +1231,9 @@
            });

        }



        #endregion

#endregion



        #region ■ 一般方法___________________________

#region ■ 一般方法___________________________



        /// <summary>

        /// 检测隐私协议

@@ -1215,6 +1251,6 @@
            return true;

        }



        #endregion

#endregion

    }

}