From 3532db3610381f37eca1a6ac783d882517847c91 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 31 三月 2021 15:28:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 5c7e6b2..1466184 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -59,12 +59,12 @@
/// <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.MESRoomID =roomID;
vc.DeviceName = mESVideoInfo.DeviceName;
//vc.RoomName = mESVideoInfo.RoomName;
vc.MESCallDelegate = new OnESCallDelegate(this);
@@ -96,9 +96,11 @@
{
this.esVideoInfo = mESVideoInfo;
#if __IOS__
+ int roomID = 0;
+ int.TryParse(mESVideoInfo.roomno, out roomID);
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);
@@ -415,27 +417,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