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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs

@@ -43,7 +43,7 @@
        /// </summary>

        public void ShowForm(string i_deviceMac)

        {

            UserView.HomePage.Instance.ScrollEnabled = false;

            this.ScrollEnabled = false;



            this.deviceMac = i_deviceMac;

            this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);

@@ -386,20 +386,6 @@
            this.CloseProgressBar();



            return true;

        }



        #endregion



        #region ■ 界面关闭___________________________



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()

        {

            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseFormBefore();

        }



        #endregion