From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index 65888c1..8f53bac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -155,7 +155,7 @@
btnPoint.UnSelectedImagePath = "Item/DownLoad.png";
//澶囦唤鍚嶅瓧
- var txtText = rowLayout.frameTable.AddLeftCaption("", 700, 60);
+ var txtText = rowLayout.frameTable.AddTopView("", 700);
if (autoBack == true)
{
//鑷姩澶囦唤
@@ -165,20 +165,11 @@
{
txtText.Text = fileInfo.BackupName;
}
- txtText.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
- rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
//鏃堕棿
- 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);
+ var btnTime = rowLayout.frameTable.AddBottomView("", 600);
if (fileInfo.CreatedOnUtc.Length >= 19)
{
- btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
+ btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
}
if (addLine == true)
{
@@ -370,7 +361,7 @@
/// <summary>
/// 涓婁紶鑷姩澶囦唤鏁版嵁
/// </summary>
- public void UpLoadAutoBackupInfo()
+ private void UpLoadAutoBackupInfo()
{
HdlThreadLogic.Current.RunThread(async () =>
{
@@ -481,12 +472,11 @@
private void ShowEditorBackupForm(BackupListNameInfo fileInfo)
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputForm();
- dialogForm.AddForm(DialogFrameMode.OnlyInput);
+ var dialogForm = new DialogInputControl();
//缂栬緫澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
dialogForm.Text = fileInfo.BackupName;
//鎸変笅纭鎸夐挳
@@ -499,7 +489,7 @@
}
//鐢婚潰鍏抽棴
- dialogForm.CloseForm();
+ dialogForm.CloseDialog();
//鍚嶅瓧涓�鏍锋椂锛屼笉澶勭悊
if (textValue != fileInfo.BackupName)
@@ -517,12 +507,11 @@
private void ShowAddBackupForm()
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputForm();
- dialogForm.AddForm(DialogFrameMode.OnlyInput);
+ var dialogForm = new DialogInputControl();
//娣诲姞澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
@@ -534,7 +523,7 @@
}
//鐢婚潰鍏抽棴
- dialogForm.CloseForm();
+ dialogForm.CloseDialog();
//涓婁紶澶囦唤
this.UpLoadBackInfo(textValue);
@@ -576,8 +565,8 @@
{
if (backName == string.Empty)
{
- //璇疯緭鍏ュ娉ㄥ悕绉�
- string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ //璇疯緭鍏ュ浠藉悕绉�
+ string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName);
this.ShowMassage(ShowMsgType.Error, msg);
return false;
}
--
Gitblit v1.8.0