2019.1.10

gxc

2020-01-10 b8cbf4a8b6910eefcb83b6d3a39e9b5b5a9cd79e

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

old mode 100755
new mode 100644
@@ -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(() =>

@@ -416,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出力

@@ -451,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出力

@@ -517,6 +522,7 @@
            HdlGatewayLogic.Current.SynchronizeDbGateway();

            //从本地重新加载全部的房间

            Common.Room.RefreshAllRoomByLocation();



        }



        /// <summary>

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

            HdlGatewayReceiveLogic.Current.RemoveAllEvent();

            //清除升级列表

            FirmwareUpdateResourse.dicDeviceUpdateList.Clear();

            FirmwareUpdateResourse.dicGatewayUpdateList.Clear();

            FirmwareUpdateResourse.dicUpdateList.Clear();



            HdlThreadLogic.Current.RunThread(async () =>

            {

@@ -814,7 +819,7 @@
                try

                {

                    //断开远程Mqtt连接

                    ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

                    await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();

                }

                catch { }



@@ -872,9 +877,6 @@
                    HdlGatewayLogic.Current.SynchronizeDbGateway();

                }



                //初始化住宅对象

                Common.Config.Instance.Home = House.GetHouseByHouseId(Common.Config.Instance.HomeId);



                //初始化房间(郭雪城那边不做处理,需要这里特殊执行一步)

                Room.RefreshAllRoomByLocation();



@@ -887,6 +889,8 @@
                    //开启自动备份提示

                    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                }

                //显示引导界面

                ShowGuideForm(result);

            }

            //APP缓存加载完成

            UserCenterResourse.Option.AppCanSignout = true;

@@ -1181,6 +1185,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.GuideHouseForm();

                    form.ShowFrom();

                });

            }



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

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

            file.Close();

        }



        #endregion



        #region ■ 16进制转化_________________________



        /// <summary>