20201215-1

wei

2020-12-15 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

@@ -9,16 +9,17 @@
    {
        void LoadOption()
        {
            if ( UserInfo.Current == null)
            //2020-12-12 未登录或者APP未启动都返回，解决闪退问题
            if ( UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
            {
                return;
            }
            Action action = () =>
            {
                OnAppConfig.Instance.unlockTime = DateTime.Now;
                UserInfo.Current.unlockTime = DateTime.Now;
            };
            //1:验证指纹
            if (OnAppConfig.Instance.appUnlockType.Contains("3"))
            if (UserInfo.Current.appUnlockType.Contains("3"))
            {
                Action fAction = () =>
                {
@@ -31,23 +32,23 @@
                    if (e == TouchIDUtils.TouchIDState.Success)
                    {
                        MainPage.Log("KK:TouchID验证成功");
                        OnAppConfig.Instance.unlockTime = DateTime.Now;
                        UserInfo.Current.unlockTime = DateTime.Now;
                        MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                    }
                    else
                    {
                        ///将验证指纹的页面移除
                        MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                        if (OnAppConfig.Instance.appUnlockType.Contains("1"))
                        if (UserInfo.Current.appUnlockType.Contains("1"))
                        {
                            var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
                            var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage("7");
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        }
                        else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
                        else if (UserInfo.Current.appUnlockType.Contains("2"))
                        {
                            var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
                            var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage("7");
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -56,20 +57,20 @@
                    }
                };
            }
            else if (OnAppConfig.Instance.appUnlockType.Contains("4"))
            else if (UserInfo.Current.appUnlockType.Contains("4"))
            {
                //Face ID验证
                //
                //2020-12-11 待增加面容失败验证页面，不然会导致锁屏加密无效
            }
            else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
            else if (UserInfo.Current.appUnlockType.Contains("1"))
            {
                var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
                var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage("7");
            }
            else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
            else if (UserInfo.Current.appUnlockType.Contains("2"))
            {
                var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
                var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage("7");
            }
@@ -95,13 +96,27 @@

        }

        public void LoadPage()
        /// <summary>
        /// 
        /// </summary>
        /// <param name="isFirstOpen">如果是第一次启动直接弹窗验证密码</param>
        public void LoadPage(bool isFirstOpen = false)
        {
            if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
            try
            {
                return;
                if (!isFirstOpen)
                {
                    if (UserInfo.Current.unlockTime.AddMinutes(5) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0)
                    {
                        return;
                    }
                }
                LoadOption();
            }
            LoadOption();
            catch
            {
                Utlis.WriteLine("AppUnlockPage error");
            }
        }

        /// <summary>
@@ -153,7 +168,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS.CSS_Color.MainColor,
                TextSize = CSS.CSS_FontSize.TextFontSize,
                TextID = OnAppConfig.Instance.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
                TextID = UserInfo.Current.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
            };
            bodyView.AddChidren(btnOtherVerify);

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