合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -421,7 +421,7 @@
                                catch (Exception ex)

                                {

                                    //出现未知错误,数据丢失

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

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

                                    alert.Show();



                                    //Log出力

@@ -456,7 +456,7 @@
                                    catch (Exception ex)

                                    {

                                        //出现未知错误,数据丢失

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

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

                                        alert.Show();



                                        //Log出力

@@ -1202,7 +1202,7 @@
            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new Guide.GuideMainForm();

                    var form = new Guide.GuideHouseForm();

                    form.ShowFrom();

                });

            }