From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index 8f5900b..27cbe3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -298,7 +298,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鎵�鏈夌晫闈�
- UserCenterLogic.CloseAllOpenForm();
+ UserCenterLogic.CloseAllOpenForm(null, false);
//鍒囨崲鍒颁富椤�
UserView.UserPage.Instance.ReFreshControl();
});
@@ -321,6 +321,14 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
+ //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+ var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+ if (result2 == false)
+ {
+ //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+ this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
+ return;
+ }
//鍒涘缓涓�涓浠藉悕瀛�
string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
if (backupClassId == null)
@@ -365,7 +373,15 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
- int result = HdlAutoBackupLogic.DoUpLoadAutoBackupData();
+ //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+ var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+ if (result2 == false)
+ {
+ //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+ this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
+ return;
+ }
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupDataByHand();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
@@ -526,28 +542,6 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鎶婃湰鍦版墍鏈夋枃浠剁Щ鍔ㄥ埌鑷姩澶囦唤鏂囦欢澶�
- /// </summary>
- private void CopyLocationAllFileToAutoBackDirectory()
- {
- List<string> listAllFile = Shared.Common.Global.FileListByHomeId();
-
- string strroot = Common.Config.Instance.FullPath;
- string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- foreach (string file in listAllFile)
- {
- //鍒ゆ柇鏄惁鏄簲璇ヤ笂浼犵殑鏂囦欢
- if (HdlBackupLogic.Current.IsNotUpLoadFile(file) == true)
- {
- continue;
- }
- string sourseName = System.IO.Path.Combine(strroot, file);
- string newName = System.IO.Path.Combine(autoPath, file);
- System.IO.File.Copy(sourseName, newName, true);
- }
- }
/// <summary>
/// 妫�娴嬪鑰冨悕绉�
--
Gitblit v1.8.0