From 375751523a86b9ba0b3a27f04c3d3c4f19538690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
index c5f942f..d4bcbd6 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
@@ -575,14 +575,14 @@
/// <returns></returns>
bool DownloadSomeDataBackup (string folderId, BackupFileInfoRes file)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (new BackupFileDownObj () {
+ var requestJson = HttpUtil.GetSignRequestJson (new BackupFileDownObj () {
folderId = folderId,
fileId = file.id,
homeId = UserConfig.Instance.CurrentRegion.Id
});
var revertObj = HttpUtil.RequestHttpsDownload (NewAPI.API_POST_File_Down, requestJson, null, UserConfig.Instance.CurrentRegion.regionUrl);
- if (revertObj != null) {
+ if (revertObj != null && revertObj.Length > 0) {
Utlis.WriteLine ("DownloadSomeDataBackup: " + file.fileName);
IO.FileUtils.WriteFileByBytes (file.fileName, revertObj);
return true;
--
Gitblit v1.8.0