From dc14dbad8e3a55b57cadddba40c3f437e5e80fc5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十一月 2022 09:08:03 +0800
Subject: [PATCH] 备份
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
index c5f942f..73197d3 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs
@@ -226,7 +226,9 @@
if (data == null) return;
Application.RunOnMainThread (() => {
foreach (var folder in data) {
- AddRowView (folder);
+ if (folder.backupClassify == "CUSTOM_PROJECT_BACKUP") { } else {
+ AddRowView (folder);
+ }
}
});
} else {
@@ -432,7 +434,36 @@
Shared.Utlis.WriteLine (ex.ToString ());
} finally {
Shared.Application.RunOnMainThread (() => {
+
+
MainPage.Loading.Hide ();
+
+
+
+ MainPage.Loading.Start (Language.StringByID (R.MyInternationalizationString.load));
+ System.Threading.Tasks.Task.Run (() => {
+ try {
+
+ var revertObj = HttpServerRequest.Current.GetSpeakerList ();
+ if (revertObj.Code == StateCode.SUCCESS) {
+ var speakerListRes = Newtonsoft.Json.JsonConvert.DeserializeObject<SpeakerListRes> (revertObj.Data.ToString ());
+ if (speakerListRes != null && speakerListRes.list != null && speakerListRes.list.Count > 0) {
+
+ }
+ } else {
+ //鎻愮ず閿欒
+ IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
+ }
+ } catch {
+
+ } finally {
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+ }
+ });
+
+
});
}
});
@@ -575,14 +606,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