Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs

@@ -46,34 +46,33 @@
        /// </summary>
        Button btnStartupBg;

        #region F3阶段
        ///// <summary>
        ///// 设置安防选项提示
        ///// </summary>
        //Button btnSecuritySelectionTip;
        ///// <summary>
        ///// 设置安防选项选中图标
        ///// </summary>
        //Button btnSecuritySelectionIcon;
        ///// <summary>
        ///// 设置安防选项背景
        ///// </summary>
        //Button btnSecurityBg;

        /// <summary>
        /// 设置安防选项提示
        /// </summary>
        Button btnSecuritySelectionTip;
        /// <summary>
        /// 设置安防选项选中图标
        /// </summary>
        Button btnSecuritySelectionIcon;
        /// <summary>
        /// 设置安防选项背景
        /// </summary>
        Button btnSecurityBg;


        ///// <summary>
        ///// 设置门锁选项提示
        ///// </summary>
        //Button btnDoorlockSelectionTip;
        ///// <summary>
        ///// 设置门锁选项选中图标
        ///// </summary>
        //Button btnDoorlockSelectionIcon;
        ///// <summary>
        ///// 设置门锁选项背景
        ///// </summary>
        //Button btnDoorlockBg;
        #endregion
        /// <summary>
        /// 设置门锁选项提示
        /// </summary>
        Button btnDoorlockSelectionTip;
        /// <summary>
        /// 设置门锁选项选中图标
        /// </summary>
        Button btnDoorlockSelectionIcon;
        /// <summary>
        /// 设置门锁选项背景
        /// </summary>
        Button btnDoorlockBg;

        /// <summary>
        /// 密码使用选择的详细内容提示
@@ -313,93 +312,92 @@
            startupDiv.AddChidren(btnStartupSelectionTip);
            #endregion

            #region F3阶段

            #region Security
            //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });

            //FrameLayout securityDiv = new FrameLayout()
            //{
            //    Width = Application.GetRealWidth(94),
            //};
            //optionView.AddChidren(securityDiv);
            FrameLayout securityDiv = new FrameLayout()
            {
                Width = Application.GetRealWidth(94),
            };
            optionView.AddChidren(securityDiv);

            //btnSecurityBg = new Button()
            //{
            //    Height = Application.GetRealWidth(174),
            //    UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
            //    SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
            //};
            //securityDiv.AddChidren(btnSecurityBg);
            btnSecurityBg = new Button()
            {
                Height = Application.GetRealWidth(174),
                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
                SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
            };
            securityDiv.AddChidren(btnSecurityBg);

            //btnSecuritySelectionIcon = new Button()
            //{
            //    X = Application.GetRealWidth(5),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(30),
            //    Height = Application.GetRealWidth(30),
            //    UnSelectedImagePath = "Public/ChooseIcon.png",
            //    SelectedImagePath = "Public/ChooseOnIcon.png",
            //};
            //securityDiv.AddChidren(btnSecuritySelectionIcon);
            btnSecuritySelectionIcon = new Button()
            {
                X = Application.GetRealWidth(5),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(30),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
            };
            securityDiv.AddChidren(btnSecuritySelectionIcon);

            //btnSecuritySelectionTip = new Button()
            //{
            //    X = Application.GetRealWidth(30),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(74),
            //    Height = Application.GetRealWidth(30),
            //    TextID = StringId.DefenseAndUndefense,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    SelectedTextColor = CSS_Color.MainColor,
            //    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            //};
            //securityDiv.AddChidren(btnSecuritySelectionTip);
            btnSecuritySelectionTip = new Button()
            {
                X = Application.GetRealWidth(30),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(74),
                Height = Application.GetRealWidth(30),
                TextID = StringId.DefenseAndUndefense,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            };
            securityDiv.AddChidren(btnSecuritySelectionTip);
            #endregion


            #region Doorlock
            //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });

            //FrameLayout doorlockDiv = new FrameLayout()
            //{
            //    Width = Application.GetRealWidth(94),
            //};
            //optionView.AddChidren(doorlockDiv);
            FrameLayout doorlockDiv = new FrameLayout()
            {
                Width = Application.GetRealWidth(94),
            };
            optionView.AddChidren(doorlockDiv);

            //btnDoorlockBg = new Button()
            //{
            //    Height = Application.GetRealWidth(174),
            //    UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
            //    SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
            //};
            //doorlockDiv.AddChidren(btnDoorlockBg);
            btnDoorlockBg = new Button()
            {
                Height = Application.GetRealWidth(174),
                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
                SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
            };
            doorlockDiv.AddChidren(btnDoorlockBg);

            //btnDoorlockSelectionIcon = new Button()
            //{
            //    X = Application.GetRealWidth(5),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(30),
            //    Height = Application.GetRealWidth(30),
            //    UnSelectedImagePath = "Public/ChooseIcon.png",
            //    SelectedImagePath = "Public/ChooseOnIcon.png",
            //};
            //doorlockDiv.AddChidren(btnDoorlockSelectionIcon);
            btnDoorlockSelectionIcon = new Button()
            {
                X = Application.GetRealWidth(5),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(30),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
            };
            doorlockDiv.AddChidren(btnDoorlockSelectionIcon);

            //btnDoorlockSelectionTip = new Button()
            //{
            //    X = Application.GetRealWidth(30),
            //    Y = Application.GetRealWidth(174),
            //    Width = Application.GetRealWidth(74),
            //    Height = Application.GetRealWidth(30),
            //    TextID = StringId.RemoteUnlocking,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    SelectedTextColor = CSS_Color.MainColor,
            //    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            //};
            //doorlockDiv.AddChidren(btnDoorlockSelectionTip);
            #endregion
            btnDoorlockSelectionTip = new Button()
            {
                X = Application.GetRealWidth(30),
                Y = Application.GetRealWidth(174),
                Width = Application.GetRealWidth(74),
                Height = Application.GetRealWidth(30),
                TextID = StringId.RemoteUnlocking,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
            };
            doorlockDiv.AddChidren(btnDoorlockSelectionTip);
            #endregion

            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });