请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs

old mode 100755
new mode 100644
@@ -115,11 +115,20 @@
            }

            btnDeviceName.X = Application.GetRealWidth(181);

            //当指定实际坐标时,这里需要的偏移量为2倍

            btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;

            //晾衣架显示模块名字（Mac名字） 
            if (this.device.Type == DeviceType.Airer)
            {
                btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(i_device);
            }
            else
            {
                btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
            }

            btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;

            this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);

            
            this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);

            if (this.hadStatuFunction == false)

            {

                //没有状态功能,则把设备名字控件中

@@ -224,6 +233,8 @@
                        //回调控件被移除的事件

                        this.RowNeedRemoveEvent?.Invoke();

                        this.RemoveFromParent();

                        //上传空间区域信息

                        HdlRoomLogic.Current.SetRoomInfoToGateway();

                    };

                };

            }

@@ -262,7 +273,15 @@
            //设备图标也刷新

            Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);

            //设备名字

            this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            //晾衣架显示模块名字（Mac名字） 
            if (this.device.Type == DeviceType.Airer)
            {
                this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(i_device);
            }
            else
            {
                this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);

            }

            //检测设备是否是打开状态

            bool isOpen = this.CheckIsOpenStatu(i_device);

            if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)

@@ -380,8 +399,8 @@
                }

            }

            else

            {   
                //如果这个设备改变了房间的话,回调卡片被删除的函数

            {
                //如果这个设备改变了房间的话,回调卡片被删除的函数
                var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);

                if (nowRoom == null || nowRoom.Id != this.nowSelectRoom.Id)

                {