From c2692f1e148874b9146f3b819061ed12263c5b0c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 03 三月 2023 13:31:48 +0800
Subject: [PATCH] 人脸管理
---
HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL-ON_Android/Assets/Language.ini | 16 +++
HDL-ON_Android/Resources/values/styles.xml | 4
HDL_ON/Common/OnAppConfig.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 204 +++++++++++++++++++++++++++++++++++++---
HDL_ON/Common/R.cs | 12 ++
HDL_ON/HDL_ON.projitems | 1
8 files changed, 224 insertions(+), 18 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 5be477b..865e08c 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -571,6 +571,9 @@
584=Deployment status
585=Failed to obtain third-party platform information
586=Sort
+587=Face management
+588=Tip
+589=Disagree
2532=Visitor Invitation Record
@@ -1812,7 +1815,9 @@
584=甯冮槻鐘舵��
585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
586=鎺掑簭
-
+587=浜鸿劯绠＄悊
+588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+589=涓嶅悓鎰�
2532=璁垮閭�璇疯褰�
2533=璁垮绠＄悊
@@ -3029,6 +3034,9 @@
584=Deployment status
585=Failed to obtain third-party platform information
586=Sort
+587=Face management
+588=Tip
+589=Disagree
2532=Visitor Invitation Record
@@ -4249,6 +4257,9 @@
584=Deployment status
585=Failed to obtain third-party platform information
586=Sort
+587=Face management
+588=Tip
+589=Disagree
@@ -5455,6 +5466,9 @@
584=Deployment status
585=Failed to obtain third-party platform information
586=Sort
+587=Face management
+588=Tip
+589=Disagree
1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png
new file mode 100644
index 0000000..90ba0a4
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index cfd34e6..797f9fd 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -419,6 +419,7 @@
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FaceManagementIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_Android/Resources/values/styles.xml b/HDL-ON_Android/Resources/values/styles.xml
index e025194..23825bc 100644
--- a/HDL-ON_Android/Resources/values/styles.xml
+++ b/HDL-ON_Android/Resources/values/styles.xml
@@ -2,7 +2,7 @@
<resources >
<!-- 鍏朵腑parent鍙互涓� android:Theme 鎴� android:Theme.NoTitleBar; android:windowBackground鍙互涓鸿儗鏅浘 -->
<style name="MyTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
- <item name="android:windowBackground">@drawable/launchimage</item>
+ <item name="android:windowBackground">@drawable/loading</item>
<!-- 闅愯棌鐘舵�佹爮 -->
<item name="android:windowFullscreen">false</item>
<!-- 闅愯棌鏍囬鏍� -->
@@ -11,7 +11,7 @@
</style>
<style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
- <item name="android:windowBackground">@drawable/launchimage</item>
+ <item name="android:windowBackground">@drawable/loading</item>
<!-- 闅愯棌鐘舵�佹爮 -->
<item name="android:windowFullscreen">true</item>
<!-- 闅愯棌鏍囬鏍� -->
diff --git a/HDL_ON/Common/OnAppConfig.cs b/HDL_ON/Common/OnAppConfig.cs
index 2bc3220..884c037 100644
--- a/HDL_ON/Common/OnAppConfig.cs
+++ b/HDL_ON/Common/OnAppConfig.cs
@@ -94,6 +94,10 @@
/// 绗竴娆″惎鍔╝pp
/// </summary>
public bool FirstRunApp = true;
+ /// <summary>
+ /// 鏄惁鍚屾剰浜鸿劯閲囬泦鍗忚
+ /// </summary>
+ public bool FaceManagementTip = false;
/// <summary>
/// 蹇界暐鏇存柊鐨勭増鏈彿
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 229087a..c7c581f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,18 @@
public static class StringId
{
/// <summary>
+ /// 涓嶅悓鎰�
+ /// </summary>
+ public const int Disagree = 589;
+ /// <summary>
+ /// 浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+ /// </summary>
+ public const int FaceProtocolPrompt = 588;
+ /// <summary>
+ /// 浜鸿劯绠＄悊
+ /// </summary>
+ public const int FaceManagemant = 587;
+ /// <summary>
/// 鎺掑簭
/// </summary>
public const int Sort = 586;
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index d13e5e1..626e01d 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -556,5 +556,6 @@
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\LightScene\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Acst\" />
+ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 3c86be0..ec62276 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -290,22 +290,24 @@
{
contentView.RemoveAll();
+ var residenceFunctionCount = 0;
+
#region 浣忓畢淇℃伅鍖哄煙
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
- //{
- // residenceInfoView = new FrameLayout()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(213),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Radius = (uint)Application.GetRealHeight(12),
- // BorderColor = 0x00FFFFFF,
- // BorderWidth = 0,
- // };
- // contentView.AddChidren(residenceInfoView);
- //}
- //else
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ residenceInfoView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(213),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 0,
+ };
+ contentView.AddChidren(residenceInfoView);
+ }
+ else
{
residenceInfoView = new FrameLayout()
{
@@ -388,6 +390,7 @@
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
+ residenceFunctionCount++;
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
{
@@ -420,6 +423,7 @@
residenceManageView.AddChidren(btnResidenceManageText);
#endregion
+ residenceFunctionCount++;
#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
@@ -547,6 +551,7 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
+ residenceFunctionCount++;
#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
@@ -577,6 +582,175 @@
};
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
+
+ residenceFunctionCount++;
+ #region ---浜鸿劯绠＄悊
+ var faceManagementView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(faceManagementView);
+
+ var btnFaceManagementIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/FaceManagementIcon.png",
+ };
+ faceManagementView.AddChidren(btnFaceManagementIcon);
+ var btnFaceManagementText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.FaceManagemant,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ faceManagementView.AddChidren(btnFaceManagementText);
+ btnFaceManagementIcon.MouseUpEventHandler = (sender, e) => {
+ if (OnAppConfig.Instance.FaceManagementTip) {
+
+ return;
+ }
+
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS_Color.DialogTransparentColor1,
+ };
+
+ FrameLayout contentView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(192),
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ BorderColor = 0x00000000,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetMinRealAverage(10),
+ };
+ dialog.AddChidren(contentView);
+
+ Button btnTitle = new Button()
+ {
+ Y = Application.GetRealHeight(16),
+ Height = Application.GetRealHeight(30),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextAlignment = TextAlignment.Center,
+ IsBold = true,
+ TextID = StringId.FaceProtocolPrompt,
+ };
+ contentView.AddChidren(btnTitle);
+
+ Button btnMsg = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(35),
+ Y = btnTitle.Bottom,
+ Width = Application.GetRealHeight(200),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
+ IsMoreLines = true,
+ };
+ contentView.AddChidren(btnMsg);
+
+ Button btnMsg1 = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(15),
+ Y = btnMsg.Bottom,
+ Width = Application.GetRealHeight(200),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ IsMoreLines = true,
+ };
+ contentView.AddChidren(btnMsg1);
+
+ Button btnMsg2 = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(35),
+ Y = btnMsg1.Bottom,
+ Width = Application.GetRealHeight(200),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ IsMoreLines = true,
+ };
+ contentView.AddChidren(btnMsg2);
+
+ Button btnLine = new Button()
+ {
+ Y = Application.GetRealHeight(149),
+ Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(270 / 2),
+ BackgroundColor = CSS.CSS_Color.DividingLineColor,
+ };
+ contentView.AddChidren(btnLine);
+
+ Button btnCancel = new Button()
+ {
+ Y = btnLine.Bottom,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(43),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ //SelectedTextColor = CSS_Color.MainBackgroundColor,
+ //SelectedBackgroundColor = CSS_Color.MainColor,
+ TextID = StringId.Disagree,
+ };
+ contentView.AddChidren(btnCancel);
+
+ Button btnConfirm = new Button()
+ {
+ X = btnCancel.Right,
+ Y = btnLine.Y,
+ Width = Application.GetRealWidth(135),
+ Height = Application.GetRealHeight(45),
+ TextAlignment = TextAlignment.Center,
+ //TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.MainBackgroundColor,
+ BackgroundColor = CSS_Color.MainColor,
+ TextID = StringId.Agree,
+ };
+ contentView.AddChidren(btnConfirm);
+ //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+ int mRectCornerID = HDLUtils.RectCornerBottomRight;
+ btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
+ dialog.Show();
+
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.Close();
+ };
+ btnMsg1.MouseUpEventHandler += (sender, e) =>
+ {
+ string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
+ }
+ new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
+
+ dialog.Close();
+ };
+
+ };
+ #endregion
+
}
}
else
--
Gitblit v1.8.0