合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs

@@ -80,6 +80,15 @@
        /// </summary>
        public bool IsDrawerLockMode;

        /// <summary>
        /// ProgressBtn
        /// </summary>
        Button ProgressBtn;
        /// <summary>
        /// ProgressBtnY
        /// </summary>
        int ProgressBtnY;

        #endregion

        #region ◆ 接口___________________________
@@ -695,11 +704,36 @@
                curtainRollSeekBar.Gravity = Gravity.CenterHorizontal;
                curtainRollSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
                layout.AddChidren(curtainRollSeekBar);

                curtainRollSeekBar.IsProgressTextShow = false;
                curtainRollSeekBar.CurtainPaddingTop = Application.GetRealHeight(110);
                curtainRollSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
                {
                    (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
                };

                curtainRollSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
                {
                    OnProgressButtonMove(curtainRollSeekBar.Progress);
                    ProgressBtn.Visible = true;
                };

                curtainRollSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
                {
                    ProgressBtn.Visible = false;
                };

                curtainRollSeekBar.OnProgressChangedEvent += (send2, e2) =>
                {

                    OnProgressButtonMove(e2);

                    //判断是否300ms屏蔽
                    //if (curtainRollSeekBar.IsProgressChangeDelay()) return;

                    //(device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
                };

                InitProgressBtn(layout);
            }
            else
            {
@@ -717,7 +751,32 @@
            }
        }

        /// <summary>
        /// 添加进度按钮
        /// </summary>
        private void InitProgressBtn(FrameLayout layout)
        {
            ProgressBtnY = curtainRollSeekBar.Y - Application.GetMinReal(204);
            ProgressBtn = new Button()
            {
                Y = ProgressBtnY,
                Width = Application.GetMinReal(135),
                Height = Application.GetMinReal(104),
                UnSelectedImagePath = "Item/ProgressBubbles.png",
                Visible = false,
                Gravity = Gravity.CenterHorizontal
            };
            layout.AddChidren(ProgressBtn);
        }

        /// <summary>
        /// OnProgressButtonMove
        /// </summary>
        private void OnProgressButtonMove(int mProgress)
        {
            ProgressBtn.Y = ProgressBtnY + curtainRollSeekBar.NowProgressY;
            ProgressBtn.Text = mProgress + "%";
        }

        #endregion