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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs

@@ -40,7 +40,7 @@
        /// <param name="i_listdevice">面板设备的全部回路</param>

        public void ShowForm(Panel i_panel)

        {

            UserView.HomePage.Instance.ScrollEnabled = false;

            this.ScrollEnabled = false;



            this.panelDevice = i_panel;



@@ -557,20 +557,6 @@
        private uint GetColorByRGB(byte R, byte G, byte B)

        {

            return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);

        }



        #endregion



        #region ■ 界面关闭___________________________



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()

        {

            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseFormBefore();

        }



        #endregion