From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 9265a5b..cf828c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -151,8 +151,7 @@
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listFileCount);
}
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
+
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
@@ -291,7 +290,7 @@
}
//寮�鍚繘搴︽潯
- int listFileCount = listAllFile.Count;
+ int listFileCount = listPicFile.Count + listNormalFile.Count;
if (showBar == true)
{
//寮�鍚繘搴︽潯 姝ｅ湪涓婁紶澶囦唤鏂囦欢
@@ -795,6 +794,12 @@
//寮�鍚悗鍙拌皟璇旳pp鍔熻兘(Debug鐢�)
UserCenterResourse.HideOption.StartDebugApp = 1;
}
+ checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.CheckDeviceTypeFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
+ {
+ //寮�鍚娴嬭澶嘥ype鐨�(Debug鐢�)
+ UserCenterResourse.HideOption.CheckDeviceType = 1;
+ }
//鎭㈠
IMessageCommon.Current.IgnoreError = false;
@@ -823,8 +828,6 @@
ProgressFormBar.Current.Close();
return false;
}
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
//娓呯┖鍏ㄩ儴鎴块棿
HdlRoomLogic.Current.DeleteAllRoom();
@@ -845,6 +848,9 @@
//鍒锋柊鏈湴缂撳瓨
UserCenterLogic.RefreshAllMemory();
+ //鍏抽棴杩涘害鏉�
+ ProgressFormBar.Current.Close();
+
return true;
}
--
Gitblit v1.8.0