Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs

@@ -599,7 +599,8 @@
                    Application.RunOnMainThread(() =>

                    {

                        //设置控件的在线状态文本效果

                        control?.SetOnlineStatu(device.IsOnline == 1);

                        bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);

                        control?.SetOnlineStatu(bolOnline);

                    });

                }

            }