From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 812f119..d1be072 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -48,7 +48,7 @@
public ESVideoInfo esVideoInfo;
/// <summary>
- ///
+ /// 鏆傛椂娌＄敤
/// </summary>
public void InitESVideoSDK()
{
@@ -58,12 +58,28 @@
/// <summary>
/// 鐩戞帶椤甸潰
/// </summary>
+<<<<<<< HEAD
+ /// <param name="mESVideoInfo">涓版灄鐩戣鎵�闇�鐩稿叧鍙傛暟</param>
+ public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
+=======
/// <param name="mESVideoInfo"></param>
public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo, string interphoneType)
+>>>>>>> origin/CJL-LC
{
this.esVideoInfo = mESVideoInfo;
int roomID = 0;
int.TryParse(mESVideoInfo.roomno, out roomID);
+<<<<<<< HEAD
+ ESOnMonitorViewController vc = new ESOnMonitorViewController();
+ vc.MESVideoID = mESVideoInfo.ESVideoUUID;
+ vc.MESRoomID =roomID;
+ vc.DeviceName = mESVideoInfo.DeviceName;
+ //vc.RoomName = mESVideoInfo.RoomName;
+ //vc.MESCallDelegate = new OnESCallDelegate(this);
+ mOnESCallDelegate = new OnESCallDelegate(this);
+ vc.MESCallDelegate = mOnESCallDelegate;
+ Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
+=======
#if __IOS__
if (interphoneType == "IMOUVISIAL")
@@ -93,6 +109,7 @@
//vc.MESCallDelegate = new OnESCallDelegate(this);
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
}
+>>>>>>> origin/CJL-LC
#else
Intent intent = null;
if (interphoneType == "IMOUVISIAL")
@@ -129,8 +146,13 @@
/// <summary>
/// 琚懠鍙〉闈�
/// </summary>
+<<<<<<< HEAD
+ /// <param name="mESVideoInfo">涓版灄鍛煎彨鍔熻兘鎵�闇�鐩稿叧鍙傛暟</param>
+ public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
+=======
/// <param name="mESVideoInfo"></param>
public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo, string interphoneType)
+>>>>>>> origin/CJL-LC
{
this.esVideoInfo = mESVideoInfo;
int roomID = 0;
@@ -141,7 +163,8 @@
//涔愭鍙瀵硅
//1.鍒濆鍖朙COpenSDK_Api
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
- LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
+ //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
+ //LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
LCApiKit.SharedInstance().CurrentDeviceName = mESVideoInfo.DeviceName;
LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_DeviceId;
@@ -379,6 +402,8 @@
}
#endregion
+<<<<<<< HEAD
+=======
#region 鐜嬭耽鏂版帴鍚拰寮�閿佹帴鍙�
/// <summary>
@@ -394,6 +419,7 @@
{
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("deviceId", esVideoInfo.Lc_DeviceId);//璁惧id
+ dic.Add("callId", esVideoInfo.callId);
var requestJson = HttpUtil.GetSignRequestJson(dic);
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_OpenDoorbell, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
@@ -449,6 +475,7 @@
}
#endregion
+>>>>>>> origin/CJL-LC
#if __IOS__
#region OnESCallDelegate
@@ -458,13 +485,19 @@
OnESCallDelegate mOnESCallDelegate;
/// <summary>
- ///
+ /// iOS鍘熺敓濮旀墭浜嬩欢
/// </summary>
public class OnESCallDelegate : ESCallDelegate
{
-
+ /// <summary>
+ /// ESOnVideo
+ /// </summary>
[Weak] ESOnVideo _ESOnVideo;
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ /// <param name="mESOnVideo">鍛煎彨鐩稿叧鐨勫弬鏁�</param>
public OnESCallDelegate(ESOnVideo mESOnVideo)
{
_ESOnVideo = mESOnVideo;
@@ -618,7 +651,11 @@
}
/// <summary>
+<<<<<<< HEAD
+ /// 涓版灄鐩戣鍜屽懠鍙姛鑳芥墍闇�鐩稿叧鍙傛暟
+=======
/// 鍙瀵硅鍙傛暟瀵硅薄锛堜粎鍦ㄦ渶鍚庝竴姝ヨ烦杞埌activity鏃舵墠璋冪敤,涓轰簡鍋氬吋瀹硅繖閲岄兘鏁版嵁鏈夌偣涔憋紝浠ュ悗鏈夋椂闂村啀鐞嗛『鎬濊矾浼樺寲锛�
+>>>>>>> origin/CJL-LC
/// </summary>
public class ESVideoInfo
{
--
Gitblit v1.8.0