新代码

黄学彪

2020-06-18 2450c12c825ad4d78d1572da2fa421706db2df2f

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

@@ -49,7 +49,7 @@
            await System.Threading.Tasks.Task.Delay(1000);



            //创建一个备份名字

            string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, HdlGatewayLogic.Current.GetGatewayId(realGateway));

            string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, realGateway.GwId);

            if (backupClassId == null)

            {

                //关闭进度条

@@ -308,6 +308,8 @@
                this.ShowErrorMsg(msg);

                return false;

            }

            System.Threading.Thread.Sleep(1000);



            return success;

        }



@@ -421,7 +423,7 @@
            var data = new Newtonsoft.Json.Linq.JObject {

                { "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },

                { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },

                { "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},

                { "BackupClassId", backupClassId },{ "GatewayUniqueId",realGateway.GwId},

                { "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}

            };

            jObject.Add("Data", data);

@@ -519,7 +521,7 @@
            var data = new Newtonsoft.Json.Linq.JObject {

                { "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },

                { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },

                { "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},

                { "BackupClassId", backupClassId },{ "GatewayUniqueId",realGateway.GwId},

                { "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}

            };

            jObject.Add("Data", data);

@@ -686,6 +688,9 @@
            }

            if (gatewatAction == true)

            {

                //设置进度值:100%

                ProgressFormBar.Current.SetValue(1, 1);

                System.Threading.Thread.Sleep(1000);

                //网关数据恢复成功!

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

                this.ShowTipMsg(msg);