更新

wxr

2021-12-15 e1a8f2f7e4d850beedeb1469610b878c1427e976

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

@@ -1,6 +1,7 @@
using Shared;
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
using HDL_ON.DriverLayer;

namespace HDL_ON.UI
{
@@ -84,10 +85,10 @@
        /// 区域成员小区域文本
        /// </summary>
        Button btnResidenceMemberText;
        /// <summary>
        /// 区域安放小区域
        /// </summary>
        FrameLayout residenceArmView;
        ///// <summary>
        ///// 区域安放小区域
        ///// </summary>
        //FrameLayout residenceArmView;
        /// <summary>
        /// 区域成安放小区域图标
        /// </summary>
@@ -138,10 +139,10 @@
        /// 获取支持小区域
        /// </summary>
        VerticalScrolViewLayout supportView;
        /// <summary>
        /// 获取支持文本
        /// </summary>
        Button btnSupportText;
        ///// <summary>
        ///// 获取支持文本
        ///// </summary>
        //Button btnSupportText;

        /// <summary>
        /// 关于On文本
@@ -151,6 +152,10 @@
        /// 智能音箱文本
        /// </summary>
        Button btnSmartSpeakerText;
        /// <summary>
        /// Siri文本
        /// </summary>
        Button btnSiriText;


        public PersonalCenterPage()
@@ -250,11 +255,11 @@
                };
                if(Language.CurrentLanguage =="Chinese")
                {
                    btnExit.Text = "退出体验模式";
                    btnExit.Text = "退出";
                }
                else
                {
                    btnExit.Text = "Exit dome";
                    btnExit.Text = "Exit";
                }
                btnExit.MouseUpEventHandler = (sender, e) =>
                {
@@ -282,21 +287,21 @@
            contentView.RemoveAll();

            #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()
                {
@@ -444,34 +449,34 @@
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    #region ---安放区域
                    residenceArmView = new FrameLayout()
                    {
                        X = residenceMemberView.Right,
                        Y = Application.GetRealHeight(68),
                        Width = Application.GetRealWidth(64 + 48),
                        Height = Application.GetRealHeight(64),
                    };
                    residenceInfoView.AddChidren(residenceArmView);
                    btnResidenceArmIcon = new Button
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Y = Application.GetRealHeight(5),
                        Width = Application.GetMinRealAverage(30),
                        Height = Application.GetMinRealAverage(30),
                        UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
                        SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
                    };
                    residenceArmView.AddChidren(btnResidenceArmIcon);
                    btnResidenceArmText = new Button()
                    {
                        Y = btnResidenceManageIcon.Bottom,
                        Height = Application.GetRealHeight(29),
                        TextID = StringId.Undefense,
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.FirstLevelTitleColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    };
                    residenceArmView.AddChidren(btnResidenceArmText);
                    //residenceArmView = new FrameLayout()
                    //{
                    //    X = residenceMemberView.Right,
                    //    Y = Application.GetRealHeight(68),
                    //    Width = Application.GetRealWidth(64 + 48),
                    //    Height = Application.GetRealHeight(64),
                    //};
                    //residenceInfoView.AddChidren(residenceArmView);
                    //btnResidenceArmIcon = new Button
                    //{
                    //    Gravity = Gravity.CenterHorizontal,
                    //    Y = Application.GetRealHeight(5),
                    //    Width = Application.GetMinRealAverage(30),
                    //    Height = Application.GetMinRealAverage(30),
                    //    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
                    //    SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
                    //};
                    //residenceArmView.AddChidren(btnResidenceArmIcon);
                    //btnResidenceArmText = new Button()
                    //{
                    //    Y = btnResidenceManageIcon.Bottom,
                    //    Height = Application.GetRealHeight(29),
                    //    TextID = StringId.Undefense,
                    //    TextAlignment = TextAlignment.Center,
                    //    TextColor = CSS_Color.FirstLevelTitleColor,
                    //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    //};
                    //residenceArmView.AddChidren(btnResidenceArmText);
                    #endregion
                }

@@ -541,9 +546,9 @@
                    #region ---添加功能区域
                    residenceAddFunctionView = new FrameLayout()
                    {
                        //X = residenceMemberView.Right,
                        X = Application.GetRealWidth(28 - 24),
                        Y = residenceManageView.Bottom,
                        X = residenceMemberView.Right,
                        //X = Application.GetRealWidth(28 - 24),
                        Y = Application.GetRealHeight(68),//residenceManageView.Bottom,
                        Width = Application.GetRealWidth(64 + 48),
                        Height = Application.GetRealWidth(64),
                    };
