wxr
2023-04-25 f9634c562782f54bad0fcf86af3443d3706712d6
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);//旧平台token
            dic.Add ("oldPlatformHomeId", UserConfig.Instance.CurrentRegion.RegionID);//旧平台住宅id
            dic.Add ("homeId", newUserId);//新平台住宅id
            dic.Add ("homeId", newHomeId);//新平台住宅id
            dic.Add ("userId", newUserId);//新平台用户id
            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) {