~wjc/HDL_APP_Project.git

			@@ -147,11 +147,11 @@
			this.RemoveFromParent();
			return;
			}
			if (MainPage.LoginUser.appUnlockType.Contains("2"))
			if (OnAppConfig.Instance.appUnlockType.Contains("2"))
			{
			MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
			MainPage.LoginUser.appUnlockPasswrod = "";
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
			OnAppConfig.Instance.appUnlockPasswrod = "";
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			backAction();
			}
			@@ -168,36 +168,36 @@
			{
			if (passwrod == oldPasswrod)
			{
			if (optionType == "5" )//&& MainPage.LoginUser.appUnlockType.Contains("3"))
			if (optionType == "5" )//&& OnAppConfig.Instance.appUnlockType.Contains("3"))
			{
			if (MainPage.LoginUser.appUnlockType.Contains("3"))
			MainPage.LoginUser.appUnlockType.Remove("3");
			if (OnAppConfig.Instance.appUnlockType.Contains("3"))
			OnAppConfig.Instance.appUnlockType.Remove("3");
			else
			MainPage.LoginUser.appUnlockType.Add("3");
			OnAppConfig.Instance.appUnlockType.Add("3");

			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			}
			if ( optionType == "6")
			{
			if (MainPage.LoginUser.appUnlockType.Contains("4"))
			MainPage.LoginUser.appUnlockType.Remove("4");
			if (OnAppConfig.Instance.appUnlockType.Contains("4"))
			OnAppConfig.Instance.appUnlockType.Remove("4");
			else
			MainPage.LoginUser.appUnlockType.Add("4");
			OnAppConfig.Instance.appUnlockType.Add("4");

			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			}
			if (optionType == "8" && !MainPage.LoginUser.appUnlockType.Contains("3"))
			if (optionType == "8" && !OnAppConfig.Instance.appUnlockType.Contains("3"))
			{
			MainPage.LoginUser.appUnlockType.Add("3");
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.appUnlockType.Add("3");
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			}
			if (!MainPage.LoginUser.appUnlockType.Contains("4") && optionType == "9")
			if (!OnAppConfig.Instance.appUnlockType.Contains("4") && optionType == "9")
			{
			MainPage.LoginUser.appUnlockType.Remove("4");
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.appUnlockType.Remove("4");
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			}
			backAction();
			@@ -226,29 +226,29 @@
			var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
			if (result)
			{
			if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
			if (!OnAppConfig.Instance.appUnlockType.Contains(unlockType))
			{
			MainPage.LoginUser.appUnlockType.Add(unlockType);
			OnAppConfig.Instance.appUnlockType.Add(unlockType);
			}
			}
			else
			{
			if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
			if (OnAppConfig.Instance.appUnlockType.Contains(unlockType))
			{
			MainPage.LoginUser.appUnlockType.Remove(unlockType);
			OnAppConfig.Instance.appUnlockType.Remove(unlockType);
			}
			}
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.SaveUserConfig();
			backAction();
			};
			page.AdditionalOperations(tipMsg, action);
			}
			if (!MainPage.LoginUser.appUnlockType.Contains("2"))
			if (!OnAppConfig.Instance.appUnlockType.Contains("2"))
			{
			MainPage.LoginUser.appUnlockType.Add("2");
			OnAppConfig.Instance.appUnlockType.Add("2");
			}
			MainPage.LoginUser.appUnlockPasswrod = passwrod;
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.appUnlockPasswrod = passwrod;
			OnAppConfig.Instance.SaveUserConfig();
			backAction();
			}
			else
			@@ -285,9 +285,9 @@
			var loginResult = new DAL.Server.HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
			if (loginResult.StateCode.ToUpper() == "SUCCESS")
			{
			MainPage.LoginUser.appUnlockPasswrod = "";
			MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
			MainPage.LoginUser.SaveUserInfo();
			OnAppConfig.Instance.appUnlockPasswrod = "";
			OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
			OnAppConfig.Instance.SaveUserConfig();
			this.RemoveFromParent();
			backAction();
			}