~wjc/HomeApp.git

			@@ -85,7 +85,7 @@
			/// <summary>
			/// 从云端获取数据
			/// </summary>
			private async void SetBackupInfoToForm()
			private void SetBackupInfoToForm()
			{
			this.nowSelectBackId = string.Empty;
			this.nowbtnSelect = null;
			@@ -94,17 +94,17 @@
			this.ShowProgressBar();

			//获取自动备份的数据
			var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, HdlGatewayLogic.Current.GetGatewayId(realGateway));
			if (pageAuto == null)
			var listAutoData = HdlGatewayBackupLogic.Current.GetGatewayBackupListFromDb(realGateway.GwId, BackUpMode.A自动备份);
			if (listAutoData == null)
			{
			//关闭进度条
			this.CloseProgressBar(ShowReLoadMode.YES);
			return;
			}

			//从云端获取数据
			var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, HdlGatewayLogic.Current.GetGatewayId(realGateway));
			if (pageData == null)
			//从云端获取手动备份数据
			var listHandData = HdlGatewayBackupLogic.Current.GetGatewayBackupListFromDb(realGateway.GwId, BackUpMode.A手动备份);
			if (listHandData == null)
			{
			//关闭进度条
			this.CloseProgressBar(ShowReLoadMode.YES);
			@@ -117,24 +117,20 @@
			{
			listView.RemoveAll();
			listView.RecoverHeight();

			//自动备份的ID
			string autoID = string.Empty;
			if (pageAuto.Count > 0)
			if (listAutoData.Count > 0)
			{
			autoID = pageAuto[0].Id;
			//添加自动备份行
			this.AddRowlayout(pageAuto[0], pageData.Count > 0, true);
			this.AddRowlayout(listAutoData[0], listAutoData.Count > 0, true);
			}

			for (int i = 0; i < pageData.Count; i++)
			for (int i = 0; i < listHandData.Count; i++)
			{
			//添加备份行
			this.AddRowlayout(pageData[i], i != pageData.Count - 1, false);
			this.AddRowlayout(listHandData[i], i != listHandData.Count - 1, false);
			}

			this.btnDownload?.RemoveFromParent();
			if (pageData.Count > 0 \|\| pageAuto.Count > 0)
			if (listAutoData.Count > 0 \|\| listHandData.Count > 0)
			{
			//下载
			this.btnDownload = new BottomClickButton();
			@@ -153,7 +149,7 @@
			HdlThreadLogic.Current.RunThread(() =>
			{
			//读取备份文档
			bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
			bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway.GwId, this.nowSelectBackId);
			if (result == true)
			{
			HdlThreadLogic.Current.RunMain(() =>
			@@ -187,24 +183,17 @@
			listView.AddChidren(rowLayout);

			//备份名字
			var txtText = rowLayout.frameTable.AddLeftCaption(fileInfo.BackupName, 700, 60);
			txtText.TextSize = 15;
			txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
			rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
			var txtText = rowLayout.frameTable.AddTopView(fileInfo.FolderName, 700);
			if (isAuto == true)
			{
			txtText.TextID = R.MyInternationalizationString.uAutoBackup;
			}

			//时间 2019-11-11T11:31:01
			var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);
			btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;
			btnTime.TextSize = 12;
			btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;
			rowLayout.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);
			if (fileInfo.CreatedOnUtc.Length >= 19)
			//时间
			var btnTime = rowLayout.frameTable.AddBottomView("", 600);
			if (fileInfo.ModifyTime.Length == 13)
			{
			btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
			btnTime.Text = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(fileInfo.ModifyTime).ToString("yyyy.MM.dd HH:mm:ss");
			}
			//底线
			if (addLine == true)
			@@ -245,20 +234,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
			@@ -268,23 +257,21 @@
			/// <summary>
			/// 编辑备份名称
			/// </summary>
			/// <param name="BackupClassId"></param>
			/// <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;
			Pra.BackupName = backName;
			//获取控制主人账号的Token
			Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

			bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
			var result = HdlGatewayBackupLogic.Current.EditorGatewayBackupName(backupClassId, backName);
			if (result == false)
			{
			return;
			}

			this.SetBackupInfoToForm();
			HdlThreadLogic.Current.RunThread(() =>
			{
			//从云端获取数据
			this.SetBackupInfoToForm();
			});
			}

			#endregion
			@@ -294,20 +281,24 @@
			/// <summary>
			/// 删除备份文档
			/// </summary>
			/// <param name="BackupClassId"></param>
			private async void DeleteBackInfo(string BackupClassId)
			/// <param name="backupClassId"></param>
			private void DeleteBackInfo(string backupClassId)
			{
			bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
			bool success = HdlGatewayBackupLogic.Current.DeleteGatewayBackup(this.realGateway.GwId, backupClassId);
			if (success == false)
			{
			return;
			}
			if (this.nowSelectBackId == BackupClassId)
			if (this.nowSelectBackId == backupClassId)
			{
			this.nowSelectBackId = string.Empty;
			this.nowbtnSelect = null;
			}
			this.SetBackupInfoToForm();
			HdlThreadLogic.Current.RunThread(() =>
			{
			//从云端获取数据
			this.SetBackupInfoToForm();
			});
			}

			#endregion
			@@ -322,21 +313,13 @@
			private void ShowEditorBackupForm(BackupListNameInfo fileInfo)
			{
			//生成一个弹窗画面
			var dialogForm = new DialogInputControl();

			//编辑备份
			dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
			//请输入备注名称
			dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
			dialogForm.Text = fileInfo.BackupName;

			//按下确认按钮
			dialogForm.ComfirmClickEvent += ((txtvalue) =>
			this.ShowDialogInputForm(Language.StringByID(R.MyInternationalizationString.uEditorBackup), fileInfo.FolderName,
			Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName), (contr, txtvalue) =>
			{
			//画面关闭
			dialogForm.CloseDialog();
			contr.CloseDialog();
			//名字一样时，不处理
			if (txtvalue != fileInfo.BackupName)
			if (txtvalue != fileInfo.FolderName)
			{
			//编辑备份名称
			this.EditorBackInfo(fileInfo.Id, txtvalue);