2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs

@@ -26,18 +26,18 @@
        /// 窗帘动态控件
        /// </summary>
        CurtainRollSeekBarOn curtainSeekBar;
        /// <summary>
        /// 窗帘进度减少按钮
        /// </summary>
        Button btnMinusSignIcon;
        /// <summary>
        /// 窗帘进度增加按钮
        /// </summary>
        Button btnPlusSgnIcon;
        /// <summary>
        /// 窗帘滑动控制
        /// </summary>
        DiyImageSeekBar controlBar;
        ///// <summary>
        ///// 窗帘进度减少按钮
        ///// </summary>
        //Button btnMinusSignIcon;
        ///// <summary>
        ///// 窗帘进度增加按钮
        ///// </summary>
        //Button btnPlusSgnIcon;
        ///// <summary>
        ///// 窗帘滑动控制
        ///// </summary>
        //DiyImageSeekBar controlBar;
        /// <summary>
        /// 窗帘关闭按钮
        /// </summary>
@@ -50,6 +50,10 @@
        /// 窗帘打开按钮
        /// </summary>
        Button btnCurtainOpen;
        /// <summary>
        /// 进度值
        /// </summary>
        Button btnProgress;
        #endregion

        #region 区域变量
@@ -127,12 +131,23 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = function.collect
            };
            //controlView.AddChidren(btnCollection);
            controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            //{
            //    controlView.AddChidren(btnCollection);
            //}


            btnProgress = new Button()
            {
                controlView.AddChidren(btnCollection);
            }
                Y = Application.GetRealHeight(80),
                Height = Application.GetRealHeight(50),
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.PromptingColor1,
                Text =  curtainTemp.GetPercent(function).ToString() + "%",
            };
            controlView.AddChidren(btnProgress);

            curtainSeekBar = new CurtainRollSeekBarOn()
            {
@@ -142,58 +157,58 @@
                Height = Application.GetRealWidth(210),
                Progress = curtainTemp.GetPercent(function),
                //IsInvertedProgress = true,
                ProgressTextColor = 0x00000000,
                ProgressTextColor = CSS_Color.WarningColor,// 0x00000000,
            };
            controlView.AddChidren(curtainSeekBar);

            btnMinusSignIcon = new Button()
            {
                Y = Application.GetRealHeight(406),
                Width = Application.GetRealWidth(52),
                Height = Application.GetMinRealAverage(24),
                TextAlignment = TextAlignment.CenterRight,
                TextID = StringId.PullOpen,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextColor = CSS_Color.PromptingColor1,
                Visible = false,
                Enable = false,
            };
            controlView.AddChidren(btnMinusSignIcon);
            //btnMinusSignIcon = new Button()
            //{
            //    Y = Application.GetRealHeight(406),
            //    Width = Application.GetRealWidth(52),
            //    Height = Application.GetMinRealAverage(24),
            //    TextAlignment = TextAlignment.CenterRight,
            //    TextID = StringId.PullOpen,
            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            //    TextColor = CSS_Color.PromptingColor1,
            //    Visible = false,
            //    Enable = false,
            //};
            //controlView.AddChidren(btnMinusSignIcon);

            controlBar = new DiyImageSeekBar()
            {
                X = btnMinusSignIcon.Right,
                Y = Application.GetRealHeight(391),//414,设计数据
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealHeight(54),
                SeekBarViewHeight = Application.GetRealHeight(8),
                ThumbImagePath = "Public/ThumbImage.png",
                ThumbImageHeight = Application.GetRealHeight(54),
                ProgressBarColor = CSS_Color.MainColor,
                ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                ProgressTextSize = 0x00000000,
                MaxValue = 100,
                SeekBarPadding = Application.GetRealWidth(20),
                Progress = curtainTemp.GetPercent(function),
                Visible = false,
                Enable = false,
            };
            controlView.AddChidren(controlBar);
            //controlBar = new DiyImageSeekBar()
            //{
            //    X = btnMinusSignIcon.Right,
            //    Y = Application.GetRealHeight(391),//414,设计数据
            //    Width = Application.GetRealWidth(220),
            //    Height = Application.GetRealHeight(54),
            //    SeekBarViewHeight = Application.GetRealHeight(8),
            //    ThumbImagePath = "Public/ThumbImage.png",
            //    ThumbImageHeight = Application.GetRealHeight(54),
            //    ProgressBarColor = CSS_Color.MainColor,
            //    ProgressTextColor = CSS_Color.FirstLevelTitleColor,
            //    ProgressTextSize = 0x00000000,
            //    MaxValue = 100,
            //    SeekBarPadding = Application.GetRealWidth(20),
            //    Progress = curtainTemp.GetPercent(function),
            //    Visible = false,
            //    Enable = false,
            //};
            //controlView.AddChidren(controlBar);

            btnPlusSgnIcon = new Button()
            {
                X = Application.GetRealWidth(286),
                Y = Application.GetRealHeight(406),
                Width = Application.GetRealWidth(62),
                Height = Application.GetRealWidth(24),
                TextID = StringId.Shut,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextColor = CSS_Color.PromptingColor1,
                Visible = false,
                Enable = false,
            };
            controlView.AddChidren(btnPlusSgnIcon);
            //btnPlusSgnIcon = new Button()
            //{
            //    X = Application.GetRealWidth(286),
            //    Y = Application.GetRealHeight(406),
            //    Width = Application.GetRealWidth(62),
            //    Height = Application.GetRealWidth(24),
            //    TextID = StringId.Shut,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            //    TextColor = CSS_Color.PromptingColor1,
            //    Visible = false,
            //    Enable = false,
            //};
            //controlView.AddChidren(btnPlusSgnIcon);

            btnCurtainClose = new Button()
            {
@@ -201,9 +216,8 @@
                Y = Application.GetRealHeight(466),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainDownIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainDownIconOn.png",
            };
            controlView.AddChidren(btnCurtainClose);

@@ -224,9 +238,8 @@
                Y = Application.GetRealHeight(466),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0",
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainUpIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainUpIconOn.png",
            };
            controlView.AddChidren(btnCurtainOpen);