合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -259,6 +259,11 @@
        /// <param name="pra">请求的参数</param>

        public static bool CheckNotEorrorMsg(ResponsePack revertObj, string RequestName, List<string> listNotShowError = null, object pra = null)

        {

            if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)

            {

                //不检测

                return true;

            }

            if (revertObj == null)

            {

                Application.RunOnMainThread(() =>

@@ -612,8 +617,7 @@
            //关闭所有接收

            HdlGatewayReceiveLogic.Current.RemoveAllEvent();

            //清除升级列表

            FirmwareUpdateResourse.dicDeviceUpdateList.Clear();

            FirmwareUpdateResourse.dicGatewayUpdateList.Clear();

            FirmwareUpdateResourse.dicUpdateList.Clear();



            HdlThreadLogic.Current.RunThread(async () =>

            {

@@ -884,6 +888,8 @@
                    //开启自动备份提示

                    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                }

                //显示引导界面

                ShowGuideForm(result);

            }

            //APP缓存加载完成

            UserCenterResourse.Option.AppCanSignout = true;

@@ -1178,6 +1184,36 @@


        #endregion



        #region ■ 引导界面___________________________



        /// <summary>

        /// 显示引导界面

        /// </summary>

        /// <param name="result">同步结果 -1：异常   0:已经同步过，不需要同步  1：正常同步  2:没有自动备份数据</param>

        private static void ShowGuideForm(int result)

        {

            var checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, DirNameResourse.GuideFile);

            if (System.IO.File.Exists(checkFile) == true)

            {

                //不需要显示

                return;

            }

            if (result == 2 && Config.Instance.Home.IsOthreShare == false)

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    var form = new Guide.GuideMainForm();

                    form.ShowFrom();

                });

            }



            //创建一个空文件(标识已经完成引导)

            var file = System.IO.File.Create(checkFile);

            file.Close();

        }



        #endregion



        #region ■ 16进制转化_________________________



        /// <summary>