@@ -585,34 +590,34 @@
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    #region ---安放区域
                    residenceArmView = new FrameLayout()
                    {
                        X = Application.GetRealWidth(28 - 24),
                        Y = Application.GetRealHeight(68),
                        Width = Application.GetRealWidth(64 + 48),
                        Height = Application.GetRealWidth(64),
                    };
                    residenceInfoView.AddChidren(residenceArmView);
                    btnResidenceArmIcon = new Button
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Y = Application.GetRealHeight(5),
                        Width = Application.GetMinRealAverage(30),
                        Height = Application.GetMinRealAverage(30),
                        UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
                        SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
                    };
                    residenceArmView.AddChidren(btnResidenceArmIcon);
                    btnResidenceArmText = new Button()
                    {
                        Y = btnResidenceArmIcon.Bottom,
                        Height = Application.GetRealHeight(29),
                        TextID = StringId.Undefense,
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.FirstLevelTitleColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    };
                    residenceArmView.AddChidren(btnResidenceArmText);
                    //residenceArmView = new FrameLayout()
                    //{
                    //    X = Application.GetRealWidth(28 - 24),
                    //    Y = Application.GetRealHeight(68),
                    //    Width = Application.GetRealWidth(64 + 48),
                    //    Height = Application.GetRealWidth(64),
                    //};
                    //residenceInfoView.AddChidren(residenceArmView);
                    //btnResidenceArmIcon = new Button
                    //{
                    //    Gravity = Gravity.CenterHorizontal,
                    //    Y = Application.GetRealHeight(5),
                    //    Width = Application.GetMinRealAverage(30),
                    //    Height = Application.GetMinRealAverage(30),
                    //    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
                    //    SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
                    //};
                    //residenceArmView.AddChidren(btnResidenceArmIcon);
                    //btnResidenceArmText = new Button()
                    //{
                    //    Y = btnResidenceArmIcon.Bottom,
                    //    Height = Application.GetRealHeight(29),
                    //    TextID = StringId.Undefense,
                    //    TextAlignment = TextAlignment.Center,
                    //    TextColor = CSS_Color.FirstLevelTitleColor,
                    //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    //};
                    //residenceArmView.AddChidren(btnResidenceArmText);
                    #endregion
                }
                #region F3阶段
@@ -772,7 +777,7 @@
            #endregion
            #endregion

            #region 智能音箱、获取支持、关于ON+ 等菜单列表
            #region 智能音箱、获取支持、关于On Pro 等菜单列表
            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });

            supportView = new VerticalScrolViewLayout()
