From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
index 3dab2d9..31bf22d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
@@ -34,8 +34,8 @@
 
             //body鍗犲畬鏁翠釜灞忓箷
             bodyFrameLayout.Y = 0;
-            bodyFrameLayout.Height = HdlControlResourse.TopMenuFrameHeight + HdlControlResourse.TopFrameHeight
-                + HdlControlResourse.BodyFrameHeight;
+            bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight
+                + ControlCommonResourse.BodyFrameHeight;
 
             var btnPic = new PicViewControl(991, 438, true);
             btnPic.UnSelectedImagePath = "Item/AutoBackup.png";
@@ -101,7 +101,7 @@
             btnRemind.ButtonClickEvent += (sender, e) =>
             {
                 //涓�澶╀箣鍐呬笉鍐嶆彁閱�
-                HdlBackupLogic.Current.SaveBackupNotPrompted(false, 1);
+                HdlAutoBackupLogic.SaveBackupNotPrompted(false, 1);
                 this.CloseForm();
             };
         }
@@ -115,7 +115,7 @@
         /// </summary>
         private void UpLoadBackupInfo()
         {
-            int result = HdlBackupLogic.Current.DoUpLoadAutoBackupDataByHand();
+            int result = HdlAutoBackupLogic.DoUpLoadAutoBackupDataByHand();
             if (result == -1)
             {
                 //鏂囦欢涓婁紶澶辫触

--
Gitblit v1.8.0