20200612

wxr

2020-06-15 b8e94316e41eba72d927d5ca7d931b26139ee8ff

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

@@ -42,7 +42,7 @@
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(64),
                Height = Application.GetRealWidth(64),
                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
                //UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
            };
            bodyView.AddChidren(btnGestureIcon);

@@ -94,8 +94,6 @@
            {
                //自行验证密码，提示正确或者错误 false为显示红色错误, 自行选择调用时机
                mGestureLockView.showCorrectStatus(false);
                Console.WriteLine("手势密码 : " + selectNumStr + "  selectCount:" + selectCount);

                if (selectCount < 4)
                {
                    btnTipMsg.Text = Language.StringByID(StringId.DrawingLengthError);
@@ -107,23 +105,22 @@

                if (string.IsNullOrEmpty(oldPasswrod))
                {
                    this.RemoveFromParent();
                    var page = new AppUnlockGesturePage(passwrod, backAction);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    //移除当前界面，每次返回都返回到最上级
                    MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
                }
                else
                {
                    if (optionType == "2")
                    {
                        //移除当前界面，每次返回都返回到最上级
                        this.RemoveFromParent();
                        var page = new AppUnlockGesturePage("", backAction);
                        MainPage.BasePageView.AddChidren(page);
                        page.LoadPage("1");
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        //移除当前界面，每次返回都返回到最上级
                        MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
                        return;
                    }
                    if(optionType == "7")
@@ -215,27 +212,30 @@
                        //page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
                        string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
                                        Language.StringByID(StringId.TurnOnFaceIdUnlocking);
                        Action<bool> action = (result) =>
                        if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
                        {
                            var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
                            if (result)
                            Action<bool> action = (result) =>
                            {
                                if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
                                var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
                                if (result)
                                {
                                    MainPage.LoginUser.appUnlockType.Add(unlockType);
                                    if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
                                    {
                                        MainPage.LoginUser.appUnlockType.Add(unlockType);
                                    }
                                }
                            }
                            else
                            {
                                if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
                                else
                                {
                                    MainPage.LoginUser.appUnlockType.Remove(unlockType);
                                    if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
                                    {
                                        MainPage.LoginUser.appUnlockType.Remove(unlockType);
                                    }
                                }
                            }
                            MainPage.LoginUser.SaveUserInfo();
                            backAction();
                        };
                        page.AdditionalOperations(tipMsg, action);
                                MainPage.LoginUser.SaveUserInfo();
                                backAction();
                            };
                            page.AdditionalOperations(tipMsg, action);
                        }
                        if (!MainPage.LoginUser.appUnlockType.Contains("2"))
                        {
                            MainPage.LoginUser.appUnlockType.Add("2");