From b13a98b48df67d902da843a3bd3d5659e3737d17 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 28 四月 2021 14:48:55 +0800
Subject: [PATCH] 优化地暖界面、音乐入口界面
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 6b310f0..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);
@@ -78,7 +78,7 @@
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);
@@ -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);
@@ -114,7 +116,7 @@
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", 1);
Shared.Application.Activity.StartActivity(intent);
@@ -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