备份

wxr

2022-11-01 c400abb7465732b7ca46280cbd126651985c55e0

备份

 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/ON/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionCode="202206241" android:versionName="2.706241">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="28" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionCode="202209151" android:versionName="2.709151">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="30" />
    <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <!-- Required  一些系统要求的权限，此处是极光推送需求的权限，如访问网络等-->

 Crabtree/SmartHome/UI/SimpleControl/MainPage.cs

@@ -39,7 +39,7 @@

        //public static Button LogoButton = new Button ();

        public static string CodeIDString = "20220616";
        public static string CodeIDString = "20220916";
        /// <summary>
        /// 网关状态
        /// </summary>

 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

@@ -446,6 +446,26 @@
            }
            return "";
        }

        /// <summary>
        /// 迁移服务器全部备份
        /// </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>
        /// 获取定时器列表
        /// </summary>
@@ -829,6 +849,8 @@
                                        btnTipMsg.Text = "Migration backup succeeded, migrating Schedule data.";
                                        btnTipMsg.TextColor = SkinStyle.Current.TextColor;
                                    });
                                    //迁移云端其他备份
                                    MoveCloudBackup ();
                                    //迁移定时器
                                    var timerList = GetTimer (newHomeId);
                                    if (timerList == null) {