合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -74,6 +74,11 @@
        /// </summary>
        private CurtainRollSeekBar curtainRollSeekBar = new CurtainRollSeekBar { };

        /// <summary>
        /// IsDrawerLockMode
        /// </summary>
        public bool IsDrawerLockMode;

        #endregion

        #region ◆ 接口___________________________
@@ -232,6 +237,10 @@
            //action();
            //action = null;
            RemoveUpdateControlDeviceStatuAction();
            if (IsDrawerLockMode)
            {
                CommonPage.Instance.IsDrawerLockMode = false;
            }
            base.RemoveFromParent();
        }