From 3ac6af7a0ea71ab16e76a21ed21d29ae1f942dff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 09:56:25 +0800
Subject: [PATCH] 修复乐橙摄像头云台问题，增加人脸管理功能
---
/dev/null | 0
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 24 +++-
HDL_ON/DAL/Server/HttpUtil.cs | 12 +-
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 226 +++++++++------------------------------------
DLL/LC/Android/LcVideoSdk.dll | 0
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs | 7 +
6 files changed, 75 insertions(+), 194 deletions(-)
diff --git a/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll b/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
deleted file mode 100644
index 2fd62e7..0000000
--- a/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/LC/Android/LcVideoSdk-1.dll b/DLL/LC/Android/LcVideoSdk-1.dll
deleted file mode 100644
index be0179d..0000000
--- a/DLL/LC/Android/LcVideoSdk-1.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/LC/Android/LcVideoSdk.dll b/DLL/LC/Android/LcVideoSdk.dll
index 9c65fd3..5418bb7 100644
--- a/DLL/LC/Android/LcVideoSdk.dll
+++ b/DLL/LC/Android/LcVideoSdk.dll
Binary files differ
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 64fc404..d0b9cf1 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,12 +18,12 @@
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
- //const string APP_KEY = "HDL-HOME-APP-TEST";
- //const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
- public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
- const string APP_KEY = "CPEVRLRT";
- const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ const string APP_KEY = "HDL-HOME-APP-TEST";
+ const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+ //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
+ //const string APP_KEY = "CPEVRLRT";
+ //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
index fc17912..560dd13 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
@@ -220,7 +220,7 @@
Radius = (uint)Application.GetRealWidth(22),
BorderWidth = 0,
BorderColor = 0x00000000,
- BackgroundColor = CSS_Color.WarningColor,
+ BackgroundColor = 0xFFFF7272,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
IsBold = true,
@@ -572,6 +572,11 @@
var pack = new HttpServerRequest().UpdataMemberFace(memberInfo.id, base64string);
if (pack != null)
{
+ var data = Newtonsoft.Json.JsonConvert.DeserializeObject<System.Collections.Generic.Dictionary<string,string>>(pack.Data.ToString());
+ if(data!= null)
+ {
+ data.TryGetValue("userFace",out memberInfo.userFaceUrl);
+ }
Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
if(pack.Code == StateCode.SUCCESS)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index ee381fa..dcf64c7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -81,13 +81,25 @@
btnDelMember = new Button()
{
Y = Application.GetRealHeight(617),
- //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.WarningColor,
+ //Height = Application.GetRealHeight(50),
+ //TextAlignment = TextAlignment.Center,
+ //TextSize = CSS_FontSize.SubheadingFontSize,
+ //TextColor = CSS_Color.WarningColor,
TextID = StringId.RemoveTheMember,
- BackgroundColor = CSS_Color.MainBackgroundColor,
+ //BackgroundColor = CSS_Color.MainBackgroundColor,
+
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(220),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
+ BorderWidth = 0,
+ BorderColor = 0x00000000,
+ BackgroundColor = 0xFFFF7272,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ IsBold = true,
+ TextAlignment = TextAlignment.Center,
+
};
bodyView.AddChidren(btnDelMember);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 04247bf..2cd51bc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -293,21 +293,21 @@
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()
{
@@ -583,173 +583,37 @@
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);
+ 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
+ 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);
+ #endregion
}
}
--
Gitblit v1.8.0