From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs |   65 +++++++++++++-------------------
 1 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index 65888c1..e7c1728 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)
             {
@@ -228,20 +219,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, ShowErrorMode.YES);
-                });
-            };
+                    //纭鍒犻櫎璇ュ浠芥暟鎹�?
+                    string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
+                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+                    {
+                        //鍒犻櫎澶囦唤鏂囨。
+                        this.DeleteBackInfo(fileInfo.Id, ShowErrorMode.YES);
+                    });
+                };
+            }
         }
 
         /// <summary>
@@ -309,7 +300,7 @@
                     //鍏抽棴鎵�鏈夌晫闈�
                     UserCenterLogic.CloseAllOpenForm();
                     //鍒囨崲鍒颁富椤�
-                    UserView.UserPage.Instance.Fresh();
+                    UserView.UserPage.Instance.ReFreshControl();
                 });
 
                 //鏂囦欢鎭㈠鎴愬姛
@@ -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