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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -481,7 +481,7 @@
                {

                    //方悦面板的功能配置

                    var form = new DevicePanel.PanelFangyueFunctionSettionForm();

                    form.AddForm(device);

                    form.AddForm(device, deviceEnumInfo);

                }

                else

                {

@@ -789,14 +789,13 @@
            if (localDevice != null)

            {

                //在线状态一样的话，不需要刷新

                if (localDevice.IsOnline == device.IsOnline)

                if (localDevice.IsOnline != device.IsOnline)

                {

                    return;

                }

                //保存状态

                localDevice.IsOnline = device.IsOnline;

                localDevice.ReSave();

            }

            }



            rowInfo.MenuRow.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);

            if (rowInfo.dicDetailRow != null)