From e71c57108e6dd407c2c6f0361f68150f2ff9aed5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 13:41:16 +0800
Subject: [PATCH] 版本备份
---
HDL_ON/Common/HDLCommon.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index d986e84..6a2a061 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -318,7 +318,8 @@
eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
eSVideoInfo.Lc_PlayToken = json["token"].ToString();
- eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ //eSVideoInfo.Lc_Psk = json["cname"].ToString();
+ eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
}
else if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
{
@@ -390,20 +391,8 @@
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
- case "13415629083":
- case "18316120654":
- case "15622703419":
- case "18824864143":
case "464027401@qq.com":
- case "2791308028@qq.com":
- case "13697499568":
- case "18666455392":
- case "13375012446":
- case "13602944661":
- case "18778381374":
- case "18316672920":
case "15626203746":
- case "551775569@qq.com":
return;
}
@@ -438,6 +427,12 @@
DB_ResidenceData.Instance.EixtAccount();
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
HDLLinphone.Current.LogoutAllAccount();
+#if __IOS__
+ //5.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
+ new Other.SkipControl().SetData(false, "", "", "","");
+ var sDM = new SiriKit.SceneDateManager();
+ Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
+#endif
}
catch (Exception ex)
{
@@ -495,6 +490,11 @@
}
MainPage.CurPageIndex = 9999;
MainPage.UserBasePage.ChooseCollection();
+#if __IOS__
+ var sdm = new SiriKit.SceneDateManager();
+ sdm.RegionUrl = DB_ResidenceData.Instance.CurrentRegion.regionUrl;
+ sdm.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+#endif
}
}
//Dialog
@@ -534,9 +534,9 @@
}
- #endregion
+#endregion
- #region 鈻� 甯哥敤鏂规硶_______________________
+#region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -609,9 +609,9 @@
Control.Ins.SearchLoaclGateway();
}
}
- #endregion
+#endregion
- #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -713,6 +713,6 @@
{ IsBackground = true }.Start();
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0