1

wxr

2021-11-23 1635e5b2e6d853ef5d89f6ca3ef18edece91e7b1

1

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -2,91 +2,68 @@
  <MonoDevelop.Ide.ItemProperties.SiriIntentUI>
    <MonoDevelop.MacDev.AppleDevelopmentTeam />
  </MonoDevelop.Ide.ItemProperties.SiriIntentUI>
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.ItemProperties.SiriIntents>
    <MonoDevelop.MacDev.AppleDevelopmentTeam />
  </MonoDevelop.Ide.ItemProperties.SiriIntents>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Other/SkipControl.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.3E789E7C-7F16-463D-8CAD-6AA84628D6C8" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
    <Files>
      <File FileName="HDL-ON_iOS/Other/Siri/Data/SceneDateManager.cs" Line="10" Column="102" />
      <File FileName="HDL-ON_iOS/Other/Siri/UI/Cells.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/HDLRunSceneIntentHandlder.cs" />
      <File FileName="SiriIntents/IntentHandler.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/Support/NSUserActivityHelper.cs" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
      <File FileName="SiriIntents/IntentHandler.cs" Line="17" Column="32" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/Data/DataManager.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/Support/NSUserDefaultsHelper.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" />
      <File FileName="HDL-ON_iOS/Other/Siri/Data/DataManager.cs" />
      <File FileName="HDL-ON_iOS/Other/SkipControl.cs" Line="30" Column="57" />
      <File FileName="HDL-ON_iOS/Other/Siri/HDLRunSceneIntentHandlder.cs" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="603" Column="52" />
      <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
                <Node name="Server" expanded="True">
                  <Node name="HttpServerRequest.cs" selected="True" />
                </Node>
              </Node>
              <Node name="UI" expanded="True">
                <Node name="CSS" expanded="True" />
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Base.lproj" expanded="True" />
              <Node name="Other" expanded="True">
                <Node name="Siri" expanded="True">
                  <Node name="Data" expanded="True" />
                  <Node name="Support" expanded="True" />
                </Node>
                <Node name="SkipControl.cs" selected="True" />
              </Node>
              <Node name="Resources" expanded="True">
                <Node name="Phone" expanded="True" />
              </Node>
            </Node>
            <Node name="SiriIntents" expanded="True" />
            <Node name="SiriIntentsUI" expanded="True" />
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State>
          <Value>GetType().Assembly</Value>
          <Value>tempFunction.deviceId</Value>
          <Value>updata2.ToString()</Value>
        </State>
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.SiriIntentsUI>
    <MonoDevelop.MacDev.AppleDevelopmentTeam />
  </MonoDevelop.Ide.ItemProperties.SiriIntentsUI>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <DisabledProjects>
    <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
    <String>SiriIntent/SiriIntent.csproj</String>
    <String>SiriBinding/SiriBinding.csproj</String>
    <String>SiriLibrary/SiriLibrary.csproj</String>
    <String>SceneKit/SceneKit.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="333" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" line="251" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" line="185" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" line="894" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="62" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="60" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" relfile="HDL-ON_iOS/Other/Siri/VoiceShortcutDataManager.cs" line="64" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/Siri/SiriBaseView.cs" relfile="HDL-ON_iOS/Other/Siri/SiriBaseView.cs" line="60" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/SkipControl.cs" relfile="HDL-ON_iOS/Other/SkipControl.cs" line="25" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />

 HDL-ON_iOS/Other/Siri/Data/DataManager.cs

@@ -182,21 +182,7 @@
            });
        }

        protected void SetIsLoginValue()
        {
            UserDefaults.SetBool(true, NSUserDefaultsHelper.StorageKeys.GLOBAL_GIsLogin);
        }
        public void SetAccessTokenValue(string accessToken)
        {
            UserDefaults.SetString(accessToken, NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
        }
        public void SetRefreshTokenValue(string refreshToken)
        {
            UserDefaults.SetString(refreshToken, NSUserDefaultsHelper.StorageKeys.GLOBAL_GRefreshToken);
        }
        public void SetRegionUrlValue(string regionUrl)
        {
            UserDefaults.SetString(regionUrl, NSUserDefaultsHelper.StorageKeys.GLOBAL_GRegionUrl);
        }


    }
}

 HDL-ON_iOS/Other/Siri/Data/SceneDateManager.cs

@@ -75,5 +75,23 @@
            ManagedDataBackingInstance = new NSMutableArray<SiriScene>(orders);
        }
        #endregion


        public void SetIsLoginValue(bool value)
        {
            UserDefaults.SetBool(value, NSUserDefaultsHelper.StorageKeys.GLOBAL_GIsLogin);
        }
        public void SetAccessTokenValue(string accessToken)
        {
            UserDefaults.SetString(accessToken, NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
        }
        public void SetRefreshTokenValue(string refreshToken)
        {
            UserDefaults.SetString(refreshToken, NSUserDefaultsHelper.StorageKeys.GLOBAL_GRefreshToken);
        }
        public void SetRegionUrlValue(string regionUrl)
        {
            UserDefaults.SetString(regionUrl, NSUserDefaultsHelper.StorageKeys.GLOBAL_GRegionUrl);
        }
    }
}

 HDL-ON_iOS/Other/Siri/Support/NSUserDefaultsHelper.cs

@@ -7,6 +7,8 @@
    {
        private const string AppGroup = "group.com.hdl.onpro";



        public static class StorageKeys
        {
            public const string SoupMenu = "soupMenu";

 HDL-ON_iOS/Other/SkipControl.cs

@@ -36,7 +36,15 @@
            //vc.TitleName
            //PresentViewController(vc, true, null);
            HDL_ON_iOS.AppDelegate.rootViewController.PushViewController(vc, true);
        }

        public void SetData(bool isLogin, string accessToken, string refreshToken, string regionUrl)
        {
            var sDM = new SceneDateManager();
            sDM.SetIsLoginValue(isLogin);
            sDM.SetAccessTokenValue(accessToken);
            sDM.SetRefreshTokenValue(refreshToken);
            sDM.SetRegionUrlValue(regionUrl);
        }
    }
}

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -598,6 +598,10 @@
                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
#if __IOS__
                    //刷新siri要用的数据
                    new Other.SkipControl().SetData(true, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, DB_ResidenceData.Instance.CurrentRegion.regionUrl);
#endif
                    var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
                    if (nowhomeId == DB_ResidenceData.Instance.CurrentRegion.id)
                    {

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -726,6 +726,7 @@
                //UserInfo.Current.CurrentRegion.RegionID = "";
                UserInfo.Current.SaveUserInfo();
                MainPage.Log("登录成功。");

                result = true;
                //获取用户信息
                new Thread(() =>