~wxr/HDL_APP_Project.git

			@@ -1,4 +1,4 @@
			using System;
			using System;
			using HDL_ON.UI;
			using HDL_ON.UI.CSS;
			using Shared;
			@@ -147,6 +147,33 @@
			Button btnResetPasswordText;
			Button btnResetPasswordRight;
			#endregion


			#region 个人选项-新增住宅
			/// <summary>
			/// 个人选项-新增住宅区域
			/// </summary>
			FrameLayout addResidenceView;
			/// <summary>
			/// 新增住宅提示文本
			/// </summary>
			Button btnAddResidenceText;
			Button btnAddResidenceScan;
			#endregion


			#region 个人选项-人脸通讯管理
			/// <summary>
			/// 个人选项-人脸通行管理行
			/// </summary>
			FrameLayout faceManagementView;
			/// <summary>
			/// 人脸通行管理文本
			/// </summary>
			Button btnFaceManagementText;
			#endregion


			#endregion

			#endregion
			@@ -232,12 +259,17 @@
			/// </summary>
			optionListView = new VerticalScrolViewLayout()
			{
			//Y = headPortraitView.Bottom + Application.GetRealHeight(8),
			Height = Application.GetRealHeight(51 * 5),
			Height = Application.GetRealHeight(51 * 6),
			BackgroundColor = CSS_Color.MainBackgroundColor,
			ScrollEnabled = false,
			};
			bodyScrolView.AddChidren(optionListView);

			if(Entity.DB_ResidenceData.Instance.SupportFacePass)
			{
			optionListView.Height = Application.GetRealHeight(51 * (6 + 1));
			}

			#region 个人选项-名字区域
			/// <summary>
			/// 个人选项-名字区域
			@@ -465,7 +497,6 @@
			UnSelectedImagePath = "Public/Right.png",
			};
			thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
			//optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
			#endregion
			#region 个人选项-修改登录密码区域
			/// <summary>
			@@ -498,8 +529,87 @@
			UnSelectedImagePath = "Public/Right.png",
			};
			resetPasswordView.AddChidren(btnResetPasswordRight);
			//optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
			optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
			#endregion

			#region 个人选项-添加住宅
			addResidenceView = new FrameLayout()
			{
			Height = Application.GetRealHeight(50),
			};
			optionListView.AddChidren(addResidenceView);
			btnAddResidenceScan = new Button()
			{
			X = Application.GetRealWidth(319),
			Gravity = Gravity.CenterVertical,
			Width = Application.GetMinRealAverage(30),
			Height = Application.GetMinRealAverage(30),
			UnSelectedImagePath = "Public/ScanGrey.png",
			};
			addResidenceView.AddChidren(btnAddResidenceScan);
			btnAddResidenceText = new Button()
			{
			X = Application.GetRealWidth(16),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.SubheadingFontSize,
			TextID = StringId.AddResidence,
			};
			addResidenceView.AddChidren(btnAddResidenceText);

			btnAddResidenceText.MouseUpEventHandler = (sender, e) =>
			{
			Scan.OpenScan((scanString) =>
			{
			//执行绑定住宅
			new BindingResidencePage().DoBindResidence(scanString);
			});
			};

			optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
			#endregion

			if (Entity.DB_ResidenceData.Instance.SupportFacePass)
			{
			#region 个人选项-人脸通行管理
			faceManagementView = new FrameLayout()
			{
			Height = Application.GetRealHeight(50),
			};
			optionListView.AddChidren(faceManagementView);

			var btnFaceManagementRight = new Button()
			{
			X = Application.GetRealWidth(339),
			Gravity = Gravity.CenterVertical,
			Width = Application.GetMinRealAverage(16),
			Height = Application.GetMinRealAverage(16),
			UnSelectedImagePath = "Public/Right.png",
			};
			faceManagementView.AddChidren(btnFaceManagementRight);

			btnFaceManagementText = new Button()
			{
			X = Application.GetRealWidth(16),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.SubheadingFontSize,
			TextID = StringId.FacePassageSetting,
			};
			faceManagementView.AddChidren(btnFaceManagementText);

			btnFaceManagementText.MouseUpEventHandler = (sender, e) =>
			{
			var page = new FacePassagePage();
			MainPage.BasePageView.AddChidren(page);
			page.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};

			#endregion

			}

			#endregion

			#region 解锁设置区域
			@@ -514,7 +624,7 @@
			interpretationSettingsView = new FrameLayout()
			{
			BackgroundColor = CSS_Color.MainBackgroundColor,
			Height = Application.GetRealHeight(66),
			Height = Application.GetRealHeight(70),
			};
			bodyScrolView.AddChidren(interpretationSettingsView);
			if(Language.CurrentLanguage != "Chinese")
			@@ -538,7 +648,7 @@
			X = Application.GetRealWidth(16),
			Y = btnInterpretationSettingsTitle.Bottom,
			Height = Application.GetRealHeight(32),
			Width = Application.GetRealWidth(290),
			Width = Application.GetRealWidth(310),
			TextAlignment = TextAlignment.TopLeft,
			TextColor = CSS_Color.PromptingColor1,
			TextSize = CSS_FontSize.TextFontSize,