From f9634c562782f54bad0fcf86af3443d3706712d6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 四月 2023 17:37:19 +0800
Subject: [PATCH] 信息备份
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
index a5d14d8..7bc371f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
@@ -186,12 +186,18 @@
#if DEBUG
+
-
- //var moveAccontResult = Account2New ("12345678");
- //var newHomeId = Home2New ();
- ////杩佺Щ缃戝叧
- //var moveGatewayResult = Gateway2New ("4D59383553502243", newHomeId, 0);
+ Account2New ("12345678");
+ Home2New ();
+ //杩佺Щ浜戠鍏朵粬澶囦唤
+ var moveCloudDataResult = MoveCloudBackup ();
+ Application.RunOnMainThread (() => {
+ btnTipMsg.Text = $"Failed to migrate cloud backup list.{moveCloudDataResult}";
+ btnTipMsg.TextColor = SkinStyle.Current.DelColor;
+ loading.Hide ();
+ return;
+ });
#endif
if (etPwd.Text.Trim() == "") {
@@ -317,6 +323,7 @@
if (revertObj != null) {
if (revertObj.data != null) {
var newHomeInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Move_HomeInfo> (revertObj.data.ToString ());
+ newHomeId = newHomeInfo.homeId;
return newHomeInfo.homeId;
}
}
@@ -554,20 +561,23 @@
/// 杩佺Щ鏈嶅姟鍣ㄥ叏閮ㄥ浠�
/// </summary>
- private void MoveCloudBackup ()
+ private string MoveCloudBackup ()
{
var dic = new Dictionary<string, object> ();
dic.Add ("oldPlatformToken", MainPage.LoginUser.LoginTokenString);//鏃у钩鍙皌oken
dic.Add ("oldPlatformHomeId", UserConfig.Instance.CurrentRegion.RegionID);//鏃у钩鍙颁綇瀹卛d
- dic.Add ("homeId", newUserId);//鏂板钩鍙颁綇瀹卛d
+ dic.Add ("homeId", newHomeId);//鏂板钩鍙颁綇瀹卛d
dic.Add ("userId", newUserId);//鏂板钩鍙扮敤鎴穒d
dic.Add ("tenantId", "202106");//绉熸埛id
var requestJson = HttpUtil.GetSignRequestJson (dic);
var revertObj = MainPage.RequestHttps ("/home-wisdom/data/move/backup/all", requestJson, false, false, SeverAddr);
if (revertObj != null) {
if (revertObj.code == "0") {
+
}
+ return revertObj.code;
}
+ return "-99";
}
/// <summary>
@@ -944,6 +954,14 @@
});
return;
}
+ //杩佺Щ浜戠鍏朵粬澶囦唤
+ var moveCloudDataResult = MoveCloudBackup ();
+ Application.RunOnMainThread (() => {
+ btnTipMsg.Text = $"Failed to migrate cloud backup list.{moveCloudDataResult}";
+ btnTipMsg.TextColor = SkinStyle.Current.DelColor;
+ loading.Hide ();
+ return;
+ });
//鍒涘缓杩佺Щ澶囦唤鏂囦欢澶�
var backId = moveFolder2New (newHomeId);
//杩佺Щ澶囦唤鏂囦欢
@@ -958,8 +976,6 @@
btnTipMsg.Text = "Migration backup succeeded, migrating Schedule data.";
btnTipMsg.TextColor = SkinStyle.Current.TextColor;
});
- //杩佺Щ浜戠鍏朵粬澶囦唤
- MoveCloudBackup ();
//杩佺Щ瀹氭椂鍣�
var timerList = GetTimer (newHomeId);
if (timerList == null) {
--
Gitblit v1.8.0