From 58d4fc80a710ea6e1d350e913ed09b75953c6e7a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 26 七月 2023 10:01:08 +0800
Subject: [PATCH] 修改组播搜索，印度佬的网络有问题
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs
index e92f561..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;
}
}
@@ -435,7 +442,7 @@
continue;
}
}
- }
+ }
}
if (!dic.ContainsKey ("list")) {
dic.Add ("list", fileObjs);
@@ -534,8 +541,8 @@
continue;
}
}
- }
- }
+ }
+ }
}
if (!dic.ContainsKey ("list")) {
dic.Add ("list", fileObjs);
@@ -551,6 +558,27 @@
}
+
+ /// 杩佺Щ鏈嶅姟鍣ㄥ叏閮ㄥ浠�
+ /// </summary>
+ 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", 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>
/// 鑾峰彇瀹氭椂鍣ㄥ垪琛�
@@ -926,15 +954,23 @@
});
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);
//杩佺Щ澶囦唤鏂囦欢
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.";
--
Gitblit v1.8.0