~wjc/HomeApp.git

			@@ -215,14 +215,14 @@
			/// 执行二次安全验证(三种验证的标题使用默认值：Touch ID验证,密码验证,手势验证)
			/// </summary>
			/// <param name="SuccessAction">如果设置有验证方式,并且验证成功后才会调用的回调函数,不然不会调用这个东西</param>
			/// <param name="FailAction">如果完全没有设置有验证方式,才会调用的回调函数,不然不会调用这个东西(取消输入不会调用这个东西)</param>
			public void CheckSecondarySecurity(Action SuccessAction, Action FailAction = null)
			/// <param name="NotSettionAction">如果完全没有设置有验证方式,才会调用的回调函数,不然不会调用这个东西(取消输入不会调用这个东西)</param>
			public void CheckSecondarySecurity(Action SuccessAction, Action NotSettionAction = null)
			{
			CheckSecondarySecurity(
			Language.StringByID(R.MyInternationalizationString.uTouchIDCheck),
			Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication),
			Language.StringByID(R.MyInternationalizationString.uGestureAuthentication),
			SuccessAction, FailAction);
			SuccessAction, NotSettionAction);
			}

			/// <summary>
			@@ -232,14 +232,14 @@
			/// <param name="i_PasswordText">密码验证的显示文本</param>
			/// <param name="i_GestureText">手势验证的显示文本</param>
			/// <param name="SuccessAction">如果设置有验证方式,并且验证成功后才会调用的回调函数,不然不会调用这个东西</param>
			/// <param name="FailAction">如果完全没有设置有验证方式,才会调用的回调函数,不然不会调用这个东西(取消输入不会调用这个东西)</param>
			public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action FailAction = null)
			/// <param name="NotSettionAction">如果完全没有设置有验证方式,才会调用的回调函数,不然不会调用这个东西(取消输入不会调用这个东西)</param>
			public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action NotSettionAction = null)
			{
			//先把这个东西置空
			TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;

			TouchIDUtils.TouchIDSupperType type = TouchIDUtils.getTouchIDSupperType();
			if (type == TouchIDUtils.TouchIDSupperType.TouchID && UserCenterResourse.Option.FingerprintAuthentication == true)
			if (type == TouchIDUtils.TouchIDSupperType.TouchID && UserCenterResourse.AccountOption.FingerprintAuthentication == true)
			{
			//Touch ID验证
			TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent += (sender2, e2) =>
			@@ -254,15 +254,15 @@
			else if (e2 == TouchIDUtils.TouchIDState.InputPassword)
			{
			//密码验证
			if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
			if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
			{
			var form = new SecondaryPswSecurityForm();
			var form = new PswSecondarySecurityForm();
			form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
			}
			//手势验证
			else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
			else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
			{
			var form = new GesturePswSecirityForm();
			var form = new PswGestureSecirityForm();
			form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
			}
			else
			@@ -274,28 +274,28 @@
			}
			};
			TouchIDUtils.Instance.showTouchIDWithDescribe(null, null);
			FailAction = null;
			NotSettionAction = null;
			}
			else if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
			else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
			{
			//密码验证
			var form = new SecondaryPswSecurityForm();
			var form = new PswSecondarySecurityForm();
			form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
			FailAction = null;
			NotSettionAction = null;
			}
			else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
			else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
			{
			//手势验证
			var form = new GesturePswSecirityForm();
			var form = new PswGestureSecirityForm();
			form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
			FailAction = null;
			NotSettionAction = null;
			}
			else
			{
			//完全没有设置有任何验证方式
			SuccessAction = null;
			FailAction?.Invoke();
			FailAction = null;
			NotSettionAction?.Invoke();
			NotSettionAction = null;
			}
			}