合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 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出力

@@ -824,6 +824,16 @@


                //消息记录重新读取及检测

                ControlCommonResourse.ReadMessageAgain = true;

                ControlCommonResourse.HadNewMessage = false;

                HdlThreadLogic.Current.RunMain(() =>

                {

                    for (int i = 0; i < ControlCommonResourse.listMessageManaContr.Count; i++)

                    {

                        //显示角标特效

                        ControlCommonResourse.listMessageManaContr[i].IsSelected = false;

                    }

                });



                //加载账号配置信息

                var optionInfo = UserCenterResourse.Option.Load();

                UserCenterResourse.Option = optionInfo;

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

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new Guide.GuideMainForm();

                    var form = new Guide.GuideHouseForm();

                    form.ShowFrom();

                });

            }

@@ -1324,6 +1334,21 @@
        }

        #endregion



        #region ■ 时间转换___________________________



        /// <summary>

        /// 将utc时间类型的字符串,转换为本地时间

        /// </summary>

        /// <param name="timeText"></param>

        /// <returns></returns>

        public static DateTime ConvertUtcTimeToLocalTime(string timeText)

        {

            var utcTime = Convert.ToDateTime(timeText);

            return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);

        }



        #endregion



        #region ■ 文件保存和读取_____________________



        /// <summary>