Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7

Merge branch 'CJL' into NewFilePath

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

@@ -103,7 +103,7 @@
                TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
            };
            //加载UI页面
            LoadGesturePage("7", fingerAction);
            LoadGesturePage("7", fingerAction, null);

            TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
            TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -140,7 +140,10 @@
        /// <summary>
        /// 加载指纹验证界面
        /// </summary>
        public void LoadGesturePage(string optionType, Action fingerAction)
        /// <param name="optionType"></param>
        /// <param name="fingerAction"></param>
        /// <param name="successAction"></param>
        public void LoadGesturePage(string optionType, Action fingerAction, Action successAction)
        {
            var bodyView = new FrameLayout()
            {
@@ -194,25 +197,37 @@
            {
                ///将验证指纹的页面移除
                MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                Action action = () =>
                {
                    UserInfo.Current.unlockTime = DateTime.Now;
                };
                if (UserInfo.Current.appUnlockType.Contains("1"))
                {
                    var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else if (UserInfo.Current.appUnlockType.Contains("2"))
                {
                    var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                //Action action = () =>
                //{
                //    UserInfo.Current.unlockTime = DateTime.Now;
                //};
                //if (UserInfo.Current.appUnlockType.Contains("1"))
                //{
                //    var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
                //    MainPage.BasePageView.AddChidren(page);
                //    page.LoadPage(optionType);
                //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //}
                //else if (UserInfo.Current.appUnlockType.Contains("2"))
                //{
                //    var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
                //    MainPage.BasePageView.AddChidren(page);
                //    page.LoadPage(optionType);
                //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //}

                if (successAction == null)
                {
                    Action action = () =>
                    {
                        UserInfo.Current.unlockTime = DateTime.Now;
                    };
                    GotogoToVerifyPasswordPage(optionType, action);
                }
                else
                {
                    GotogoToVerifyPasswordPage(optionType, successAction);
                }
            };

            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -238,7 +253,7 @@
                TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
            };
            //加载UI页面
            LoadFaceIDGesturePage("7", faceIDAction);
            LoadFaceIDGesturePage("7", faceIDAction, null);

            TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
            TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -273,9 +288,12 @@
        }

        /// <summary>
        /// 加载面容ID验证界面
        ///  加载面容ID验证界面
        /// </summary>
        public void LoadFaceIDGesturePage(string optionType, Action faceIDAction)
        /// <param name="optionType"></param>
        /// <param name="faceIDAction"></param>
        /// <param name="successAction">指定成功的事件回调</param>
        public void LoadFaceIDGesturePage(string optionType, Action faceIDAction, Action successAction)
        {
            var bodyView = new FrameLayout()
            {
@@ -329,23 +347,18 @@
            {
                ///将验证面容ID的页面移除
                MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                Action action = () =>
               
                if (successAction == null)
                {
                    UserInfo.Current.unlockTime = DateTime.Now;
                };
                if (UserInfo.Current.appUnlockType.Contains("1"))
                {
                    var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    Action action = () =>
                    {
                        UserInfo.Current.unlockTime = DateTime.Now;
                    };
                    GotogoToVerifyPasswordPage(optionType, action);
                }
                else if (UserInfo.Current.appUnlockType.Contains("2"))
                else
                {
                    var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(optionType);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    GotogoToVerifyPasswordPage(optionType, successAction);
                }

            };
@@ -354,5 +367,27 @@

        }

        /// <summary>
        /// 跳转手势或者密码验证界面
        /// </summary>
        /// <param name="optionType">1:设置密码；2:验证密码;3:关闭密码;4:关闭解锁设置;5:指纹ID开关；6:面容ID开关;7:解锁验证</param>
        /// <param name="successAction"></param>
        void GotogoToVerifyPasswordPage(string optionType, Action successAction)
        {
            if (UserInfo.Current.appUnlockType.Contains("1"))
            {
                var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, successAction);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage(optionType);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            }
            else if (UserInfo.Current.appUnlockType.Contains("2"))
            {
                var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, successAction);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage(optionType);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            }
        }
    }
}

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

@@ -330,11 +330,33 @@
            //4:面容ID
            string faceIDUnlockType = "4";

            //成功事件
            Action successAction = () =>
            {
                var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
                if (result)
                {
                    if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
                    {
                        UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
                        UserInfo.Current.SaveUserInfo();
                    }
                }
                else
                {
                    if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
                    {
                        UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
                        UserInfo.Current.SaveUserInfo();
                    }
                }
            };

            Action fingerAction = () =>
            {
                TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
            };
            new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction);
            new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction, successAction);

            TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));

@@ -342,24 +364,7 @@
            {
                if (e == TouchIDUtils.TouchIDState.Success)
                {
                    var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
                    if (result)
                    {
                        if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
                        {
                            UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
                            UserInfo.Current.SaveUserInfo();
                        }
                    }
                    else
                    {
                        if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
                        {
                            UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
                            UserInfo.Current.SaveUserInfo();
                        }
                    }
                    //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
                    successAction?.Invoke();
                    MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                }
                else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
@@ -413,12 +418,34 @@
        {
            //5:指纹ID开关
            string optionType = "5";
            //成功事件
            Action successAction = () =>
            {
                var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
                if (result)
                {
                    if (!UserInfo.Current.appUnlockType.Contains("3"))
                    {
                        UserInfo.Current.appUnlockType.Add("3");
                        UserInfo.Current.SaveUserInfo();
                    }
                }
                else
                {
                    if (UserInfo.Current.appUnlockType.Contains("3"))
                    {
                        UserInfo.Current.appUnlockType.Remove("3");
                        UserInfo.Current.SaveUserInfo();
                    }
                }
            };


            Action fingerAction = () =>
            {
                TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
            };
            new AppUnlockPage().LoadGesturePage(optionType, fingerAction);
            new AppUnlockPage().LoadGesturePage(optionType, fingerAction, successAction);

            TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));

@@ -426,23 +453,8 @@
            {
                if (e == TouchIDUtils.TouchIDState.Success)
                {
                    var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
                    if (result)
                    {
                        if (!UserInfo.Current.appUnlockType.Contains("3"))
                        {
                            UserInfo.Current.appUnlockType.Add("3");
                            UserInfo.Current.SaveUserInfo();
                        }
                    }
                    else
                    {
                        if (UserInfo.Current.appUnlockType.Contains("3"))
                        {
                            UserInfo.Current.appUnlockType.Remove("3");
                            UserInfo.Current.SaveUserInfo();
                        }
                    }
                    successAction?.Invoke();

                    MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                }
                else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)