Merge branch 'wxr' of http://172.16.1.23:6688/r/~wxr/CrabtreeOn into wxr

wxr

2023-02-01 9e73f2569021b0399e5fe67c3fd95bb44d800a3e

 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);//旧平台token
            dic.Add ("oldPlatformHomeId", UserConfig.Instance.CurrentRegion.RegionID);//旧平台住宅id
            dic.Add ("homeId", newUserId);//新平台住宅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") {
                }
            }
        }

        /// <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) {