From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 144 +++++++++++++++++++++++++++++++++++------------
1 files changed, 106 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 8c65a3e..1c7a8bd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -1,4 +1,5 @@
锘� using System;
+using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
@@ -259,11 +260,17 @@
/// </summary>
optionListView = new VerticalScrolViewLayout()
{
- Height = Application.GetRealHeight(51 * (6+1)),
+ 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>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -547,7 +554,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.AddResidence,
+ TextID = StringId.ScanQRCoden,
};
addResidenceView.AddChidren(btnAddResidenceText);
@@ -555,54 +562,115 @@
{
Scan.OpenScan((scanString) =>
{
- //鎵ц缁戝畾浣忓畢
- new BindingResidencePage().DoBindResidence(scanString);
+ if (scanString.StartsWith("source://bind/"))
+ {
+ var waitPage = new Loading();
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Start("Plaese wait...");
+ });
+ var sendString = scanString.Replace("source://bind/", "");
+ MainPage.Log($"缁戝畾source灞�:{sendString}");
+ //缁戝畾source灞�
+ var pack = new HttpServerRequest().BindSourcePanel(sendString);
+ Application.RunOnMainThread(() =>
+ {
+ var title = Language.StringByID(StringId.Tip);
+ var msg = "";
+ if(pack.Code == StateCode.SUCCESS)
+ {
+ if(Language.CurrentLanguage=="Chinese")
+ {
+ msg = "Source灞忕粦瀹氭垚鍔�.";
+ }
+ else
+ {
+ msg = "Source Hub binding succeeded";
+ }
+ new HDL_ON.UI.PublicAssmebly().TipMsg(title, msg);
+ }
+ else
+ {
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ msg = $"Source灞忕粦瀹氬け璐�.({pack.Code})";
+ }
+ else
+ {
+ msg = "Source Hub binding failed";
+ }
+ new HDL_ON.UI.PublicAssmebly().TipMsg(title, msg);
+ }
+ });
+ }
+ catch(Exception ex)
+ { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ //鎵ц缁戝畾浣忓畢
+ 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
-
- #region 涓汉閫夐」-浜鸿劯閫氳绠＄悊
- faceManagementView = new FrameLayout()
+ if (Entity.DB_ResidenceData.Instance.SupportFacePass)
{
- Height = Application.GetRealHeight(50),
- };
- optionListView.AddChidren(faceManagementView);
+ #region 涓汉閫夐」-浜鸿劯閫氳绠＄悊
+ optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
- 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);
+ faceManagementView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ optionListView.AddChidren(faceManagementView);
- btnFaceManagementText = new Button()
- {
- X = Application.GetRealWidth(16),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.FacePassageSetting,
- };
- faceManagementView.AddChidren(btnFaceManagementText);
+ 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.MouseUpEventHandler = (sender, e) =>
- {
- var page = new FacePassagePage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- };
+ btnFaceManagementText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.FacePassageSetting,
+ };
+ faceManagementView.AddChidren(btnFaceManagementText);
- #endregion
+ btnFaceManagementText.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new FacePassagePage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ #endregion
+ }
#endregion
--
Gitblit v1.8.0