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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -736,7 +736,7 @@
                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(listNewDevice[0]);

                    form.AddForm(listNewDevice[0], deviceEnumInfo);

                }

                //河东的面板设备

                else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)