wxr
2023-03-03 c2692f1e148874b9146f3b819061ed12263c5b0c
人脸管理
1个文件已添加
7个文件已修改
242 ■■■■■ 已修改文件
HDL-ON_Android/Assets/Language.ini 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/values/styles.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/OnAppConfig.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/HDL_ON.projitems 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs 204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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=Влажност в стаята
HDL-ON_Android/Assets/Phone/PersonalCenter/FaceManagementIcon.png
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" />
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>
        <!-- 隐藏标题栏 -->
HDL_ON/Common/OnAppConfig.cs
@@ -94,6 +94,10 @@
        /// 第一次启动app
        /// </summary>
        public bool FirstRunApp = true;
        /// <summary>
        /// 是否同意人脸采集协议
        /// </summary>
        public bool FaceManagementTip = false;
        /// <summary>
        /// 忽略更新的版本号
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;
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>
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 = "    《On 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