From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 3a1e9a5..10c1799 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -147,7 +147,7 @@
                     return null;
                 }
                 //灏嗚緭鍏ュ啓鍏ユ湰鍦扮殑涓存椂鏂囦欢澶�
-                HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(newDir, fileName), System.Text.Encoding.UTF8.GetString(result));
+                HdlFileLogic.Current.SaveByteToFile(System.IO.Path.Combine(newDir, fileName), result);
                 //璁剧疆杩涘害鍊�
                 ProgressFormBar.Current.SetValue(i + 1, listFileCount);
             }
@@ -290,7 +290,7 @@
             }
 
             //寮�鍚繘搴︽潯
-            int listFileCount = listAllFile.Count;
+            int listFileCount = listPicFile.Count + listNormalFile.Count;
             if (showBar == true)
             {
                 //寮�鍚繘搴︽潯 姝e湪涓婁紶澶囦唤鏂囦欢
@@ -794,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;
@@ -878,7 +884,7 @@
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
-        private bool IsNotUpLoadFile(string file)
+        public bool IsNotUpLoadFile(string file)
         {
             if (file.StartsWith("Device_") == true
                || file.StartsWith("Gateway_") == true

--
Gitblit v1.8.0