请合并新代码，更改多功能面板绑定表重复问题

xm

2020-08-14 a45fe56aeeac8f28a9891b83362954067c8166dc

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs

@@ -14,20 +14,12 @@
        #region ■ 初始化_____________________________



        /// <summary>

        /// 分类界面的彩灯(调光器)设备行控件

        /// </summary>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        public DeviceColorLightRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

        }



        /// <summary>

        /// 初始化控件

        /// </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);

@@ -55,6 +47,12 @@
                    //打开

                    this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));

                    i_device.SwitchControl(1);

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        //获取灯光亮度

                        System.Threading.Thread.Sleep(300);

                        HdlDeviceAttributeLogic.Current.SendLevelStatuComand(i_device);

                    });

                }

                else

                {

@@ -79,7 +77,8 @@
            {

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

                var form = new MainPage.ControlForm.DeviceColorLightDetailCardForm();

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

                form.RowOrCardControl = this;

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

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }