Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -230,6 +230,9 @@
                    }
                    //验证码不需要隐藏
                    etPassword.SecureTextEntry = false;
#if __IOS__
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                #endregion
            }
@@ -318,7 +321,7 @@
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
                etPassword.IsNumberKeyboardType = false;
                //etPassword.IsNumberKeyboardType = false;
            }
            //验证码登录
            else if (logintMode == 1)
@@ -347,23 +350,8 @@
                //验证码不需要隐藏
                etPassword.SecureTextEntry = false;
                etPassword.Text = smsCode;
                etPassword.IsNumberKeyboardType = true;
#if __IOS__
                var currentInputMode = UIKit.UITextInputMode.CurrentInputMode;
                var installedInputModes = UIKit.UITextInputMode.ActiveInputModes;
                var temmm = new EditText()
                {
                    X = Application.GetRealWidth(78),
                    Width = Application.GetRealWidth(61 + 84),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextAlignment = TextAlignment.CenterLeft,
                    Foucs = true,
                    BackgroundColor  = 0x44330000,
                };
                passwordView.AddChidren(etPassword); 
                //etPassword.IsNumberKeyboardType = true;

#endif
            }
        }

@@ -457,16 +445,23 @@
                {
                    btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
                    btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    new Thread(() => {
                        for(var i = 0; i < 10; i++)
                        {
                            Application.RunOnMainThread(() =>

#if __IOS__
      new Thread(() => {
                            for(var i = 0; i < 10; i++)
                            {
                                this.Y = 0-Application.GetRealHeight(10 * i);
                            });
                            Thread.Sleep(10);
                        }
                    }) { IsBackground = true }.Start();
                                Application.RunOnMainThread(() =>
                                {
                                    this.Y = 0-Application.GetRealHeight(10 * i);
                                });
                                Thread.Sleep(10);
                            }
                        }) { IsBackground = true }.Start();

                    var sst = etPassword.MyTextContentType;
                    Console.WriteLine(sst);
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                else
                {
@@ -484,8 +479,8 @@
            //当焦点在密码文本框时，点击键盘回撤按键，触发的事件
            etPassword.EditorEnterAction += (obj) =>
            {
                LoginEvent();
                Application.HideSoftInput();
                LoginEvent();
            };
        }

@@ -642,6 +637,7 @@
                            {
                                //跳转页面----
                                MainPage.GoUserPage(true);
                                this.RemoveFromParent();
                                return;
                            }
                        });
@@ -652,46 +648,20 @@
                        var getResidencesResult = LoadMethod_GetResidences();
                        if (getResidencesResult)
                        {
                            /*
                             * Wait : 推送注册
                             */

                            /*
                             * 查看本地是否存在数据
                             * 存在则导出
                             */
                            //var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
                            //if (isExis)
                            //{
                            //    FileUtils.DeleteAllFile();
                            //    string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
                            //    FileUtils.RestoreRegionFiles(regionRootPath);
                            //    DB_ResidenceData.residenceData.EixtAccount();
                            //    OnAppConfig.Instance.RefreshUserConfig();
                            //    SpatialInfo.CurrentSpatial.InitRoomFunction();
                            //}
                            Application.RunOnMainThread(() =>
                            {
                                //20201223-登录成功之后，将下载数据完成标记标记为false，防止主页提前加载
                                Common.ApiUtlis.Ins.DownloadDataComplete = false;
                                //跳转页面----
                                MainPage.GoUserPage(true);
                                this.RemoveFromParent();
                            });
                        }
                        else
                        {
                            //Application.RunOnMainThread(() =>
                            //{
                            //    BindingResidencePage page = new BindingResidencePage();
                            //    MainPage.BaseView.AddChidren(page);
                            //    page.LoadView();
                            //});



                            //2020-11-13 待确认
                            //获取住宅失败，重新标记为未登录状态
                            UserInfo.Current.LastTime = DateTime.MinValue;
                            UserInfo.Current.ValidToken = false;
                            UserInfo.Current.SaveUserInfo();
                            //登录失败，请先添加住宅！
                            //Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.FailedGetHomeList));
@@ -735,20 +705,14 @@
                //调用验证码登录接口
                loginResult = pm.LoginValidCode(account, password);
            }
            if(loginResult == null)
            {

                return false;
            }
            if (loginResult.Code == StateCode.SUCCESS)
            {
                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
                // UserInfo.Current = new UserInfo
                //{
                //    userType = revertData.userType,
                //    accountString = account,
                //    password = password,
                //    lastTime = DateTime.Now,
                //    ID = revertData.userId,
                //    loginTokenString = revertData.headerPrefix + revertData.accessToken,
                //    refreshToken = revertData.refreshToken,
                //    userName = revertData.name
                //};
                if (OnAppConfig.Instance.LastLoginUserId != revertData.userId)
                {
                    OnAppConfig.Instance.LastLoginUserId = revertData.userId;
@@ -757,17 +721,12 @@
                UserInfo.Current.ClearUserInfo();
                UserInfo.Current.userType = revertData.userType;
                UserInfo.Current.AccountString = account;
                //UserInfo.Current.password = password;
                UserInfo.Current.LastTime = DateTime.Now;
                UserInfo.Current.ValidToken = true;
                UserInfo.Current.ID = revertData.userId;
                UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
                UserInfo.Current.AccessToken = revertData.accessToken;
                UserInfo.Current.RefreshToken = revertData.refreshToken;
                UserInfo.Current.userName = revertData.name;
                //UserInfo.Current.userMobileInfo = "";//重置用户手机
                //UserInfo.Current.userEmailInfo = "";//重置用户邮箱
                //UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//
                //UserInfo.Current.CurrentRegion.RegionID = "";
                UserInfo.Current.SaveUserInfo();
                MainPage.Log("登录成功。");
#if __IOS__