~wxr/HDL_APP_Project.git

			@@ -25,6 +25,7 @@
			public AppUnlockGesturePage(string pw, Action action)
			{
			bodyView = this;
			bodyView.Tag = "unlockpage";
			oldPasswrod = pw;
			backAction = action;
			}
			@@ -66,7 +67,7 @@
			IsBold = true,
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
			TextID = optionType == "7" ? StringId.SetGesturePassword : StringId.VerifyGesturePassword,
			TextID = StringId.VerifyGesturePassword,
			};
			bodyView.AddChidren(btnTipTitle);

			@@ -79,14 +80,27 @@
			TextColor = CSS_Color.TextualColor,
			SelectedTextColor = CSS_Color.WarningColor,
			TextSize = CSS_FontSize.TextFontSize,
			TextID = optionType == "2" ? StringId.DrawUnlockPatternAgain : StringId.DrawUnlockPattern,
			TextID = StringId.DrawUnlockPattern,
			};
			bodyView.AddChidren(btnTipMsg);

			if (optionType == "7")
			if (optionType == "1")
			{
			btnTipTitle.TextID = StringId.DrawUnlockPattern;
			btnTipMsg.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.DrawUnlockPattern : StringId.DrawUnlockPatternAgain;
			//设置手势密码
			btnTipTitle.TextID = StringId.SetGesturePassword;
			}else if(optionType == "2")
			{
			//请输入原手势密码
			btnTipTitle.TextID = StringId.PleaseDrawTheOriginalGesturePassword;
			}

			//if (optionType == "7")
			//{
			// //请绘制解锁图案
			// btnTipTitle.TextID = StringId.DrawUnlockPattern;
			//}


			GestureLockView mGestureLockView = new GestureLockView
			{
			@@ -140,17 +154,16 @@

			};


			//加载底部验证按钮
			if (optionType == "5" \|\| optionType == "6")
			{
			//输入登录密码验证提示按钮
			AddInputPasswordTipButton(optionType);
			}
			else if (optionType == "7")

			if (optionType == "7")
			{
			//使用账户密码登录按钮提示按钮
			AddLoginTipButton();
			}
			else if (optionType != "1")
			{
			//输入登录密码验证提示按钮
			AddInputPasswordTipButton(optionType);
			}


			@@ -383,27 +396,67 @@
			//输入登录密码验证
			Action<string> action = (pw) =>
			{
			var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
			if (resultObj.Code == StateCode.SUCCESS)
			{
			//UserInfo.Current.appUnlockPasswrod = "";
			//UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
			//UserInfo.Current.SaveUserInfo();
			//this.RemoveFromParent();
			//backAction();
			PasswordInputPassed(optionType);
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
			});
			}
			AuthenticationByLoginPassword(pw, optionType);
			//var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
			//if (resultObj.Code == StateCode.SUCCESS)
			//{
			// PasswordInputPassed(optionType);
			//}
			//else
			//{
			// Application.RunOnMainThread(() =>
			// {
			// Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
			// });
			//}

			};
			new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
			};
			}

			/// <summary>
			/// 登录密码验证
			/// </summary>
			/// <param name="pw"></param>
			/// <param name="optionType"></param>
			void AuthenticationByLoginPassword(string pw, string optionType)
			{
			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));

			new System.Threading.Thread(() =>
			{
			try
			{
			var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
			Application.RunOnMainThread(() =>
			{
			if (resultObj.Code == StateCode.SUCCESS)
			{
			PasswordInputPassed(optionType);
			}
			else
			{
			Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
			}
			});
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			if (waitPage != null)
			{
			waitPage.RemoveFromParent();
			waitPage = null;
			}
			});
			}
			})
			{ IsBackground = true }.Start();
			}
			}
			}