From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 112 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 6b310f0..9758f95 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -46,7 +46,7 @@
public ESVideoInfo esVideoInfo;
/// <summary>
- ///
+ /// 鏆傛椂娌＄敤
/// </summary>
public void InitESVideoSDK()
{
@@ -56,49 +56,15 @@
/// <summary>
/// 鐩戞帶椤甸潰
/// </summary>
- /// <param name="mESVideoInfo"></param>
+ /// <param name="mESVideoInfo">涓版灄鐩戣鎵�闇�鐩稿叧鍙傛暟</param>
public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
{
- this.esVideoInfo = mESVideoInfo;
-
#if __IOS__
+ int roomID = 0;
+ int.TryParse(mESVideoInfo.roomno, out roomID);
ESOnMonitorViewController vc = new ESOnMonitorViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- //vc.MESRoomID = mESVideoInfo.ESRoomID;
- vc.DeviceName = mESVideoInfo.DeviceName;
- //vc.RoomName = mESVideoInfo.RoomName;
- vc.MESCallDelegate = new OnESCallDelegate(this);
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
-#else
-
- Intent intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
- intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
- intent.PutExtra("uuid", mESVideoInfo.uuid);
- intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
- intent.PutExtra("cmtID", mESVideoInfo.cmtID);
- intent.PutExtra("roomno", mESVideoInfo.roomno);
- intent.PutExtra("unitno", mESVideoInfo.unitno);
- intent.PutExtra("HomeID", mESVideoInfo.HomeID);
- intent.PutExtra("callId", mESVideoInfo.callId);
- intent.PutExtra("Type", 0);
- Shared.Application.Activity.StartActivity(intent);
-
-#endif
- }
-
-
-
- /// <summary>
- /// 琚懠鍙〉闈�
- /// </summary>
- /// <param name="mESVideoInfo"></param>
- public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
- {
- this.esVideoInfo = mESVideoInfo;
-#if __IOS__
- ESOnIntercomViewController vc = new ESOnIntercomViewController();
- vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- //vc.MESRoomID = mESVideoInfo.ESRoomID;
+ vc.MESRoomID =roomID;
vc.DeviceName = mESVideoInfo.DeviceName;
//vc.RoomName = mESVideoInfo.RoomName;
//vc.MESCallDelegate = new OnESCallDelegate(this);
@@ -114,7 +80,45 @@
intent.PutExtra("cmtID", mESVideoInfo.cmtID);
intent.PutExtra("roomno", mESVideoInfo.roomno);
intent.PutExtra("unitno", mESVideoInfo.unitno);
- intent.PutExtra("HomeID", mESVideoInfo.HomeID);
+ //intent.PutExtra("HomeID", mESVideoInfo.HomeID);
+ intent.PutExtra("callId", mESVideoInfo.callId);
+ intent.PutExtra("Type", 0);
+ Shared.Application.Activity.StartActivity(intent);
+
+#endif
+ }
+
+
+
+ /// <summary>
+ /// 琚懠鍙〉闈�
+ /// </summary>
+ /// <param name="mESVideoInfo">涓版灄鍛煎彨鍔熻兘鎵�闇�鐩稿叧鍙傛暟</param>
+ public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
+ {
+ this.esVideoInfo = mESVideoInfo;
+#if __IOS__
+ int roomID = 0;
+ int.TryParse(mESVideoInfo.roomno, out roomID);
+ ESOnIntercomViewController vc = new ESOnIntercomViewController();
+ 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);
+#else
+
+ Intent intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+ intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
+ intent.PutExtra("uuid", mESVideoInfo.uuid);
+ intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
+ intent.PutExtra("cmtID", mESVideoInfo.cmtID);
+ intent.PutExtra("roomno", mESVideoInfo.roomno);
+ intent.PutExtra("unitno", mESVideoInfo.unitno);
+ //intent.PutExtra("HomeID", mESVideoInfo.HomeID);
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 1);
Shared.Application.Activity.StartActivity(intent);
@@ -298,23 +302,29 @@
{ IsBackground = false }.Start();
}
-#endregion
+ #endregion
#if __IOS__
-#region OnESCallDelegate
+ #region OnESCallDelegate
/////// <summary>
/////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
/////// </summary>
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;
@@ -398,7 +408,7 @@
}
/// <summary>
- ///
+ /// 涓版灄鐩戣鍜屽懠鍙姛鑳芥墍闇�鐩稿叧鍙傛暟
/// </summary>
public class ESVideoInfo
{
@@ -415,27 +425,27 @@
/// <summary>
/// 涓版灄璇锋眰鐨勫敮涓�id
/// </summary>
- public string uuid;
+ public string uuid = string.Empty;
/// <summary>
/// 涓版灄绀惧尯id
/// </summary>
- public string cmtID;
+ public string cmtID = string.Empty;
/// <summary>
/// 涓版灄鎴块棿鍙�
/// </summary>
- public string roomno;
+ public string roomno = string.Empty;
/// <summary>
/// 涓版灄妤兼爧鍙�
/// </summary>
- public string unitno;
+ public string unitno = string.Empty;
///// <summary>
///// 涓版灄浣忓畢Id
///// </summary>
- //public string HomeID;
+ //public string HomeID= string.Empty;
/// <summary>
/// 鍛煎彨璁板綍Id
/// </summary>
- public string callId;
+ public string callId = string.Empty;
}
--
Gitblit v1.8.0