20201211

wei

2020-12-11 488efb508eb0648773fe7b68e810e04bcd7ca075

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs

@@ -149,11 +149,11 @@
                                this.RemoveFromParent();
                                return;
                            }
                            if (OnAppConfig.Instance.appUnlockType.Contains("2"))
                            if (UserInfo.Current.appUnlockType.Contains("2"))
                            {
                                OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
                                OnAppConfig.Instance.appUnlockPasswrod = "";
                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
                                UserInfo.Current.appUnlockPasswrod = "";
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                                backAction();
                            }
@@ -170,36 +170,36 @@
                    {
                        if (passwrod == oldPasswrod)
                        {
                            if (optionType == "5" )//&& OnAppConfig.Instance.appUnlockType.Contains("3"))
                            if (optionType == "5" )//&& UserInfo.Current.appUnlockType.Contains("3"))
                            {
                                if (OnAppConfig.Instance.appUnlockType.Contains("3"))
                                    OnAppConfig.Instance.appUnlockType.Remove("3");
                                if (UserInfo.Current.appUnlockType.Contains("3"))
                                    UserInfo.Current.appUnlockType.Remove("3");
                                else
                                    OnAppConfig.Instance.appUnlockType.Add("3");
                                    UserInfo.Current.appUnlockType.Add("3");

                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                            }
                            if ( optionType == "6")
                            {
                                if (OnAppConfig.Instance.appUnlockType.Contains("4"))
                                    OnAppConfig.Instance.appUnlockType.Remove("4");
                                if (UserInfo.Current.appUnlockType.Contains("4"))
                                    UserInfo.Current.appUnlockType.Remove("4");
                                else
                                    OnAppConfig.Instance.appUnlockType.Add("4");
                                    UserInfo.Current.appUnlockType.Add("4");

                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                            }
                            if (optionType == "8" && !OnAppConfig.Instance.appUnlockType.Contains("3"))
                            if (optionType == "8" && !UserInfo.Current.appUnlockType.Contains("3"))
                            {
                                OnAppConfig.Instance.appUnlockType.Add("3");
                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.appUnlockType.Add("3");
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                            }
                            if (!OnAppConfig.Instance.appUnlockType.Contains("4") && optionType == "9")
                            if (!UserInfo.Current.appUnlockType.Contains("4") && optionType == "9")
                            {
                                OnAppConfig.Instance.appUnlockType.Remove("4");
                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.appUnlockType.Remove("4");
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                            }
                            backAction();
@@ -228,29 +228,29 @@
                                var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
                                if (result)
                                {
                                    if (!OnAppConfig.Instance.appUnlockType.Contains(unlockType))
                                    if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                                    {
                                        OnAppConfig.Instance.appUnlockType.Add(unlockType);
                                        UserInfo.Current.appUnlockType.Add(unlockType);
                                    }
                                }
                                else
                                {
                                    if (OnAppConfig.Instance.appUnlockType.Contains(unlockType))
                                    if (UserInfo.Current.appUnlockType.Contains(unlockType))
                                    {
                                        OnAppConfig.Instance.appUnlockType.Remove(unlockType);
                                        UserInfo.Current.appUnlockType.Remove(unlockType);
                                    }
                                }
                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.SaveUserInfo();
                                backAction();
                            };
                            page.AdditionalOperations(tipMsg, action);
                        }
                        if (!OnAppConfig.Instance.appUnlockType.Contains("2"))
                        if (!UserInfo.Current.appUnlockType.Contains("2"))
                        {
                            OnAppConfig.Instance.appUnlockType.Add("2");
                            UserInfo.Current.appUnlockType.Add("2");
                        }
                        OnAppConfig.Instance.appUnlockPasswrod = passwrod;
                        OnAppConfig.Instance.SaveUserConfig();
                        UserInfo.Current.appUnlockPasswrod = passwrod;
                        UserInfo.Current.SaveUserInfo();
                        backAction();
                    }
                    else
@@ -287,9 +287,9 @@
                            var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.AccountString, pw);
                            if (resultObj.Code == StateCode.SUCCESS)
                            {
                                OnAppConfig.Instance.appUnlockPasswrod = "";
                                OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
                                OnAppConfig.Instance.SaveUserConfig();
                                UserInfo.Current.appUnlockPasswrod = "";
                                UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
                                UserInfo.Current.SaveUserInfo();
                                this.RemoveFromParent();
                                backAction();
                            }