Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs

@@ -17,9 +17,9 @@
        /// 初始化控件

        /// </summary>

        /// <param name="i_device"></param>

        public override void InitControl(CommonDevice i_device)

        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)

        {

            base.InitControl(i_device);

            base.InitControl(i_device, i_nowSelectRoom);



            //添加跳转深度卡片信息事件

            this.AddDetailInfoEvent(i_device);

@@ -87,7 +87,7 @@


                //继电器类型的深度卡片界面(含空气开关)

                var form = new ControlForm.DeviceRelayDetailCardForm();

                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);

                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }