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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/MainPage/Controls/SafetyShortcutControl.cs

@@ -21,8 +21,8 @@
        /// </summary>

        public SafetyShortcutControl()

        {

            this.Height = Application.GetMinRealAverage(69);

            this.Width = Application.GetMinRealAverage(69);

            this.Height = HdlControlLogic.Current.GetPictrueRealSize(69);

            this.Width = HdlControlLogic.Current.GetPictrueRealSize(69);

            this.UnSelectedImagePath = "Item/SafetyShortcut.png";

            this.MouseUpEventHandler += (sender, e) =>

            {