上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.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);

@@ -71,10 +71,22 @@
            {

                Common.CommonPage.Instance.IsDrawerLockMode = true;



                //彩灯,调光器类型的深度卡片界面

                var form = new ControlForm.DeviceColorLightDetailCardForm();

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

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

                //如果是Mini夜灯

                if (Common.LocalDevice.Current.IsMiniLight(i_device) == true)

                {

                    var form = new ControlForm.DeviceMiniLightDetailCardForm();

                    form.RowOrCardControl = this;

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

                    form.FormCloseEvent += this.CardDetailInfoBackEvent;

                }

                else

                {

                    //彩灯,调光器类型的深度卡片界面

                    var form = new ControlForm.DeviceColorLightDetailCardForm();

                    form.RowOrCardControl = this;

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

                    form.FormCloseEvent += this.CardDetailInfoBackEvent;

                }

            };

        }