~wjc/HomeApp.git

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

			//进度条
			this.ShowProgressBar();
			//☆マーク☆
			////进度条
			//this.ShowProgressBar();

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

			HdlThreadLogic.Current.RunMain(() =>
			{
			listView.RemoveAll();
			listView.RecoverHeight();
			for (int i = 0; i < pageData.Count; i++)
			{
			//添加备份行
			this.AddRowlayout(pageData[i], i != pageData.Count - 1);
			}
			////从云端获取数据
			//var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
			//if (pageData == null)
			//{
			// //关闭进度条
			// this.CloseProgressBar(ShowReLoadMode.YES);
			// return;
			//}
			////关闭进度条
			//this.CloseProgressBar();

			this.btnDownload?.RemoveFromParent();
			if (pageData.Count > 0)
			{
			//下载
			this.btnDownload = new BottomClickButton();
			btnDownload.TextID = R.MyInternationalizationString.uDownLoad;
			bodyFrameLayout.AddChidren(btnDownload);
			btnDownload.ButtonClickEvent += (sender, e) =>
			{
			if (this.nowSelectBackId == string.Empty)
			{
			return;
			}
			//是否要下载并恢复数据？
			string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			//读取备份文档
			bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId);
			if (result == true)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//关闭这个界面
			this.CloseForm();
			});
			}
			});
			});
			};
			//调整真实高度
			listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
			}
			//HdlThreadLogic.Current.RunMain(() =>
			//{
			// listView.RemoveAll();
			// listView.RecoverHeight();

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

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

			// this.btnDownload?.RemoveFromParent();
			// if (pageData.Count > 0 \|\| pageAuto.Count > 0)
			// {
			// //下载
			// this.btnDownload = new BottomClickButton();
			// btnDownload.TextID = R.MyInternationalizationString.uDownLoad;
			// bodyFrameLayout.AddChidren(btnDownload);
			// btnDownload.ButtonClickEvent += (sender, e) =>
			// {
			// if (this.nowSelectBackId == string.Empty)
			// {
			// return;
			// }
			// //是否要下载并恢复数据？
			// string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
			// this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			// {
			// HdlThreadLogic.Current.RunThread(() =>
			// {
			// //读取备份文档
			// bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
			// if (result == true)
			// {
			// HdlThreadLogic.Current.RunMain(() =>
			// {
			// //关闭这个界面
			// this.CloseForm();
			// });
			// }
			// });
			// });
			// };
			// //调整真实高度
			// listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
			// }
			//});
			}

			#endregion
			@@ -162,25 +181,24 @@
			/// </summary>
			/// <param name="fileInfo"></param>
			/// <param name="addLine"></param>
			private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine)
			/// <param name="isAuto"></param>
			private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine, bool isAuto)
			{
			var rowLayout = new RowLayoutControl(listView.rowSpace / 2);
			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);
			//时间 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 txtText = rowLayout.frameTable.AddTopView(fileInfo.FolderName, 700);
			if (isAuto == true)
			{
			btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
			txtText.TextID = R.MyInternationalizationString.uAutoBackup;
			}

			//时间 2019-11-11T11:31:01
			var btnTime = rowLayout.frameTable.AddBottomView("", 600);
			if (fileInfo.ModifyTime.Length >= 13)
			{
			btnTime.Text = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(fileInfo.ModifyTime).ToString("yyyy.MM.dd HH:mm:ss");
			}
			//底线
			if (addLine == true)
			@@ -211,26 +229,30 @@
			}
			};

			//编辑
			var btnEditor = rowLayout.AddEditorControl();
			btnEditor.ButtonClickEvent += (sender, e) =>
			//自动备份不允许编辑
			if (isAuto == false)
			{
			//显示编辑备考名画面
			this.ShowEditorBackupForm(fileInfo);
			};

			//删除
			var btnDelete = rowLayout.AddDeleteControl();
			btnDelete.ButtonClickEvent += (sender, e) =>
			{
			//确认删除该备份数据?
			string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			//编辑
			var btnEditor = rowLayout.AddEditorControl();
			btnEditor.ButtonClickEvent += (sender, e) =>
			{
			//删除备份文档
			this.DeleteBackInfo(fileInfo.Id);
			});
			};
			//显示编辑备考名画面
			this.ShowEditorBackupForm(fileInfo);
			};

			//删除
			var btnDelete = rowLayout.AddDeleteControl();
			btnDelete.ButtonClickEvent += (sender, e) =>
			{
			//确认删除该备份数据?
			string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			{
			//删除备份文档
			this.DeleteBackInfo(fileInfo.Id);
			});
			};
			}
			}

			#endregion
			@@ -242,21 +264,26 @@
			/// </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;
			Pra.BackupName = backName;
			//获取控制主人账号的Token
			Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//var Pra = new EditorBackUpNamePra();
			//Pra.BackupClassId = BackupClassId;
			//Pra.BackupName = backName;
			////获取控制主人账号的Token
			//Pra.LoginAccessToken = HdlUserCenterLogic.GetConnectMainToken();

			bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
			if (result == false)
			{
			return;
			}
			//bool result = HdlUserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
			//if (result == false)
			//{
			// return;
			//}

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

			#endregion
			@@ -267,9 +294,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;
			@@ -279,7 +306,11 @@
			this.nowSelectBackId = string.Empty;
			this.nowbtnSelect = null;
			}
			this.SetBackupInfoToForm();
			HdlThreadLogic.Current.RunThread(() =>
			{
			//从云端获取数据
			this.SetBackupInfoToForm();
			});
			}

			#endregion
			@@ -298,9 +329,9 @@

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

			//按下确认按钮
			dialogForm.ComfirmClickEvent += ((txtvalue) =>
			@@ -308,7 +339,7 @@
			//画面关闭
			dialogForm.CloseDialog();
			//名字一样时，不处理
			if (txtvalue != fileInfo.BackupName)
			if (txtvalue != fileInfo.FolderName)
			{
			//编辑备份名称
			this.EditorBackInfo(fileInfo.Id, txtvalue);