From 9e73f2569021b0399e5fe67c3fd95bb44d800a3e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 二月 2023 11:16:35 +0800
Subject: [PATCH] Merge branch 'wxr' of http://172.16.1.23:6688/r/~wxr/CrabtreeOn into wxr
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
index e92f561..a5d14d8 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
@@ -435,7 +435,7 @@
continue;
}
}
- }
+ }
}
if (!dic.ContainsKey ("list")) {
dic.Add ("list", fileObjs);
@@ -534,8 +534,8 @@
continue;
}
}
- }
- }
+ }
+ }
}
if (!dic.ContainsKey ("list")) {
dic.Add ("list", fileObjs);
@@ -551,6 +551,24 @@
}
+
+ /// 杩佺Щ鏈嶅姟鍣ㄥ叏閮ㄥ浠�
+ /// </summary>
+ private void 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 ("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") {
+ }
+ }
+ }
/// <summary>
/// 鑾峰彇瀹氭椂鍣ㄥ垪琛�
@@ -930,16 +948,18 @@
var backId = moveFolder2New (newHomeId);
//杩佺Щ澶囦唤鏂囦欢
var moveFileResult = MoveFile2New (backId);
- Application.RunOnMainThread (() => {
- btnTipMsg.Text = "Migrating server backup.";
- btnTipMsg.TextColor = SkinStyle.Current.TextColor;
- });
- MoveOldBackupList ();
+ // Application.RunOnMainThread (() => {
+ // btnTipMsg.Text = "Migrating server backup.";
+ // btnTipMsg.TextColor = SkinStyle.Current.TextColor;
+ // });
+ // MoveOldBackupList ();
if (moveFileResult == "true") {
Application.RunOnMainThread (() => {
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