@@ -790,12 +795,13 @@
            contentView.AddChidren(supportView);



            int supportViewCellCount = 1;
            #region 智能音箱
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                supportViewCellCount++;
                //supportView 加高 显示3行 3*44
                supportView.Height = Application.GetRealWidth(3*44);
                supportView.Height = Application.GetRealWidth(supportViewCellCount * 44);

                FrameLayout smartSpeakerView = new FrameLayout()
                {
@@ -849,57 +855,174 @@

            #endregion

            #region 获取支持
            FrameLayout supView = new FrameLayout()
            #region Siri
            #if __IOS__
            //if (Application.PhoneType >= 12)
            {
                Height = Application.GetRealWidth(44),
            };
            supportView.AddChidren(supView);
                supportViewCellCount++;
                //supportView 加高 显示3行 3*44
                supportView.Height = Application.GetRealWidth(supportViewCellCount * 44);

            Button btnSupportIcon = new Button()
            {
                X = Application.GetRealWidth(12),
                Y = Application.GetRealWidth(10),
                Width = Application.GetMinRealAverage(24),
                Height = Application.GetMinRealAverage(24),
                UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
            };
            supView.AddChidren(btnSupportIcon);
                FrameLayout siriView = new FrameLayout()
                {
                    Height = Application.GetRealWidth(44),
                };
                supportView.AddChidren(siriView);

            btnSupportText = new Button()
            {
                X = Application.GetRealWidth(48),
                Width = Application.GetRealWidth(270),
                Height = Application.GetRealWidth(44),
                TextID = StringId.GetSupport,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.TextFontSize
            };
            supView.AddChidren(btnSupportText);
                //住宅为当前账号才显示智能音箱入口
                Button btnSiriIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
                    Y = Application.GetRealWidth(10),
                    Width = Application.GetMinRealAverage(24),
                    Height = Application.GetMinRealAverage(24),
                    UnSelectedImagePath = "PersonalCenter/SiriIcon.png",
                };
                siriView.AddChidren(btnSiriIcon);

            Button btnSupportRight = new Button()
            {
                X = Application.GetRealWidth(315),
                Y = Application.GetRealWidth(14),
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            supView.AddChidren(btnSupportRight);
                btnSiriText = new Button()
                {
                    X = Application.GetRealWidth(48),
                    Width = Application.GetRealWidth(270),
                    Height = Application.GetRealWidth(44),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.TextFontSize
                };
                if(Language.CurrentLanguage == "Chinese")
                {
                    btnSiriText.Text = "Siri快捷方式";
                }else
                {
                    btnSiriText.Text = "Siri Shortcut";
                }

            var btnSupportViewLine = new Button()
            {
                X = Application.GetRealWidth(48),
                Y = Application.GetRealWidth(43),
                Height = Application.GetRealHeight(1),
                Width = Application.GetRealWidth(279),
                BackgroundColor = CSS_Color.DividingLineColor
            };
            supView.AddChidren(btnSupportViewLine);
                siriView.AddChidren(btnSiriText);


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

                Button btnSiriRight = new Button()
                {
                    X = Application.GetRealWidth(315),
                    Y = Application.GetRealWidth(14),
                    Width = Application.GetMinRealAverage(16),
                    Height = Application.GetMinRealAverage(16),
                    UnSelectedImagePath = "Public/Right.png",
                };
                siriView.AddChidren(btnSiriRight);

                var btnSmartSpeakerViewLine = new Button()
                {
                    X = Application.GetRealWidth(48),
                    Y = Application.GetRealWidth(43),
                    Height = Application.GetRealHeight(1),
                    Width = Application.GetRealWidth(279),
                    BackgroundColor = CSS_Color.DividingLineColor
                };
                siriView.AddChidren(btnSmartSpeakerViewLine);
            }
            #endif
            #endregion

            #region 关于ON+
            #region 获取支持
            //FrameLayout supView = new FrameLayout()
            //{
            //    Height = Application.GetRealWidth(44),
            //    BackgroundColor = 0xFFFF0000,
            //};
            //supportView.AddChidren(supView);
            //supView.MouseUpEventHandler = (sender, e) => {
            //    Dialog dialog = new Dialog();

            //    var bodyView = new FrameLayout();
            //    dialog.AddChidren(bodyView);

            //    var contentView = new VerticalScrolViewLayout()
            //    {
            //        Height = Application.GetRealHeight(600),
            //        BackgroundColor = CSS_Color.MainBackgroundColor,
            //    };
            //    bodyView.AddChidren(contentView);

            //    var btnClose = new Button()
            //    {
            //        Y = Application.GetRealHeight(600),
            //        Height = Application.GetRealHeight(67),
            //        BackgroundColor = CSS_Color.WarningColor,
            //        Text = "关 闭",
            //        TextAlignment = TextAlignment.CenterLeft,
            //        TextSize = CSS_FontSize.SubheadingFontSize,
            //    };
            //    btnClose.MouseUpEventHandler = (sender, e) => {
            //        dialog.Close();
            //    };
            //    bodyView.AddChidren(btnClose);

            //    foreach (var msg in Control.Ins.MsgInfoList)
            //    {
            //        var et = new TextView()
            //        {
            //            IsMoreLines = true,
            //            Height = Application.GetRealHeight(150),
            //            Width = Application.GetRealWidth(300),
            //            TextColor = CSS_Color.FirstLevelTitleColor,
            //            TextSize = CSS_FontSize.TextFontSize,
            //            Text = msg,
            //        };
            //        contentView.AddChidren(et);
            //    }

            //    dialog.Show();
            //};

            //Button btnSupportIcon = new Button()
            //{
            //    X = Application.GetRealWidth(12),
            //    Y = Application.GetRealWidth(10),
            //    Width = Application.GetMinRealAverage(24),
            //    Height = Application.GetMinRealAverage(24),
            //    UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
            //};
            //supView.AddChidren(btnSupportIcon);

            //btnSupportText = new Button()
            //{
            //    X = Application.GetRealWidth(48),
            //    Width = Application.GetRealWidth(270),
            //    Height = Application.GetRealWidth(44),
            //    TextID = StringId.GetSupport,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.TextFontSize
            //};
            //supView.AddChidren(btnSupportText);

            //Button btnSupportRight = new Button()
            //{
            //    X = Application.GetRealWidth(315),
            //    Y = Application.GetRealWidth(14),
            //    Width = Application.GetMinRealAverage(16),
            //    Height = Application.GetMinRealAverage(16),
            //    UnSelectedImagePath = "Public/Right.png",
            //};
            //supView.AddChidren(btnSupportRight);

            //var btnSupportViewLine = new Button()
            //{
            //    X = Application.GetRealWidth(48),
            //    Y = Application.GetRealWidth(43),
            //    Height = Application.GetRealHeight(1),
            //    Width = Application.GetRealWidth(279),
            //    BackgroundColor = CSS_Color.DividingLineColor
            //};
            //supView.AddChidren(btnSupportViewLine);
            #endregion

            #region 关于On Pro
            FrameLayout aboutView = new FrameLayout()
            {
                Height = Application.GetRealWidth(44),