wxr
2023-02-01 9e73f2569021b0399e5fe67c3fd95bb44d800a3e
Merge branch 'wxr' of http://172.16.1.23:6688/r/~wxr/CrabtreeOn into wxr
3个文件已修改
61 ■■■■■ 已修改文件
Crabtree/.vs/SmartHome/xs/UserPrefs.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -2,28 +2,23 @@
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs">
    <Files>
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/ManualUpgradeDialog.cs" Line="1" Column="1" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/TV/ConfigIRCode.cs" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" Line="645" Column="40" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" Line="208" Column="1" />
      <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Backup.cs" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" />
      <File FileName="SmartHome/UI/SimpleControl/R.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="SmartHome" expanded="True">
            <Node name="Shared" expanded="True">
              <Node name="HDL" expanded="True">
                <Node name="Operation" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="SimpleControl" expanded="True">
                  <Node name="Phone" expanded="True">
                    <Node name="Register" expanded="True">
                      <Node name="MigrationServer.cs" selected="True" />
                    </Node>
                    <Node name="Schedule" expanded="True" />
                    <Node name="System" expanded="True" />
                    <Node name="TV" expanded="True" />
                  </Node>
                </Node>
              </Node>
@@ -39,17 +34,15 @@
    <String>Shared.IOS/Shared.IOS.csproj</String>
    <String>IosService/IosService.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs" line="282" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="324" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="343" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="562" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="581" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="28" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="174" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="168" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/MigrationServer.cs" line="464" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -77,7 +77,7 @@
#if DEBUG
                //Text = "crabtreel12019@gmail.com"
                //Text = "paanghal@gmail.com"
                Text = "2791308028@qq.com"
                Text = "kumar.niranjan72@gmail.com"
#endif
            };
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) {