From da22725d616af0f3081670c76195eaf57794bc29 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 18 五月 2022 16:03:33 +0800
Subject: [PATCH] Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口
---
HDL_APP_Project.sln | 14 +++
HDL-ON_iOS/HDL-ON_iOS.csproj | 7 +
HDL_ON/Common/ApiUtlis.cs | 23 +++++
HDL_ON/Entity/DB_ResidenceData.cs | 6 +
DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0
HDL-ON_iOS/AppDelegate.cs | 43 +++++++---
HDL_ON/DAL/Server/NewAPI.cs | 3
HDL_ON/DAL/Server/NewApiRes.cs | 21 +++++
HDL_ON/Common/HDLCommon.cs | 7 +
HDL_ON/Common/R.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 7 +
HDL_ON/DAL/Server/HttpServerRequest.cs | 95 +++++++++++++++--------
SiriIntentsUI/SiriIntentsUI.csproj | 1
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 2
14 files changed, 172 insertions(+), 59 deletions(-)
diff --git a/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
index ded2921..885c7d7 100644
--- a/DLL/IOS/Shared.IOS.HDLFVSDK.dll
+++ b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index d41c1ac..3409c69 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -10,7 +10,7 @@
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;
-
+using HDL_ON.Entity;
namespace SharedMethod
{
public static class SharedMethod
@@ -92,7 +92,7 @@
// Get previous device token
var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
- new Alert("", DeviceToken, "鍙栨秷", "纭畾").Show();
+ //new Alert("", DeviceToken, "鍙栨秷", "纭畾").Show();
//NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
//NSError error;
@@ -135,10 +135,10 @@
Console.WriteLine("鎺ㄩ�佹秷鎭細"+userInfo);
//var test = new NSDictionary();
//test.SetNilValueForKey(new NSString("test"));
- NSError error;
- NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
- NSString str = new NSString(dicD, NSStringEncoding.UTF8);
- new Alert("", str, "鍙栨秷", "纭畾").Show();
+ //NSError error;
+ //NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
+ //NSString str = new NSString(dicD, NSStringEncoding.UTF8);
+ //new Alert("", str, "鍙栨秷", "纭畾").Show();
//璇诲彇鎺ㄩ�佷俊鎭�
UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -188,8 +188,12 @@
public override void OnResignActivation(UIApplication application)
{
- //璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
+ }
+
Console.WriteLine("OnResignActivation");
UserInfo.Current.unlockTime = DateTime.Now;
@@ -197,8 +201,12 @@
public override void DidEnterBackground(UIApplication application)
{
- //璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
+ }
+
//SharedMethod.SharedMethod.IsBackground = true;
//MainPage.IsEnterBackground = true;
@@ -225,8 +233,12 @@
public override void OnActivated(UIApplication application)
{
- //璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
+ if (DB_ResidenceData.Instance.SupportFVDevice)
+ {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
+ }
+
Console.WriteLine("OnActivated");
base.OnActivated(application);
@@ -279,9 +291,12 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
+
+ if (DB_ResidenceData.Instance.SupportFVDevice) {
+ //璁剧疆鍏ㄨ閫氱姸鎬�
+ Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
+ }
- //璁剧疆鍏ㄨ閫氱姸鎬�
- Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
Console.WriteLine("111111111111");
SetCurrentLanguage();
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f8fd1bc..5b5b6cf 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -74,6 +74,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodesignProvision>OnPro220307-1-Hoc</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -108,12 +109,12 @@
<Reference Include="Shared.IOS.HDLSceneSiri">
<HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.HDLFVSDK">
- <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.HDLLinphoneSDK">
<HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS.HDLFVSDK">
+ <HintPath>..\..\..\HDLDemo\鍏ㄨ閫歕閲戣寕鍏ㄨ閫氾紙onpro涓婄敤锛塡FVSDKNew\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\bin\Debug\Shared.IOS.HDLFVSDK.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
diff --git a/HDL_APP_Project.sln b/HDL_APP_Project.sln
index fab839a..34cec7e 100644
--- a/HDL_APP_Project.sln
+++ b/HDL_APP_Project.sln
@@ -18,6 +18,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMSdk", "UMSdk\UMSdk.csproj", "{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLFVSDK", "..\..\HDLDemo\鍏ㄨ閫歕閲戣寕鍏ㄨ閫氾紙onpro涓婄敤锛塡FVSDKNew\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK.csproj", "{56776799-6E94-4016-B369-068B96C6ACDE}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4
@@ -119,6 +121,18 @@
{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhone.Build.0 = Release|Any CPU
{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.Build.0 = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 35d8c7d..b53302a 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -330,6 +330,8 @@
Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
//褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
HDLLinphone.Current.LogoutAllAccount();
+ //鐧诲綍鍏ㄨ閫氾紙鍏ㄨ閫氫笉鏍规嵁浣忓畢id鍙樺寲锛岄��鍑虹櫥褰曚細閫�鍑烘墍鏈塻ip璐﹀彿锛屾墍浠ユ澶勯渶瑕侀噸鏂扮櫥褰曞叏瑙嗛�氾級
+ //Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);
}
}
@@ -338,8 +340,24 @@
if (isInterphoneType_FREEVIEW)
{
#if __IOS__
- //鐧诲綍鍏ㄨ閫�
- Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
+ //鑾峰彇鍏ㄨ閫氳处鎴蜂俊鎭�
+ string FVUserId = Ins.HttpRequest.GetVideoThirdPartUserInfo();
+ if (FVUserId!=null)
+ {
+
+ //鐧诲綍鍏ㄨ閫�
+ Shared.IOS.HDLFVSDK.Video.Init("", FVUserId);
+
+ }
+
+
+#endif
+ }
+ else {
+#if __IOS__
+ //涓嶆敮鎸佸叏瑙嗛�氾紙鐢ㄤ簬鍦╥os app鐢熷懡鍛ㄦ湡鍒ゆ柇鏄惁璋冪敤鍏ㄨ閫氭柟娉曪級
+ Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
+
#endif
}
@@ -489,7 +507,6 @@
{
var pack = Ins.HttpRequest.GetSecurityList();
}
-
}
}
\ No newline at end of file
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 28ec31e..d957a65 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -342,9 +342,14 @@
{
if (json["spk"].ToString() == "door.gate")
{
+ //new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"鍛煎彨", eSVideoInfo);
+#if __IOS__
+ eSVideoInfo.spk = json["spk"].ToString();
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, false);
+#else
new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"鍛煎彨", eSVideoInfo);
- //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
+#endif
return;
}
else
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index ac65982..7fee83f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 璁垮绠＄悊
/// </summary>
- public const int VisitorManage = 533;
+ public const int VisitorManage = 2533;
/// <summary>
/// 寰樺緤鎶ヨ
/// </summary>
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 4e3ed71..f6355cb 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -404,7 +404,11 @@
}
}
}
-
+//#if __IOS__
+// //鐧诲綍鍏ㄨ閫�
+// Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);
+// //Shared.IOS.HDLFVSDK.Video.Init("", "466196456122637");
+//#endif
UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -515,9 +519,9 @@
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
}
- #endregion
+#endregion
- #region 浣忓畢閮ㄥ垎
+#region 浣忓畢閮ㄥ垎
/// <summary>
/// 鑾峰彇浣忓畢鍒楄〃
/// </summary>
@@ -790,7 +794,7 @@
return result != null && result.Code == StateCode.SUCCESS;
}
- #region 鏂版暟鎹垎浜�
+#region 鏂版暟鎹垎浜�
/// <summary>
/// 娣诲姞鍒嗕韩
/// </summary>
@@ -831,7 +835,7 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
}
- #endregion
+#endregion
///// <summary>
///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
@@ -987,7 +991,7 @@
- #endregion
+#endregion
/// <summary>
/// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛
/// </summary>
@@ -1017,7 +1021,7 @@
}
}
- #region 鎺ㄩ��
+#region 鎺ㄩ��
/// <summary>
/// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅
/// </summary>
@@ -1036,7 +1040,13 @@
bool isProduce = true;
if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
{
+#if __IOS__
+ isProduce = true;
+
+#else
isProduce = false;
+
+#endif
}
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
{
@@ -1336,9 +1346,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
}
- #endregion
+#endregion
- #region 妫�娴嬫洿鏂�
+#region 妫�娴嬫洿鏂�
/// <summary>
///
/// </summary>
@@ -1356,9 +1366,9 @@
- #endregion
+#endregion
- #region 鑾峰彇澶╂皵閮ㄥ垎
+#region 鑾峰彇澶╂皵閮ㄥ垎
/// <summary>
/// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅澶╂皵淇℃伅
/// </summary>
@@ -1479,10 +1489,10 @@
//}
- #endregion
+#endregion
- #region 澶囦唤閮ㄥ垎
+#region 澶囦唤閮ㄥ垎
///// <summary>
///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
///// </summary>
@@ -1953,10 +1963,10 @@
}
*/
- #endregion
+#endregion
- #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
/// <summary>
/// 鑾峰彇璁惧鍒楄〃
/// </summary>
@@ -2191,9 +2201,9 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
}
- #endregion
+#endregion
- #region Kaede --鍦烘櫙鍔熻兘--------------------------
+#region Kaede --鍦烘櫙鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
/// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -2325,9 +2335,9 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
}
- #endregion
+#endregion
- #region Kaede --鎴块棿鍔熻兘--------------------------
+#region Kaede --鎴块棿鍔熻兘--------------------------
/// <summary>
/// 鑾峰彇鎴块棿鍒楄〃
/// </summary>
@@ -2402,10 +2412,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede -- 瀹夐槻鎺ュ彛____________________________
+#region Kaede -- 瀹夐槻鎺ュ彛____________________________
/// <summary>
/// 鑾峰彇瀹夐槻鍒楄〃
/// </summary>
@@ -2569,10 +2579,10 @@
return pack;
}
- #endregion
+#endregion
- #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
/// <summary>
/// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
/// </summary>
@@ -2597,9 +2607,9 @@
return pack;
}
- #endregion
+#endregion
- #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
/// <summary>
/// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
/// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
@@ -2612,10 +2622,10 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
}
- #endregion
+#endregion
- #region 鈻� 鍙瀵硅_________________________
+#region 鈻� 鍙瀵硅_________________________
/// <summary>
/// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
/// </summary>
@@ -2645,9 +2655,9 @@
}
- #endregion
+#endregion
- #region 鈻� 闂ㄩ攣鐩稿叧____________________________
+#region 鈻� 闂ㄩ攣鐩稿叧____________________________
/// <summary>
/// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
@@ -2716,8 +2726,8 @@
return listSortLog;
}
- #endregion
- #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+#endregion
+#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
/// <summary>
/// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
/// </summary>
@@ -2781,7 +2791,7 @@
var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
}
- #endregion
+#endregion
/// <summary>
/// 缁戝畾source闈㈡澘
@@ -2842,5 +2852,26 @@
var requestJson = HttpUtil.GetSignRequestJson(d);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
}
+
+ /// <summary>
+ /// 鑾峰彇涓夋柟璐︽埛璇︽儏锛堝彲瑙嗗璁诧級
+ /// </summary>
+ /// <returns></returns>
+ public string GetVideoThirdPartUserInfo()
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var resultObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_Third_Account, requestJson);
+ if (resultObj.Code == StateCode.SUCCESS)
+ {
+ var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfoThirdPartVideo>(resultObj.Data.ToString());
+ return info.extUserId;
+ }
+ else {
+ return "";
+ }
+ }
}
}
\ No newline at end of file
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index b569143..5d03089 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -719,6 +719,9 @@
/// 浣忓畢sip璐﹀彿鑾峰彇
/// </summary>
public const string API_POST_VideoDevice_GetSipAccount = "/home-wisdom/app/home/getSipAccount";
+ /// 鑾峰彇涓夋柟璐﹀彿淇℃伅
+ /// </summary>
+ public const string API_POST_VideoDevice_Third_Account = "/community-wisdom/app/visitor/freeview/getExtMemberInfo";
#endregion
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 26e6e40..27ddae9 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -382,6 +382,27 @@
}
/// <summary>
+ /// 鑾峰彇涓夋柟璐︽埛淇℃伅锛堝彲瑙嗗璁诧級
+ /// </summary>
+ [System.Serializable]
+ public class UserInfoThirdPartVideo
+ {
+ /// <summary>
+ /// 绗笁鏂规敞鍐岀殑userId
+ /// </summary>
+ public string extUserId;
+ /// <summary>
+ /// 绗笁鏂瑰钩鍙�
+ /// </summary>
+ public string extPlatform;
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
+ public string homeId;
+
+ }
+
+ /// <summary>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
/// </summary>
[System.Serializable]
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index d9b9d70..9d359ea 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -109,7 +109,7 @@
}else if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
- HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
////鍏ㄨ閫�
//NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
//Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 75d6fc6..e477a7d 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -156,10 +156,13 @@
HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
+#if __IOS__
//閫�鍑哄叏瑙嗛�氱櫥褰�
Shared.IOS.HDLFVSDK.Video.Logout();
//閲嶇疆榛樿涓嶆敮鎸佸叏瑙嗛��
Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
+#endif
+
}
/// <summary>
@@ -175,7 +178,8 @@
/// <summary>
/// 鏄惁鏀寔鍏ㄨ閫�
/// </summary>
- public bool SupportFVDevice = false;
+ [Newtonsoft.Json.JsonIgnore]
+ public bool SupportFVDevice = true;
/// <summary>
/// 缃戝叧璇︾粏淇℃伅
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 3e639fb..d5af3f1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -1,9 +1,10 @@
-锘� using System;
+锘� using System;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
using Foundation;
+using HDL_ON.Entity;
namespace HDL_ON.UI
{
@@ -703,7 +704,7 @@
//璁垮绠＄悊
#region 涓汉閫夐」-璁垮绠＄悊
- if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠＄悊
+ if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠＄悊
{
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -738,7 +739,7 @@
{
#if __IOS__
//鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟
- NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
+ NSDictionary info = new NSDictionary("homeId", DB_ResidenceData.Instance.CurrentRegion.id, "regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
//璺宠浆璁垮绠＄悊鐣岄潰
Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
diff --git a/SiriIntentsUI/SiriIntentsUI.csproj b/SiriIntentsUI/SiriIntentsUI.csproj
index 324b36f..da1f4f2 100644
--- a/SiriIntentsUI/SiriIntentsUI.csproj
+++ b/SiriIntentsUI/SiriIntentsUI.csproj
@@ -47,6 +47,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodesignProvision>OnProSiriUI220307-1-Hoc</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>pdbonly</DebugType>
--
Gitblit v1.8.0