20200914

wxr

2020-09-14 a251442d9fc088b3d8cf74d20b959f0f6103b095

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

@@ -7,7 +7,6 @@
   /// </summary>
    public class AppUnlockPage
    {
        DateTime unlockTime = DateTime.MinValue;
        void LoadOption()
        {
            if (MainPage.LoginUser == null)
@@ -16,10 +15,10 @@
            }
            Action action = () =>
            {
                unlockTime = DateTime.Now;
                OnAppConfig.Instance.unlockTime = DateTime.Now;
            };
            //1:验证指纹
            if (MainPage.LoginUser.appUnlockType.Contains("3"))
            if (OnAppConfig.Instance.appUnlockType.Contains("3"))
            {
                Action fAction = () =>
                {
@@ -32,23 +31,23 @@
                    if (e == TouchIDUtils.TouchIDState.Success)
                    {
                        MainPage.Log("KK:TouchID验证成功");
                        unlockTime = DateTime.Now;
                        OnAppConfig.Instance.unlockTime = DateTime.Now;
                        MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                    }
                    else
                    {
                        ///将验证指纹的页面移除
                        MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                        if (MainPage.LoginUser.appUnlockType.Contains("1"))
                        if (OnAppConfig.Instance.appUnlockType.Contains("1"))
                        {
                            var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                            var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage("7");
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        }
                        else if (MainPage.LoginUser.appUnlockType.Contains("2"))
                        else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
                        {
                            var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                            var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage("7");
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -57,20 +56,20 @@
                    }
                };
            }
            else if (MainPage.LoginUser.appUnlockType.Contains("4"))
            else if (OnAppConfig.Instance.appUnlockType.Contains("4"))
            {
                //Face ID验证
                //
            }
            else if (MainPage.LoginUser.appUnlockType.Contains("1"))
            else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
            {
                var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage("7");
            }
            else if (MainPage.LoginUser.appUnlockType.Contains("2"))
            else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
            {
                var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage("7");
            }
@@ -110,7 +109,7 @@

            if (optionType == "7")
            {
                if (unlockTime.AddSeconds(60) > DateTime.Now || MainPage.LoginUser.appUnlockPasswrod == "" || MainPage.LoginUser.appUnlockPage.Count == 0)
                if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
                {
                    return;
                }
@@ -159,7 +158,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS.CSS_Color.MainColor,
                TextSize = CSS.CSS_FontSize.TextFontSize,
                TextID = MainPage.LoginUser.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
                TextID = OnAppConfig.Instance.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
            };
            bodyView.AddChidren(btnOtherVerify);

@@ -169,18 +168,18 @@
                MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                Action action = () =>
                {
                    unlockTime = DateTime.Now;
                    OnAppConfig.Instance.unlockTime = DateTime.Now;
                };
                if (MainPage.LoginUser.appUnlockType.Contains("1"))
                if (OnAppConfig.Instance.appUnlockType.Contains("1"))
                {
                    var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                    var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else if (MainPage.LoginUser.appUnlockType.Contains("2"))
                else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
                {
                    var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                    var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;