请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

File was renamed from ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -270,6 +270,8 @@


            rowMenu.frameTable.ButtonClickEvent += (sender, e) =>

            {

                //隐藏菜单

                rowMenu.HideMenu();

                //强制跳转真实设备界面

                if (UserCenterResourse.HideOption.GotoRealDeviceForm == 1)

                {

@@ -378,6 +380,8 @@


            rowDevice.frameTable.ButtonClickEvent += (sender, e) =>

            {

                //隐藏菜单

                rowDevice.HideMenu();

                //界面跳转,记录当前的正在操作的设备的Mac地址

                this.nowActionDeviceMac = device.DeviceAddr;

                //显示设备功能配置界面