合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 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, HdlGatewayLogic.Current.GetGatewayId(realGateway));

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

            if (pageAuto == null)

            {

                //关闭进度条

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



            //从云端获取数据 

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

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

            if (pageData == null)

            {

                //关闭进度条

@@ -156,6 +156,10 @@
                                 bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);

                                 if (result == true)

                                 {

                                     //网关数据恢复成功!

                                     msg = Language.StringByID(R.MyInternationalizationString.uRestoreGatewayDataSuccess);

                                     this.ShowMassage(ShowMsgType.Tip, msg);



                                     HdlThreadLogic.Current.RunMain(() =>

                                     {

                                         //关闭这个界面

@@ -238,20 +242,20 @@
                    //显示编辑备考名画面

                    this.ShowEditorBackupForm(fileInfo);

                };

            }



            //删除

            var btnDelete = rowLayout.AddDeleteControl();

            btnDelete.ButtonClickEvent += (sender, e) =>

            {

                //确认删除该备份数据?

                string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);

                this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                //删除

                var btnDelete = rowLayout.AddDeleteControl();

                btnDelete.ButtonClickEvent += (sender, e) =>

                {

                    //删除备份文档

                    this.DeleteBackInfo(fileInfo.Id);

                });

            };

                    //确认删除该备份数据?

                    string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);

                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                    {

                        //删除备份文档

                        this.DeleteBackInfo(fileInfo.Id);

                    });

                };

            }

        }



        #endregion

@@ -263,7 +267,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 +275,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 +296,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 +308,11 @@
                this.nowSelectBackId = string.Empty;

                this.nowbtnSelect = null;

            }

            this.SetBackupInfoToForm();

            HdlThreadLogic.Current.RunThread(() =>

            {

                //从云端获取数据

                this.SetBackupInfoToForm();

            });

        }



        #endregion