退出登录时间调整，新风，音乐

wxr

2024-09-14 c00da77d00a479fa5d022346a6d9075f90a5c087

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -2,6 +2,7 @@
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
using HDL_ON.DriverLayer;
using System;

namespace HDL_ON.UI
{
@@ -163,8 +164,25 @@
            bodyView = this;
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
        }

        public void LoadView()
        {
            //try
            //{
            //    if (MainPage.CurPageIndex == 3)
            //    {
            //        Application.RunOnMainThread(() =>
            //        {
            //            this.RemoveFromParent();
            //            return;
            //        });
            //    }
            //}
            //catch (Exception ex)
            //{
            //    MainPage.Log($"界面切换异常:{ex.Message}");
            //}
            MainPage.CurPageIndex = 3;
            #region 个人信息
            topbg = new FrameLayout()
            {
@@ -197,10 +215,10 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
                Text = UserInfo.Current.userName // string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
            };
            personalInfoView.AddChidren(btnUserName);
            if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            if (!string.IsNullOrEmpty(UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            {
                btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
            }
@@ -211,7 +229,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text =  UserInfo.Current.AccountString
                Text = UserInfo.Current.AccountString
            };
            personalInfoView.AddChidren(btnEmail);

@@ -222,7 +240,7 @@
                Width = Application.GetMinRealAverage(84),
                Height = Application.GetMinRealAverage(84),
                Radius = (uint)Application.GetMinRealAverage(42),
                ImagePath =  UserInfo.Current.headImagePagePath
                ImagePath = UserInfo.Current.headImagePagePath
            };
            bodyView.AddChidren(userHeadImageView);
            //if (  UserInfo.Current.headImagePageBytes==null)
@@ -236,7 +254,7 @@
            #endregion

            //体验模式
            if(MainPage.NoLoginMode)
            if (MainPage.NoLoginMode)
            {
                Button btnExit = new Button()
                {
@@ -253,7 +271,7 @@
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                    SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
                };
                if(Language.CurrentLanguage =="Chinese")
                if (Language.CurrentLanguage == "Chinese")
                {
                    btnExit.Text = "退出";
                }
@@ -293,21 +311,23 @@
            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
                && DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
            {
                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()
                {
@@ -356,7 +376,7 @@
                BackgroundImagePath = "PersonalCenter/UserTypebg.png",
            };
            residenceInfoView.AddChidren(userTypeView);
            if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            if (Language.CurrentLanguage != "Chinese")//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                userTypeView.X = Application.GetRealWidth(200);
                userTypeView.Width = Application.GetRealWidth(180);
@@ -583,174 +603,53 @@
                    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);
                    bool needShow = false;
                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl || needShow)
                    {
                        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) {
                        var btnFaceManagementIcon = new Button
                        {
                            Gravity = Gravity.CenterHorizontal,
                            Y = Application.GetRealHeight(5),
                            Width = Application.GetMinRealAverage(30),
                            Height = Application.GetMinRealAverage(30),
                            UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
                        };
                        faceManagementView.AddChidren(btnFaceManagementIcon);
                        var btnFaceManagementText = new Button()
                        {
                            Y = btnResidenceManageIcon.Bottom,
                            Height = Application.GetRealHeight(29),
                            TextID = StringId.GroupControl,
                            TextAlignment = TextAlignment.Center,
                            TextColor = CSS_Color.FirstLevelTitleColor,
                            TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                            IsMoreLines = true,
                        };
                        faceManagementView.AddChidren(btnFaceManagementText);

                    //        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

                        EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
                        {
                            var page = new CombinedDimmingListPage();
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        faceManagementView.MouseUpEventHandler = eventHandler;
                        btnFaceManagementText.MouseUpEventHandler = eventHandler;
                        btnFaceManagementIcon.MouseUpEventHandler = eventHandler;
                        #endregion
                    }
                }
            }
            else
@@ -1034,7 +933,7 @@
            #endregion

            #region Siri
            #if __IOS__
#if __IOS__
            //if (Application.PhoneType >= 12)
            {
                supportViewCellCount++;
@@ -1067,10 +966,11 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.TextFontSize
                };
                if(Language.CurrentLanguage == "Chinese")
                if (Language.CurrentLanguage == "Chinese")
                {
                    btnSiriText.Text = "Siri快捷方式";
                }else
                }
                else
                {
                    btnSiriText.Text = "Siri Shortcut";
                }
@@ -1078,8 +978,9 @@
                siriView.AddChidren(btnSiriText);


                btnSiriText.MouseUpEventHandler = (sender, e) => {
                    var ddd =new Other.SkipControl();
                btnSiriText.MouseUpEventHandler = (sender, e) =>
                {
                    var ddd = new Other.SkipControl();
                    ddd.SkipSiriView();
                };

@@ -1103,7 +1004,7 @@
                };
                siriView.AddChidren(btnSmartSpeakerViewLine);
            }
            #endif
#endif
            #endregion

            #region 获取支持