Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs

@@ -215,8 +215,19 @@
                //LOG出力

                this.WriteLog();

            }

            //调用委托

            ButtonClickEvent?.Invoke(sender, e);
            try

            {

                //调用委托

                ButtonClickEvent?.Invoke(sender, e);

            }
            catch (Exception ex)
            {

                //出现未知错误

                var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));

                alert.Show();

                //Log出力

                HdlLogLogic.Current.WriteLog(ex);

            }
        }



        #endregion