Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs

@@ -85,7 +85,7 @@
        /// <summary>

        /// 从云端获取数据

        /// </summary>

        private async void SetBackupInfoToForm()

        private void SetBackupInfoToForm()

        {

            this.nowSelectBackId = string.Empty;

            this.nowbtnSelect = null;

@@ -94,7 +94,7 @@
            this.ShowProgressBar();



            //获取自动备份的数据

            var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);

            var pageAuto = HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);

            if (pageAuto == null)

            {

                //关闭进度条

@@ -103,7 +103,7 @@
            }



            //从云端获取数据 

            var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);

            var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);

            if (pageData == null)

            {

                //关闭进度条

@@ -263,7 +263,7 @@
        /// </summary>

        /// <param name="BackupClassId"></param>

        /// <param name="backName"></param>

        private async void EditorBackInfo(string BackupClassId, string backName)

        private void EditorBackInfo(string BackupClassId, string backName)

        {

            var Pra = new EditorBackUpNamePra();

            Pra.BackupClassId = BackupClassId;

@@ -271,13 +271,17 @@
            //获取控制主人账号的Token

            Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();



            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);

            bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);

            if (result == false)

            {

                return;

            }



            this.SetBackupInfoToForm();

            HdlThreadLogic.Current.RunThread(() =>

            {

                //从云端获取数据

                this.SetBackupInfoToForm();

            });

        }



        #endregion

@@ -288,9 +292,9 @@
        /// 删除备份文档

        /// </summary>

        /// <param name="BackupClassId"></param>

        private async void DeleteBackInfo(string BackupClassId)

        private void DeleteBackInfo(string BackupClassId)

        {

            bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);

            bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);

            if (success == false)

            {

                return;

@@ -300,7 +304,11 @@
                this.nowSelectBackId = string.Empty;

                this.nowbtnSelect = null;

            }

            this.SetBackupInfoToForm();

            HdlThreadLogic.Current.RunThread(() =>

            {

                //从云端获取数据

                this.SetBackupInfoToForm();

            });

        }



        #endregion