Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs

@@ -61,7 +61,7 @@
        /// <param name="i_listdevice">窗帘的回路</param>

        public void ShowForm(Rollershade i_CurtainDevice)

        {

            UserView.HomePage.Instance.ScrollEnabled = false;

            this.ScrollEnabled = false;



            this.curtainDevice = i_CurtainDevice;



@@ -775,8 +775,6 @@
        {

            HdlGatewayReceiveLogic.Current.RemoveEvent("CurtainDeviceAttribute");

            HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");



            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseFormBefore();

        }