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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs

@@ -81,7 +81,7 @@
            btnOnline.X = this.Width - Application.GetRealWidth(200 + 46);

            btnOnline.Y = btnDeviceName.Y;

            btnOnline.TextAlignment = TextAlignment.CenterRight;

            this.SetOnlineStatu(device.IsOnline == 1);

            this.SetOnlineStatu(Common.LocalDevice.Current.CheckDeviceIsOnline(device));

            this.AddChidren(btnOnline);

        }